9 files changed, 27 insertions, 163 deletions
diff --git a/Xresources/.Xresources/nord b/Xresources/.Xresources/nord
deleted file mode 100644
index 7f1e6b6..0000000
--- a/Xresources/.Xresources/nord
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "base"
-
-URxvt.borderColor: #2E3440
-
-*.foreground:   #D8DEE9
-*.background:   #2E3440
-*.cursorColor:  #D8DEE9
-*fadeColor: #4C566A
-
-*.color0: #3B4252
-*.color1: #BF616A
-*.color2: #A3BE8C
-*.color3: #EBCB8B
-*.color4: #81A1C1
-*.color5: #B48EAD
-*.color6: #88C0D0
-*.color7: #E5E9F0
-*.color8: #4C566A
-*.color9: #BF616A
-*.color10: #A3BE8C
-*.color11: #EBCB8B
-*.color12: #81A1C1
-*.color13: #B48EAD
-*.color14: #8FBCBB
-*.color15: #ECEFF4
diff --git a/Xresources/.Xresources/seoul256.dark b/Xresources/.Xresources/seoul256.dark
deleted file mode 100644
index 2cb451b..0000000
--- a/Xresources/.Xresources/seoul256.dark
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "base"
-
-URxvt.borderColor: #3a3a3a
-
-! Background / Foreground
-URxvt*background: #3a3a3a
-URxvt*foreground: #d0d0d0
-
-! Cursor
-*cursorColor: #d0d0d0
-*cursorColor2: #3a3a3a
-*colorBD: #e4e4e4
-
-! Other colors
-*color0: #4e4e4e
-*color1: #d68787
-*color2: #5f865f
-*color3: #d8af5f
-*color4: #85add4
-*color5: #d7afaf
-*color6: #87afaf
-*color7: #d0d0d0
-*color8: #626262
-*color9: #d75f87
-*color10: #87af87
-*color11: #ffd787
-*color12: #add4fb
-*color13: #ffafaf
-*color14: #87d7d7
-*color15: #e4e4e4
diff --git a/Xresources/.Xresources/solarized.dark b/Xresources/.Xresources/solarized.dark
deleted file mode 100644
index 8940b45..0000000
--- a/Xresources/.Xresources/solarized.dark
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "base"
-
-URxvt.borderColor: #002b36
-
-*background:  #002b36
-*foreground:  #839496
-*fadeColor:   #002b36
-*cursorColor: #93a1a1
-
-*pointerColorBackground: #586e75
-*pointerColorForeground: #93a1a1
-
-*color0:  #073642
-*color1:  #dc322f
-*color2:  #859900
-*color3:  #b58900
-*color4:  #268bd2
-*color5:  #d33682
-*color6:  #2aa198
-*color7:  #eee8d5
-*color8:  #002b36
-*color9:  #cb4b16
-*color10: #586e75
-*color11: #657b83
-*color12: #839496
-*color13: #6c71c4
-*color14: #93a1a1
-*color15: #fdf6e3
diff --git a/Xresources/.Xresources/solarized.light b/Xresources/.Xresources/solarized.light
deleted file mode 100644
index b47144c..0000000
--- a/Xresources/.Xresources/solarized.light
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "base"
-
-URxvt.borderColor: #000000
-
-*background: #fdf6e3
-*foreground: #657b83
-*fadeColor: #fdf6e3
-*cursorColor: #586e75
-
-*pointerColorBackground: #93a1a1
-*pointerColorForeground: #586e75
-
-*color0:  #073642
-*color1:  #dc322f
-*color2:  #859900
-*color3:  #b58900
-*color4:  #268bd2
-*color5:  #d33682
-*color6:  #2aa198
-*color7:  #eee8d5
-*color8:  #002b36
-*color9:  #cb4b16
-*color10: #586e75
-*color11: #657b83
-*color12: #839496
-*color13: #6c71c4
-*color14: #93a1a1
-*color15: #fdf6e3
diff --git a/Xresources/.Xresources/transparent b/Xresources/.Xresources/transparent
deleted file mode 100644
index 2778707..0000000
--- a/Xresources/.Xresources/transparent
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "nord"
-
-! True transparency
-URxvt.transparent: true
-URxvt.shading: 40
diff --git a/Xresources/.Xresources/base b/Xresources/.Xresources/urxvt
index ea87784..d9078a8 100644
--- a/Xresources/.Xresources/base
+++ b/Xresources/.Xresources/urxvt
@@ -35,3 +35,28 @@ URxvt.fading: 35
 
 ! $TERM environment variable
 URxvt*.termName: rxvt-unicode-256color
+
+! Colors
+URxvt.borderColor: #2E3440
+
+*.foreground: #D8DEE9
+*.background: #2E3440
+*.cursorColor: #D8DEE9
+*fadeColor: #4C566A
+
+*.color0: #3B4252
+*.color1: #BF616A
+*.color2: #A3BE8C
+*.color3: #EBCB8B
+*.color4: #81A1C1
+*.color5: #B48EAD
+*.color6: #88C0D0
+*.color7: #E5E9F0
+*.color8: #4C566A
+*.color9: #BF616A
+*.color10: #A3BE8C
+*.color11: #EBCB8B
+*.color12: #81A1C1
+*.color13: #B48EAD
+*.color14: #8FBCBB
+*.color15: #ECEFF4
diff --git a/mutt/.mutt/colors.muttrc b/mutt/.mutt/colors.muttrc
index 59e1c6e..083cac5 100644
--- a/mutt/.mutt/colors.muttrc
+++ b/mutt/.mutt/colors.muttrc
@@ -16,7 +16,7 @@ color index color253 default "~p"
 color index color195 default "~U"
 color index color2   default "~Q"
 color index color1   default "~D"
-color index color209 default "~F"
+color index color167 default "~F"
 
 color quoted        cyan            default
 color quoted1       magenta         default
diff --git a/xinit/.xinitrc b/xinit/.xinitrc
index 7638f61..8299fb5 100755
--- a/xinit/.xinitrc
+++ b/xinit/.xinitrc
@@ -8,7 +8,7 @@ $HOME/.local/bin/keyboard
 
 # Load Xresources to light colorscheme
 source $HOME/.local/colors.zsh
-xrdb $HOME/.Xresources/$COLORSCHEME
+xrdb $HOME/.Xresources/urxvt
 
 # Background
 feh --bg-fill /usr/share/backgrounds/More_Kamikochi_by_mendhak.jpg
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 58b84bf..103a568 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -91,51 +91,6 @@ z() {
 }
 zle -N z
 
-## Colors {{{1
-
-[[ -f $HOME/.local/colors.zsh ]] && source $HOME/.local/colors.zsh
-
-colorschemes=$(ls ${HOME}/.Xresources)
-
-function colo {
-
-    COLORSCHEME=$1
-    XRESOURCE_FILE=${HOME}/.Xresources/$COLORSCHEME
-
-    # Change colors for current session
-    if [[ ! -z "$TMUX" ]]; then
-        printf '\x1bPtmux;'
-        esc='\x1b\x1b'
-    else
-        esc='\x1b'
-    fi
-
-    /usr/bin/cpp ${XRESOURCE_FILE} | tr -d ' \t' | sed -n \
-        -e "s/.*background:/${esc}]11;/p" \
-        -e "s/.*foreground:/${esc}]10;/p" \
-        -e "s/.*cursorColor:/${esc}]12;/p" \
-        -e "s/.*borderColor:/${esc}]708;/p" \
-        -e "s/.*color\\([0-9][^:]*\\):/${esc}]4;\\1;/p" | tr \\n \\a
-
-    # Change color for future sessions
-    xrdb ${XRESOURCE_FILE}
-
-    echo "export COLORSCHEME=$1" > $HOME/.local/colors.zsh
-    source $HOME/.local/colors.zsh
-}
-
-# Completion for colorschemes (-M -> Case insensitive)
-compctl -k "(${colorschemes})" -M 'm:{a-z}={A-Z}' colo
-
-function show256 {
-    for i in {0..255} ; do
-        printf "\x1b[48;5;%sm%3d\e[0m " "$i" "$i"
-        if (( i == 15 )) || (( i > 15 )) && (( (i-15) % 6 == 0 )); then
-            printf "\n";
-        fi
-    done
-}
-
 ## Aliases {{{1
 
 # Directories