diff --git a/.gitmodules b/.gitmodules
index d76822d..f215d1b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "home/.dynamic-colors"]
 	path = home/.dynamic-colors
 	url = https://github.com/sos4nt/dynamic-colors
-[submodule "home/urxvt-font-size"]
-	path = urxvt-font-size
-	url = https://github.com/majutsushi/urxvt-font-size
 [submodule "mpv-gallery-view"]
 	path = mpv-gallery-view
 	url = https://github.com/occivink/mpv-gallery-view
diff --git a/home/.Xdefaults b/home/.Xdefaults
index 7a0f7be..bc4039a 100644
--- a/home/.Xdefaults
+++ b/home/.Xdefaults
@@ -1,123 +1,26 @@
-!Xft.antialias:false
-!Xft.dpi: 142
-Xft*antialias: True
-Xft*hinting:   Full
+! Fonts
+URxvt*font: xft:Terminess Powerline:pixelsize=18
+URxvt*font-size.step: 2
 
-!Xft.autohint: 0
-!Xft.lcdfilter:  lcddefault
-!Xft.hintstyle:  hintfull
-!Xft.hinting: 1
-!Xft.antialias: 1
-!Xft.rgba: rgb
+! Extensions
+URxvt*perl-ext-common:      font-size,dynamic-colors
+URxvt*keysym.C-F12:         perl:font-size:increase
+URxvt*keysym.C-S-F12:       perl:font-size:decrease
+URxvt*keysym.C-S-Up:        perl:font-size:incglobal
+URxvt*keysym.C-S-Down:      perl:font-size:decglobal
+URxvt*keysym.F12:           perl:dynamic-colors:cycle
+URxvt*keysym.Alt-Control-C: perl:clipboard:copy
+URxvt*keysym.Alt-Control-V: perl:clipboard:paste
 
-urxvt*urgentOnBell:true
-urxvt*meta8:true
-urxvt*borderless:true
-urxvt*multichar_encoding:utf8
-urxvt*cursorBlink:false
-urxvt*cursorUnderline:false
-urxvt*metaSendsEscape: true
-urxvt*eightBitInput: true
+! Allow re-mapping of C-S
+URxvt*iso14755: False
 
-urxvt*keysym.sym: string
-
-URxvt*depth: 32
-URxvt.meta8: true
-URxvt*saveLines:12000
-URxvt*termName:rxvt-unicode-256color
-
-URxvt*scrollBar: false
-URxvt*scrollBar_right: true
-URxvt*scrollTtyOutput: false
-URxvt*scrollTtyKeypress: true
-URxvt*scrollstyle:plain
-
-URxvt.tabbed.saveLines: 12000
-URxvt.tabbed.scrollBar: true
-URxvt.tabbed.tabbar-fg: 2
-URxvt.tabbed.tabbar-bg: 0
-URxvt.tabbed.tab-fg: 0
-URxvt.tabbed.tab-bg: 2
-URxvt.tabbed.title-fg: 0
-URxvt.tabbed.title-bg: 5
-URxvt.tabbed.autohide:  yes
-URxvt.tabbed.new-button:  no
-URxvt.tabbed.title: no
-
-urxvt*font: xft:Terminess Powerline:pixelsize=18
-!urxvt*font: xft:Fira Code:pixelsize=16
-
-Rxvt.new-button:  no
-URxvt.perl-ext-common:  default,-selection-popup,-option-popup,bell-command,searchable-scrollback<M-o>
-
-urxvt*perl-lib: ~/.urxvt/ext
-urxvt*perl-ext-common: font-size,dynamic-colors
-urxvt.font-size.step: 2
-urxvt*keysym.C-F12:     perl:font-size:increase
-urxvt*keysym.C-S-F12:   perl:font-size:decrease
-urxvt*keysym.C-S-Up:   perl:font-size:incglobal
-urxvt*keysym.C-S-Down: perl:font-size:decglobal
-urxvt*keysym.F12:      perl:dynamic-colors:cycle
-
-#URxvt.copyCommand:   xsel -ib
-#URxvt.pasteCommand:  xsel -ob
-URxvt.keysym.Alt-Control-C: perl:clipboard:copy
-URxvt.keysym.Alt-Control-V: perl:clipboard:paste
-URxvt.iso14755: False
-
-!URxvt.urgentOnBell:  true
-
-
-!URxvt*keysym.Home: \033[1~
-!URxvt*keysym.End: \033[4~
-
-! NEO Numpad Key Fix for vim
-URxvt.keysym.KP_Add:    +
-URxvt.keysym.KP_Subtract: -
-URxvt.keysym.KP_Multiply: *
-URxvt.keysym.KP_Divide  : /
-URxvt.keysym.KP_Decimal : .
-URxvt.keysym.KP_Separator : ,
-URxvt.keysym.KP_1:      1
-URxvt.keysym.KP_2:      2
-URxvt.keysym.KP_3:      3
-URxvt.keysym.KP_4:      4
-URxvt.keysym.KP_5:      5
-URxvt.keysym.KP_6:      6
-URxvt.keysym.KP_7:      7
-URxvt.keysym.KP_8:      8
-URxvt.keysym.KP_9:      9
-URxvt.keysym.KP_0:      0
-
-!URxvt.keysym.Up:     ^[[A
-!URxvt.keysym.Down:     ^[[B
-!URxvt.keysym.Right:     ^[[C
-!URxvt.keysym.Left:      ^[[D
-
-
-!URxvt.keysym.Control-Up:   \033[1;5A
-!URxvt.keysym.Control-Down:    \033[1;5B
-!URxvt.keysym.Control-Left:    \033[1;5D
-!URxvt.keysym.Control-Right:    \033[1;5C
-
-URxvt.keysym.Alt-s:    
+! Flash terminal and mark tag red
+URxvt*visualBell:   True
+URxvt*urgentOnBell: True
 
 ! Hide pointer while typing
-URxvt*pointerBlank: true
+URxvt*pointerBlank: True
 
-! URxvt.bell-command: ~/scripts/bell
-URxvt.visualBell: True
-
-
-! Cursor
-URxvt.cursorBlink: true
-URxvt.cursorColor: #657b83
-URxvt.cursorUnderline: false
-
-! Pointer
-URxvt.pointerBlank: true
-
-URxvt.underlineURLs:  True
-URxvt.url-launcher:   /usr/bin/x-www-browser
-
-URxvt.mapAlert:         true
+! No scrollbar
+URxvt*scrollBar: False
diff --git a/home/.urxvt/ext/font-size b/home/.urxvt/ext/font-size
deleted file mode 120000
index 0e30122..0000000
--- a/home/.urxvt/ext/font-size
+++ /dev/null
@@ -1 +0,0 @@
-../../../urxvt-font-size/font-size
\ No newline at end of file
diff --git a/home/.urxvt/ext/urxvtclip b/home/.urxvt/ext/urxvtclip
deleted file mode 100755
index de82bd3..0000000
--- a/home/.urxvt/ext/urxvtclip
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/perl
-sub paste {
-    my ($self) = @_;
-    my $content = `/usr/bin/xclip -loop 1 -out -selection clipboard` ;
-    $self->tt_write ($content);
-}
-
-sub on_user_command {
-    my ($self, $cmd) = @_;
-    if ($cmd eq "clipboard:paste") {
-        $self->paste;
-    }
-}
diff --git a/urxvt-font-size b/urxvt-font-size
deleted file mode 160000
index 0984499..0000000
--- a/urxvt-font-size
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0984499379e420de651dcfeedfbb7938867c44f8