diff --git a/apps/alacritty/alacritty.yml b/apps/alacritty/alacritty.yml
index b19bd6b..6314d65 100644
--- a/apps/alacritty/alacritty.yml
+++ b/apps/alacritty/alacritty.yml
@@ -39,19 +39,19 @@ draw_bold_text_with_bright_colors: true
 font:
   # The normal (roman) font face to use.
   normal:
-    family: Monaco # should be "Menlo" or something on macOS.
+    family: Iosevka # should be "Menlo" or something on macOS.
     # Style can be specified to pick a specific face.
     # style: Regular
 
   # The bold font face
   bold:
-    family: Monaco # should be "Menlo" or something on macOS.
+    family: Iosevka # should be "Menlo" or something on macOS.
     # Style can be specified to pick a specific face.
     # style: Bold
 
   # The italic font face
   italic:
-    family: Monaco # should be "Menlo" or something on macOS.
+    family: Iosevka # should be "Menlo" or something on macOS.
     # Style can be specified to pick a specific face.
     # style: Italic
 
@@ -60,7 +60,7 @@ font:
   # Offset is the extra space around each character. offset.y can be thought of
   # as modifying the linespacing, and offset.x as modifying the letter spacing.
   offset:
-    x: -5.0
+    x: -37.0
     y: 0.0
 
   # OS X only: use thin stroke font rendering. Thin strokes are suitable
diff --git a/apps/qutebrowser/qutebrowser.conf b/apps/qutebrowser/qutebrowser.conf
index cc56a23..4b2dc54 100644
--- a/apps/qutebrowser/qutebrowser.conf
+++ b/apps/qutebrowser/qutebrowser.conf
@@ -53,7 +53,7 @@ yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,ut
 #     Any {} in the string will be expanded to the filename, else the
 #     filename will be appended.
 #     Default:
-default-open-dispatcher = 
+default-open-dispatcher =
 
 # default-page (FuzzyUrl):
 #     The page to open if :open -t/-b/-w is used without URL. Use
@@ -181,7 +181,7 @@ save-session = true
 #     The name of the session to save by default, or empty for the last
 #     loaded session.
 #     Default:
-session-default-name = 
+session-default-name =
 
 # url-incdec-segments (FlagList):
 #     The URL segments where `:navigate increment/decrement` will search
@@ -264,7 +264,7 @@ frame-flattening = false
 #     User stylesheet to use (absolute filename or filename relative to
 #     the config directory). Will expand environment variables.
 #     Default:
-user-stylesheet = 
+user-stylesheet =
 
 # hide-scrollbar (Bool):
 #     Hide the main scrollbar.
@@ -329,7 +329,7 @@ hide-wayland-decoration = false
 #     Globs are supported, so ';*' will blacklist all keychainsstarting
 #     with ';'. Use '*' to disable keyhints
 #     Default:
-keyhint-blacklist = 
+keyhint-blacklist =
 
 # keyhint-delay (Int):
 #     Time from pressing a key to seeing the keyhint dialog (ms)
@@ -375,7 +375,7 @@ referer-header = same-domain
 # user-agent (UserAgent):
 #     User agent to send. Empty to send the default.
 #     Default:
-user-agent = 
+user-agent =
 
 # proxy (Proxy):
 #     The proxy to use.
@@ -407,13 +407,13 @@ dns-prefetch = true
 # custom-headers (HeaderDict):
 #     Set custom headers for qutebrowser HTTP requests.
 #     Default:
-custom-headers = 
+custom-headers =
 
 # netrc-file (File):
 #     Set location of a netrc-file for HTTP authentication. If empty,
 #     ~/.netrc is used.
 #     Default:
-netrc-file = 
+netrc-file =
 
 
 # Options related to completion and command history.
@@ -614,7 +614,7 @@ last-close = ignore
 #         multiple: Hide the tab bar if only one tab is open.
 #         switching: Show the tab bar when switching tabs.
 #     Default: always
-show = multiple
+show = switching
 
 # show-switching-delay (Int):
 #     Time to show the tab bar before hiding it when tabs->show is set
@@ -697,13 +697,13 @@ tabs-are-windows = false
 #     * `{backend}`: Either 'webkit' or 'webengine'
 #     * `{private}` : Indicates when private mode is enabled.
 #     Default: {index}: {title}
-title-format = {index}: {title}
+title-format = {title}
 
 # title-format-pinned (FormatString):
 #     The format to use for the tab title for pinned tabs. The same
 #     placeholders like for title-format are defined.
 #     Default: {index}
-title-format-pinned = {index}
+title-format-pinned =
 
 # title-alignment (TextAlignment):
 #     Alignment of the text inside of tabs
@@ -735,7 +735,7 @@ indicator-padding = 2,2,0,4
 #     The directory to save downloads to. An empty value selects a
 #     sensible os-specific default. Will expand environment variables.
 #     Default:
-download-directory = 
+download-directory =
 
 # prompt-download-directory (Bool):
 #     Whether to prompt the user for the download location.
@@ -783,7 +783,7 @@ local-storage = true
 # cache-size (Int):
 #     Size of the HTTP network cache. Empty to use the default value.
 #     Default:
-cache-size = 
+cache-size =
 
 
 # Loaded plugins/scripts and allowed actions.
@@ -1478,12 +1478,12 @@ prompts.selected.bg = #308cc6
 #     Default: xos4 Terminus, Terminus, Monospace, "DejaVu Sans Mono",
 #     Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New",
 #     Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
-_monospace = Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
+_monospace = Iosevka, Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
 
 # completion (Font):
 #     Font used in the completion widget.
 #     Default: 8pt ${_monospace}
-completion = 8pt ${_monospace}
+completion = 9pt ${_monospace}
 
 # completion.category (Font):
 #     Font used in the completion categories.
@@ -1518,32 +1518,32 @@ debug-console = 8pt ${_monospace}
 # web-family-standard (FontFamily):
 #     Font family for standard fonts.
 #     Default:
-web-family-standard = 
+web-family-standard =
 
 # web-family-fixed (FontFamily):
 #     Font family for fixed fonts.
 #     Default:
-web-family-fixed = 
+web-family-fixed =
 
 # web-family-serif (FontFamily):
 #     Font family for serif fonts.
 #     Default:
-web-family-serif = 
+web-family-serif =
 
 # web-family-sans-serif (FontFamily):
 #     Font family for sans-serif fonts.
 #     Default:
-web-family-sans-serif = 
+web-family-sans-serif =
 
 # web-family-cursive (FontFamily):
 #     Font family for cursive fonts.
 #     Default:
-web-family-cursive = 
+web-family-cursive =
 
 # web-family-fantasy (FontFamily):
 #     Font family for fantasy fonts.
 #     Default:
-web-family-fantasy = 
+web-family-fantasy =
 
 # web-size-minimum (Int):
 #     The hard minimum font size.
diff --git a/de/bar/bar.bash b/de/bar/bar.bash
index 8bb9396..1f737fa 100755
--- a/de/bar/bar.bash
+++ b/de/bar/bar.bash
@@ -7,12 +7,11 @@ export BAR_ON_TOP=0
 export BAR_SIDE_MARGIN=200
 
 MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1)
-export BAR_FONT=$(xrdb -query | sed -ne      's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)
-# export BAR_ICON_FONT="Font Awesome 5 Free"
-# export BAR_ICON_FONT_2="Font Awesome 5 Brands"
-export BAR_ICON_FONT="FontAwesome"
-export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)
-export BAR_ICON_FONT_SIZE=$((BAR_FONT_SIZE))
+
+export BAR_FONT="${BAR_FONT:-$(xrdb -query | sed -ne      's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1)}"
+export BAR_ICON_FONT="${BAR_ICON_FONT:-"FontAwesome"}"
+export BAR_FONT_SIZE="${BAR_FONT_SIZE:-$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1)}"
+export BAR_ICON_FONT_SIZE="${BAR_ICON_FONT_SIZE:-$((BAR_FONT_SIZE))}"
 
 export GAP=$(bspc wm -d | grep -Po '(windowGap.*?,)' | grep -Po '\-?\d*' | head -n 1)
 
diff --git a/de/xinitrc b/de/xinitrc
index a7ca66e..5fcfe53 100644
--- a/de/xinitrc
+++ b/de/xinitrc
@@ -20,6 +20,8 @@ if [ -f "$HOME/.xmodmap" ]; then
 	xmodmap "$HOME/.xmodmap"
 fi
 
+xcape -e 'Control_L=Escape' &
+
 pulseaudio --start &
 
 xset s off -dpms &
diff --git a/de/xmodmap b/de/xmodmap
index 0a06bb5..83c89c2 100644
--- a/de/xmodmap
+++ b/de/xmodmap
@@ -1,2 +1,7 @@
-remove Lock = Caps_Lock
-keysym Caps_Lock = Escape
+! convert caps lock to control
+clear Lock
+keycode 66 = Control_L
+add Control = Control_L
+
+! a fake keycode for xcape
+keycode 999 = Escape
diff --git a/shell/aliases b/shell/aliases
index 6748041..e38d240 100644
--- a/shell/aliases
+++ b/shell/aliases
@@ -104,21 +104,8 @@ alias resrc="source \$HOME/.bashrc"
 alias redshift="redshift -l 39.0997:-94.5786"
 alias gpmdpe="electron --app=/usr/share/gpmdp/resources/app.asar"
 
-screenshot() {
-	SCROT_DIR="$NICE_HOME/img/scrots/"
-	mkdir -p "$SCROT_DIR"
-	scrot "$@" "$NICE_HOME/img/scrots/%Y-%m-%d_%H-%M-%S_\$wx\$h.png"
-}
-export -f screenshot
-
 export NOTES_DIR="$NICE_HOME"
 
-n() {
-	SUBDIR="${2:-}"
-	mkdir -p "$NICE_HOME/doc/notes/$SUBDIR"
-	"$EDITOR" "$NICE_HOME/doc/notes/$SUBDIR/$(date +%Y-%m-%d)_$1.md"
-}
-
 # games aliases
 # this sometimes fixes steam dynamic library issues?
 # alias steam="LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1 /usr/$LIB/libgpg-error.so' steam"
diff --git a/shell/bashrc b/shell/bashrc
index bdea78c..451a680 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -20,7 +20,7 @@ source "$DOTFILES_PATH/shell/paths"
 source "$DOTFILES_PATH/shell/aliases"
 
 # import our global shell functions
-source "$DOTFILES_PATH/shell/shell_funcs"
+source "$DOTFILES_PATH/shell/funcs"
 
 # import our autocompletions
 source "$DOTFILES_PATH/shell/autocompletions"
diff --git a/shell/shell_funcs b/shell/funcs
similarity index 71%
rename from shell/shell_funcs
rename to shell/funcs
index 4dd5077..0432f4c 100644
--- a/shell/shell_funcs
+++ b/shell/funcs
@@ -24,6 +24,33 @@ startbar() {
 }
 export -f startbar
 
+restartbar() {
+	stopbar
+	startbar
+}
+export -f restartbar
+
+screenshot() {
+	SCROT_DIR="$NICE_HOME/img/scrots/"
+	mkdir -p "$SCROT_DIR"
+	FILENAME="$NICE_HOME/img/scrots/%Y-%m-%d_%H-%M-%S_\$wx\$h.png"
+	scrot "$@" "${FILENAME}" >/dev/null && echo "Saved screenshot to: ${FILENAME}"
+}
+export -f screenshot
+
+editscrot() {
+	SCROT_DIR="$NICE_HOME/img/scrots/"
+	LATEST_SCROT="$(\ls -Art "${SCROT_DIR}" | tail -n 1)"
+	krita "${SCROT_DIR}${LATEST_SCROT}"
+}
+
+n() {
+	SUBDIR="${2:-}"
+	mkdir -p "$NICE_HOME/doc/notes/$SUBDIR"
+	"$EDITOR" "$NICE_HOME/doc/notes/$SUBDIR/$(date +%Y-%m-%d)_$1.md"
+}
+export -f n
+
 # save the current directory for later retrieval
 scwd() {
 	addon=""