unify theming

16 files changed, 242 insertions, 170 deletions

diff --git a/.Xresources b/.Xresources
index 07a3910..42a3872 100644
--- a/.Xresources
+++ b/.Xresources
@@ -9,81 +9,6 @@ URxvt*buffered: on
 ! Create the window with the specified X window geometry [default 80x24]; option -geometry.
 ! URxvt*geometry: geom
 
-! Use the specified colour as the windows background colour [default White]; option -bg.
-URxvt*background: #262626
-
-! Use the specified colour as the windows foreground colour [default Black]; option -fg.
-URxvt*foreground: #c1b48e
-
-! Use the specified colour for the colour value n, where 0-7 corresponds to low-intensity (normal) colours and 8-15 corresponds to high-intensity (bold = bright
-!! black
-!URxvt*color0: #2E3436
-!! light black
-!URxvt*color8: #555753
-!! red
-!URxvt*color1: #E6562E
-!! light red
-!URxvt*color9: #FA7955
-!! green
-!URxvt*color2: #59992F
-!! light green
-!URxvt*color10: #8AE234
-!! yellow
-!URxvt*color3: #D4A831
-!! light yellow
-!URxvt*color11: #FCE381
-!! blue
-!URxvt*color4: #5D8CB0
-!! light blue
-!URxvt*color12: #9BBBCF
-!! magenta
-!URxvt*color5: #9F79B8
-!! light magenta
-!URxvt*color13: #D9A1E3
-!! cyan
-!URxvt*color6: #06989A
-!! light cyan
-!URxvt*color14: #61E2E2
-!! white
-!URxvt*color7: #E0E0E0
-!! light white
-!URxvt*color15: #FEFEFE
-! black
-URxvt*color0: #4e4e4e
-! light black
-URxvt*color8: #7d7d7d
-! red
-URxvt*color1: #ff3842
-! light red
-URxvt*color9: #ff5757
-! green
-URxvt*color2: #d5f85f
-! light green
-URxvt*color10: #99ff66
-! yellow
-URxvt*color3: #ffa466
-! light yellow
-URxvt*color11: #faff66
-! blue
-URxvt*color4: #00a1e4
-! light blue
-URxvt*color12: #00d7ff
-! magenta
-URxvt*color5: #d0758b
-! light magenta
-URxvt*color13: #d0758b
-! cyan
-URxvt*color6: #00ccff
-! light cyan
-URxvt*color14: #26ded2
-! white
-URxvt*color7: #d6d6d6
-! light white
-URxvt*color15: #f0f0f0
-
-! 
-! URxvt*colorBD: colour
-
 ! Use the specified colour to display bold or italic characters when the foreground colour is the default. If font styles are not available (Compile styles) and
 ! URxvt*colorIT: colour
 
@@ -133,7 +58,7 @@ URxvt*color15: #f0f0f0
 ! URxvt*borderColor: colour
 
 ! Select the fonts to be used. This is a comma separated list of font names that are checked in order when trying to find glyphs for characters. The first font
-URxvt*font: xft:Tamsyn:size=12, xft:MS Gothic:size=12, xft:Dotum:size=12
+URxvt*font: xft:Droid Sans Mono:size=10, xft:Togoshi Mono:size=12
 
 ! URxvt*boldFont: fontlist
 
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index ac8382b..5c993a0 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -1,6 +1,4 @@
 [global]
-    font = Tamsyn 16
-
     # Allow a small subset of html markup in notifications and formats:
     #   <b>bold</b>
     #   <i>italic</i>
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index de952df..890f9c4 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -130,20 +130,20 @@ hc keybind Mod1-XF86PowerOff spawn mate-session-save --shutdown-dialog
 hc keybind Print        spawn mate-screenshot
 
 # ranger
-hc keybind Mod4-Shift-Control-Return spawn urxvt -name "ranger" -e ranger /home/shmibs
-hc keybind Mod4-Shift-Control-b      spawn urxvt -name "ranger" -e ranger /home/shmibs/documents/books
-hc keybind Mod4-Shift-Control-c      spawn urxvt -name "ranger" -e ranger /home/shmibs/documents/comics
-hc keybind Mod4-Shift-Control-d      spawn urxvt -name "ranger" -e ranger /home/shmibs/downloads
-hc keybind Mod4-Shift-Control-g      spawn urxvt -name "ranger" -e ranger /home/shmibs/games
-hc keybind Mod4-Shift-Control-i      spawn urxvt -name "ranger" -e ranger /home/shmibs/images
-hc keybind Mod4-Shift-Control-m      spawn urxvt -name "ranger" -e ranger /home/shmibs/music
-hc keybind Mod4-Shift-Control-n      spawn urxvt -name "ranger" -e ranger /home/shmibs/documents/manga
-hc keybind Mod4-Shift-Control-p      spawn urxvt -name "ranger" -e ranger /home/shmibs/projects
-hc keybind Mod4-Shift-Control-s      spawn urxvt -name "ranger" -e ranger /home/shmibs/desktop
-hc keybind Mod4-Shift-Control-r      spawn urxvt -name "ranger" -e ranger /home/shmibs/romz
-hc keybind Mod4-Shift-Control-t      spawn urxvt -name "ranger" -e ranger /home/shmibs/thcool
-hc keybind Mod4-Shift-Control-v      spawn urxvt -name "ranger" -e ranger /home/shmibs/videos
-hc keybind Mod4-Shift-Control-w      spawn urxvt -name "ranger" -e ranger /home/shmibs/documents/writing
+hc keybind Mod4-Shift-Control-Return spawn urxvt -name "ranger" -e ranger ~
+hc keybind Mod4-Shift-Control-b      spawn urxvt -name "ranger" -e ranger ~/documents/books
+hc keybind Mod4-Shift-Control-c      spawn urxvt -name "ranger" -e ranger ~/documents/comics
+hc keybind Mod4-Shift-Control-d      spawn urxvt -name "ranger" -e ranger ~/downloads
+hc keybind Mod4-Shift-Control-g      spawn urxvt -name "ranger" -e ranger ~/games
+hc keybind Mod4-Shift-Control-i      spawn urxvt -name "ranger" -e ranger ~/images
+hc keybind Mod4-Shift-Control-m      spawn urxvt -name "ranger" -e ranger ~/music
+hc keybind Mod4-Shift-Control-n      spawn urxvt -name "ranger" -e ranger ~/documents/manga
+hc keybind Mod4-Shift-Control-p      spawn urxvt -name "ranger" -e ranger ~/projects
+hc keybind Mod4-Shift-Control-s      spawn urxvt -name "ranger" -e ranger ~/desktop
+hc keybind Mod4-Shift-Control-r      spawn urxvt -name "ranger" -e ranger ~/romz
+hc keybind Mod4-Shift-Control-t      spawn urxvt -name "ranger" -e ranger ~/thcool
+hc keybind Mod4-Shift-Control-v      spawn urxvt -name "ranger" -e ranger ~/videos
+hc keybind Mod4-Shift-Control-w      spawn urxvt -name "ranger" -e ranger ~/documents/writing
 
 # grab colour to clipboard
 hc keybind Mod4-c spawn ~/.config/herbstluftwm/colourgrab.sh
@@ -165,8 +165,10 @@ hc keybind Mod4-Shift-v spawn urxvt -name "vim" -e vim
 hc keybind Mod4-Shift-w spawn urxvt -name "weechat" -e weechat
 
 # dmenu
-hc keybind Mod4-0 spawn dmenu_run -fn $efont -p "Run:" -h 18 -nb $bg_normal -nf $fg_normal \
-	-sb $bg_focus  -sf $fg_focus
+hc keybind Mod4-0 spawn dmenu_run -fn "${bfont}:size=${bfont_size}" \
+	-p "Run:" -h "$bheight" \
+	-nb "$bg_normal" -nf "$fg_normal" \
+	-sb "$bg_focus"  -sf "$fg_focus"
 hc keybind Mod4-9 spawn ~/.config/herbstluftwm/switcher.sh
 hc keybind Mod4-8 spawn ~/.config/herbstluftwm/calc.sh
 
@@ -212,5 +214,6 @@ done
 pkill dunst
 dunst -lb $bg_normal -nb $bg_normal -cb $bg_focus \
 	-lf $fg_normal -nf $fg_normal -cf $fg_focus \
-	-frame_color $bg_focus -geom "0x3-4+$(($bheight + 4))"
+	-frame_color $bg_focus -geom "0x3-4+$(($bheight + 4))" \
+	-fn "$ttfont $ttfont_size,$jfont $jfont_size"
 
diff --git a/.config/herbstluftwm/calc.sh b/.config/herbstluftwm/calc.sh
index ee0cc93..e10cfa6 100755
--- a/.config/herbstluftwm/calc.sh
+++ b/.config/herbstluftwm/calc.sh
@@ -27,9 +27,9 @@ command_check() {
 }
 
 while [ "$in" != "" ]; do
-	in=$(echo "" | dmenu -fn $efont -q -h $bheight \
-		-nb $bg_normal -nf $fg_normal \
-		-sb $bg_focus -sf $fg_focus -p "$prompt" | \
+	in=$(dmenu -noinput -fn "${bfont}:size=${bfont_size}" -q -h "$bheight" \
+		-nb "$bg_normal" -nf "$fg_normal" \
+		-sb "$bg_focus" -sf "$fg_focus" -p "$prompt" | \
 		sed -e "s/ans/$acc/g")
 	if [[ $(command_check "$in" "$acc") -eq 1 ]]; then
 		break
diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 6afe2cb..2a15462 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -21,6 +21,25 @@ source ~/.config/init/vars
 
 # set alpha for background colours
 alpha='#ff'
+
+std_black=$(echo -n '#ff'; echo "$std_black" | tr -d '#')
+std_red=$(echo -n '#ff'; echo "$std_red" | tr -d '#')
+std_green=$(echo -n '#ff'; echo "$std_green" | tr -d '#')
+std_yellow=$(echo -n '#ff'; echo "$std_yellow" | tr -d '#')
+std_blue=$(echo -n '#ff'; echo "$std_blue" | tr -d '#')
+std_magenta=$(echo -n '#ff'; echo "$std_magenta" | tr -d '#')
+std_cyan=$(echo -n '#ff'; echo "$std_cyan" | tr -d '#')
+std_white=$(echo -n '#ff'; echo "$std_white" | tr -d '#')
+
+light_black=$(echo -n '#ff'; echo "$light_black" | tr -d '#')
+light_red=$(echo -n '#ff'; echo "$light_red" | tr -d '#')
+light_green=$(echo -n '#ff'; echo "$light_green" | tr -d '#')
+light_yellow=$(echo -n '#ff'; echo "$light_yellow" | tr -d '#')
+light_blue=$(echo -n '#ff'; echo "$light_blue" | tr -d '#')
+light_magenta=$(echo -n '#ff'; echo "$light_magenta" | tr -d '#')
+light_cyan=$(echo -n '#ff'; echo "$light_cyan" | tr -d '#')
+light_white=$(echo -n '#ff'; echo "$light_white" | tr -d '#')
+
 bg_normal=$(echo -n $alpha; echo "$bg_normal" | tr -d '#')
 fg_normal=$(echo -n '#ff'; echo "$fg_normal" | tr -d '#')
 bg_focus=$(echo -n $alpha; echo "$bg_focus" | tr -d '#')
@@ -28,11 +47,8 @@ fg_focus=$(echo -n '#ff'; echo "$fg_focus" | tr -d '#')
 bg_urgent=$(echo -n $alpha; echo "$bg_urgent" | tr -d '#')
 fg_urgent=$(echo -n '#ff'; echo "$fg_urgent" | tr -d '#')
 
-fg_grey=$(echo -n '#ff'; echo "$fg_grey" | tr -d '#')
-fg_red=$(echo -n '#ff'; echo "$fg_red" | tr -d '#')
-fg_green=$(echo -n '#ff'; echo "$fg_green" | tr -d '#')
-fg_yellow=$(echo -n '#ff'; echo "$fg_yellow" | tr -d '#')
-fg_blue=$(echo -n '#ff'; echo "$fg_blue" | tr -d '#')
+# separator macro
+sep="%{F${bg_focus}}│%{F${fg_normal}}"
 
 hc pad $monitor $bheight
 
@@ -53,9 +69,9 @@ update_taglist() {
 		-e 's/:/ /' \
 		-e "s/[#+\-%]\(.*\)/%{B${bg_focus} F${fg_focus}} \1%{B${bg_normal} F${fg_normal}}/" \
 		-e "s/!\(.*\)/%{B${bg_urgent} F${fg_urgent}} \1%{B${bg_normal} F${fg_normal}}/" \
-		-e "s/\.\(.*\)/%{B${bg_normal} F${fg_grey}} \1%{B${bg_normal} F${fg_normal}}/" \
+		-e "s/\.\(.*\)/%{B${bg_normal} F${light_black}} \1%{B${bg_normal} F${fg_normal}}/" \
 		| tr -d '\n'
-	echo "%{F${bg_focus}}|%{F${fg_normal}}"
+	echo "$sep"
 }
 
 update_winlist() {
@@ -80,14 +96,14 @@ update_winlist() {
 		else
 			echo -n "%{B${bg_normal} F${fg_normal}} "
 		fi
-		echo -n "${line[@]:3}" | sed -r 's/(.{60}).*/\1\.\.\./'
+		echo -n "${line[@]:3}" | sed -r 's/(.{40}).*/\1\.\.\./'
 		echo -n " "
 	done
 	echo -n "%{B${bg_normal} F${fg_normal}}"
 }
 
 update_date() {
-	echo -n "%{F${bg_focus}}|%{F${fg_normal} A:date:} \uE015 "
+	echo -n "${sep}%{A:date:} \uE015 "
 	date +$'%a, %b %d, %H:%M:%S' | tr -d '\n'
 	echo " %{A}"
 }
@@ -156,7 +172,7 @@ event_mpd() {
 	done > >(unique_line)
 }
 
-event_stat() {
+event_stats() {
 	conky -c ~/.config/herbstluftwm/panel/conky_stats
 }
 
@@ -183,7 +199,7 @@ event_when() {
 {
 	event_tick &
 	echo -e "child\t$!"
-	event_stat &
+	event_stats &
 	echo -e "child\t$!"
 	event_when &
 	echo -e "child\t$!"
@@ -217,19 +233,19 @@ event_when() {
 				;;
 				
 			mpd)
-				fields[5]="%{F${bg_focus}}|%{A:mpd: F"
+				fields[5]="${sep}%{A:mpd: F"
 				case "${event[1]}" in
 					playing)
-						fields[5]+=$(echo -n "${fg_green}} \uE0FE \uE09A")
+						fields[5]+=$(echo -n "${std_green}} \uE0FE \uE09A")
 						;;
 					paused)
-						fields[5]+=$(echo -n "${fg_yellow}} \uE0FE \uE09B")
+						fields[5]+=$(echo -n "${std_yellow}} \uE0FE \uE09B")
 						;;
 					stopped)
-						fields[5]+=$(echo -n "${fg_blue}} \uE0FE \uE099")
+						fields[5]+=$(echo -n "${std_blue}} \uE0FE \uE099")
 						;;
 					*)
-						fields[5]+=$(echo -n "${fg_red}} \uE0FE \uE09E")
+						fields[5]+=$(echo -n "${std_red}} \uE0FE \uE09E")
 						;;
 				esac
 				fields[5]+=" %{F${fg_normal} A}"
@@ -239,16 +255,16 @@ event_when() {
 				event[1]=$(printf "%-4s" ${event[1]})
 				event[2]=$(printf "%-4s" ${event[2]})
 				fields[6]=$(
-					echo -n "%{F${bg_focus}}|%{F${fg_normal} A:stats:} "
-					echo -n "%{F${fg_blue}}\uE023%{F${fg_normal}} ${event[1]} "
-					echo -n "%{F${fg_yellow}}\uE020%{F${fg_normal}} ${event[2]} "
+					echo -n "${sep}%{A:stats:} "
+					echo -n "%{F${std_blue}}\uE023%{F${fg_normal}} ${event[1]} "
+					echo -n "%{F${std_cyan}}\uE020%{F${fg_normal}} ${event[2]} "
 					echo -n "%{A}")
 				;;
 				
 			when)
 				if [[ "${event[1]}" -eq 1 ]]; then
-					fields[4]=$(echo -n "%{F${bg_focus}}|%{F${fg_normal} A:when:}"
-						echo -n "%{F${fg_yellow}} \uE0AE %{F${fg_normal} A}")
+					fields[4]=$(echo -n "${sep}%{A:when:}"
+						echo -n "%{F${std_red}} \uE0AE %{F${fg_normal} A}")
 				else
 					fields[4]=""
 				fi
@@ -286,7 +302,9 @@ event_when() {
 	done
 	
 	# pass the events into bar
-} 2> /dev/null | lemonbar -f "$bfont1" -f "$bfont2" \
+} 2> /dev/null | lemonbar -f "$ifont" -o "$ifont_off" \
+	-f "${bfont}:size=${bfont_size}" -o "$bfont_off" \
+	-f "${jfont}:size=${jfont_size}" -o "$jfont_off" \
 	-g${width}x${bheight}+${xpos}+${ypos} \
 	-B ${bg_normal} -F ${fg_normal} | \
 {
diff --git a/.config/herbstluftwm/panel/conky_stats b/.config/herbstluftwm/panel/conky_stats
index ddd5edc..f5c7e58 100644
--- a/.config/herbstluftwm/panel/conky_stats
+++ b/.config/herbstluftwm/panel/conky_stats
@@ -7,4 +7,4 @@ use_spacer none
 short_units yes
 
 TEXT
-stats	%%${cpu cpu0}	%%${memperc}
+stats	%${cpu cpu0}	%${memperc}
diff --git a/.config/herbstluftwm/switcher.sh b/.config/herbstluftwm/switcher.sh
index b37ce9e..5430a80 100755
--- a/.config/herbstluftwm/switcher.sh
+++ b/.config/herbstluftwm/switcher.sh
@@ -14,8 +14,8 @@ while read -rA line; do
 	fi
 done < <(wmctrl -l)
 
-echo -e "$lines" | nl -w 2 -s ") " | dmenu -fn $efont -i -h $bheight \
-		-nb $bg_normal -nf $fg_normal -sb $bg_focus -sf $fg_focus \
+echo -e "$lines" | nl -w 2 -s ") " | dmenu -fn "${bfont}:size=${bfont_size}" -i -h "$bheight" \
+		-nb "$bg_normal" -nf "$fg_normal" -sb "$bg_focus" -sf "$fg_focus" \
 		-p "Select:" -l 40 | cut -d ')' -f 1 | {read choice}
 
 herbstclient jumpto "${nums[$choice]}"
diff --git a/.config/init/gen-bg-saved.sh b/.config/init/gen-bg-saved.sh
new file mode 100644
index 0000000..bf2d7cc
--- /dev/null
+++ b/.config/init/gen-bg-saved.sh
@@ -0,0 +1,5 @@
+echo "\
+[:0.0]
+file=$HOME/backdrops/shadowed/$wallpaper
+mode=4
+bgcolor=#000000" > /tmp/bg-saved.cfg
diff --git a/.config/init/gen-urxvt-theme.sh b/.config/init/gen-urxvt-theme.sh
new file mode 100644
index 0000000..ba11d71
--- /dev/null
+++ b/.config/init/gen-urxvt-theme.sh
@@ -0,0 +1,51 @@
+{
+echo "\
+! Use the specified colour as the windows background colour [default White]; option -bg.
+URxvt*background: $bg_normal
+
+! Use the specified colour as the windows foreground colour [default Black]; option -fg.
+URxvt*foreground: $fg_normal
+
+! black
+URxvt*color0: $std_black
+! light black
+URxvt*color8: $light_black
+! red
+URxvt*color1: $std_red
+! light red
+URxvt*color9: $light_red
+! green
+URxvt*color2: $std_green
+! light green
+URxvt*color10: $light_green
+! yellow
+URxvt*color3: $std_yellow
+! light yellow
+URxvt*color11: $light_yellow
+! blue
+URxvt*color4: $std_blue
+! light blue
+URxvt*color12: $light_blue
+! magenta
+URxvt*color5: $std_magenta
+! light magenta
+URxvt*color13: $light_magenta
+! cyan
+URxvt*color6: $std_cyan
+! light cyan
+URxvt*color14: $light_cyan
+! white
+URxvt*color7: $std_white
+! light white
+URxvt*color15: $light_white
+"
+
+# Select the fonts to be used. This is a comma separated list of font names that are checked in order when trying to find glyphs for characters. The first font
+echo -n "URxvt*font: "
+echo -n "xft:${ttfont}:size=${ttfont_size}, "
+echo    "xft:${jfont}:size=${jfont_size}"
+
+} > /tmp/urxvt-theme
+
+xrdb -merge /tmp/urxvt-theme
+
diff --git a/.config/init/gen-userChrome.sh b/.config/init/gen-userChrome.sh
new file mode 100644
index 0000000..ed5f1f2
--- /dev/null
+++ b/.config/init/gen-userChrome.sh
@@ -0,0 +1,39 @@
+echo "\
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Get rid of the bottom border */
+#TabsToolbar:after {
+    border-bottom: 0px !important;
+}
+
+/* Hide the new curved tab edges */
+.tab-background {
+    visibility: hidden !important;
+}
+
+/* Hide the little graphic seperators between inactive tabs */
+.tabbrowser-tab:before,
+.tabbrowser-tab:after { 
+    visibility: hidden !important;
+}
+
+#TabsToolbar {
+    -moz-appearance: none !important;
+    background: ${bg_normal} !important; 
+}
+
+.tabbrowser-tab {
+    background: ${bg_normal} !important;
+    color: ${fg_normal} !important;
+	font-family: \"${ttfont}\" !important;
+	font-size: ${ttfont_size}pt !important;
+}
+
+.tabbrowser-tab[selected] {
+    background: ${bg_focus} !important;
+    color: ${fg_focus} !important;
+	font-family: \"${ttfont}\" !important;
+	font-size: ${ttfont_size}pt !important;
+}
+" > /tmp/userChrome.css
+
diff --git a/.config/init/gen-zathurarc.sh b/.config/init/gen-zathurarc.sh
index 576cebb..9e577b5 100644
--- a/.config/init/gen-zathurarc.sh
+++ b/.config/init/gen-zathurarc.sh
@@ -1,7 +1,7 @@
 {
 
 echo "\
-set font                    \"$ttfont\"
+set font                    \"$ttfont $ttfont_size\"
 
 set highlight-color         \"$bg_normal\"
 set highlight-active-color  \"$bg_focus\"
diff --git a/.config/init/init.sh b/.config/init/init.sh
index c4a0ba2..9b45f62 100755
--- a/.config/init/init.sh
+++ b/.config/init/init.sh
@@ -2,3 +2,6 @@
 source ~/.config/init/vars
 
 source ~/.config/init/gen-zathurarc.sh
+source ~/.config/init/gen-urxvt-theme.sh
+source ~/.config/init/gen-userChrome.sh
+source ~/.config/init/gen-bg-saved.sh
diff --git a/.config/init/vars b/.config/init/vars
index e04dbbc..e32b24f 100644
--- a/.config/init/vars
+++ b/.config/init/vars
@@ -2,20 +2,29 @@
 #  general  #
 #############
 
-bheight=18
+bheight=20
 
-bfont1='-*-stlarch-medium-r-*-*-10-*-*-*-*-*-*-*'
-bfont2='-*-fixed-medium-*-*-*-12-*-*-*-*-*-*-*'
+ifont='-*-stlarch-medium-r-*-*-*-*-*-*-*-*-*-*'
+ifont_off='-2'
 
-efont='-*-tamsyn-medium-*-*-*-14-*-*-*-*-*-*-*'
+bfont='Droid Sans Mono'
+bfont_size='8'
+bfont_off='-2'
 
-ttfont='Fira Mono 10'
+jfont='Togoshi Mono'
+jfont_size='10'
+jfont_off='0'
+
+
+ttfont='Hack'
+ttfont_size='10'
 
 ############
 #  themes  #
 ############
 
 # Arch Blue
+#wallpaper='arch-sloppity.png'
 #bg_normal='#333333'
 #fg_normal='#efefef'
 #bg_focus='#00aad4'
@@ -23,13 +32,14 @@ ttfont='Fira Mono 10'
 #bg_urgent='#ff4070'
 #fg_urgent='#efefef'
 #
-#fg_grey='#ababab'
-#fg_red='#ff6699'
-#fg_green='#d5f85f'
-#fg_yellow='#ffa466'
-#fg_blue='#00aad4'
+#std_grey='#ababab'
+#std_red='#ff6699'
+#std_green='#d5f85f'
+#std_yellow='#ffa466'
+#std_blue='#00aad4'
 
 # Section 9
+#wallpaper='gits-city.jpg'
 #bg_normal='#333333'
 #fg_normal='#efefef'
 #bg_focus='#714BA7'
@@ -37,13 +47,29 @@ ttfont='Fira Mono 10'
 #bg_urgent='#ff4070'
 #fg_urgent='#efefef'
 #
-#fg_grey='#ababab'
-#fg_red='#ff6699'
-#fg_green='#d5f85f'
-#fg_yellow='#ffa466'
-#fg_blue='#00aad4'
+#std_grey='#ababab'
+#std_red='#ff6699'
+#std_green='#d5f85f'
+#std_yellow='#ffa466'
+#std_blue='#00aad4'
+
+# Lain Bed
+#wallpaper='lain-bed.png'
+#bg_normal='#262626'
+#fg_normal='#c1b48e'
+#bg_focus='#d0758b'
+#fg_focus='#efefef'
+#bg_urgent='#ff4070'
+#fg_urgent='#efefef'
+#
+#std_grey='#808080'
+#std_red='#d0758b'
+#std_green='#d0758b'
+#std_yellow='#d0758b'
+#std_blue='#d0758b'
 
-# Lain Blind
+# Aigis
+#wallpaper='aigis-1920x1080.png'
 #bg_normal='#262626'
 #fg_normal='#c1b48e'
 #bg_focus='#d0758b'
@@ -51,22 +77,36 @@ ttfont='Fira Mono 10'
 #bg_urgent='#ff4070'
 #fg_urgent='#efefef'
 #
-#fg_grey='#808080'
-#fg_red='#d0758b'
-#fg_green='#d0758b'
-#fg_yellow='#d0758b'
-#fg_blue='#d0758b'
+#std_grey='#566a72'
+#std_red='#ba5654'
+#std_green='#badbb4'
+#std_yellow='#b9c780'
+#std_blue='#99cff3'
+
+# Pink
+wallpaper='kuvshinov-ilya.png'
+
+std_black='#262626'
+std_red='#ed4047'
+std_green='#6dd46b'
+std_yellow='#ccca7a'
+std_blue='#0075a6'
+std_magenta='#e1447b'
+std_cyan='#2dfac9'
+std_white='#e5e8ca'
 
-#  Aigis
-bg_normal='#262626'
-fg_normal='#c1b48e'
-bg_focus='#d0758b'
-fg_focus='#efefef'
-bg_urgent='#ff4070'
-fg_urgent='#efefef'
+light_black='#566a72'
+light_red='#ff666c'
+light_green='#8ff78d'
+light_yellow='#ecea86'
+light_blue='#0094bf'
+light_magenta='#e06d94'
+light_cyan='#9effe4'
+light_white='#ffffff'
 
-fg_grey='#566a72'
-fg_red='#ba5654'
-fg_green='#badbb4'
-fg_yellow='#b9c780'
-fg_blue='#99cff3'
+bg_normal="$std_black"
+fg_normal="$std_white"
+bg_focus="$light_magenta"
+fg_focus="$light_white"
+bg_urgent="$std_red"
+fg_urgent="$light_red"
diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg
deleted file mode 100644
index 48d69f4..0000000
--- a/.config/nitrogen/nitrogen.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[geometry]
-posx=0
-posy=18
-sizex=1920
-sizey=1062
-
-[nitrogen]
-view=icon
-icon_caps=false
-dirs=/home/shmibs/backdrops/shadowed;
diff --git a/.config/pms/rc b/.config/pms/rc
index f6ce920..78be0e7 100644
--- a/.config/pms/rc
+++ b/.config/pms/rc
@@ -1,4 +1,4 @@
-set startuplist=library
+set startuplist=Library
 
 set scroll=centered
 set sort=track disc album
diff --git a/.xinitrc b/.xinitrc
index b712736..8afcf5a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,4 @@
-#initialise configs to auto-match themes
+#initialise configs to auto-match theme
 ~/.config/init/init.sh
 
 #merge Xresources
@@ -51,7 +51,7 @@ compton -b --backend glx --vsync opengl
 #this is an ugly hack which runs a dummy program
 #through bumblebee to get the fans on discrete
 #nvidia graphics cards to shut up
-command -v optirun && $(echo "" | optirun bar)
+command -v optirun && $(echo "" | optirun lemonbar)
 
 xsetroot -cursor_name left_ptr
 nitrogen --restore