diff --git a/.config/.gitignore b/.config/.gitignore
index c23bff0..aa36ced 100644
--- a/.config/.gitignore
+++ b/.config/.gitignore
@@ -8,9 +8,6 @@
 !/alacritty/
 !/bspwm/
 !/dmenu/
-!/fish/
-!/i3/
-!/i3status/
 !/nitrogen/
 !/nvim/
 !/polybar/
diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore
deleted file mode 100644
index eb57c3b..0000000
--- a/.config/fish/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-fish_variables
-
-!.gitignore
diff --git a/.config/fish/completion/watson.fish b/.config/fish/completion/watson.fish
deleted file mode 100644
index e2cf7ce..0000000
--- a/.config/fish/completion/watson.fish
+++ /dev/null
@@ -1,189 +0,0 @@
-# copy this into ~/.config/fish/completions/ to enable autocomplete for the watson time tracker
-#
-function __fish_watson_needs_sub -d "provides a list of sub commands"
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'watson' ]
-    return 0
-  end
-  return 1
-end
-
-function __fish_watson_using_command -d "determine if watson is using the passed command"
-  set cmd (commandline -opc)
-  if [ (count $cmd) -ge 2 -a $cmd[1] = 'watson' ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
-    end
-    return 1
-  end
-  return 1
-end
-
-function __fish_watson_get_projects -d "return a list of projects"
-  command watson projects
-end
-
-function __fish_watson_get_tags -d "return a list of tags"
-  command watson tags
-end
-
-function __fish_watson_has_project -d "determine if watson is using a passed command and if it has a project"
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 2 -a $cmd[1] = 'watson' ]
-    if [ $argv[1] = $cmd[2] ]
-      if contains "$cmd[3]" (__fish_watson_get_projects)
-        return 0
-      end
-    end
-  end
-  return 1
-end
-
-function __fish_watson_has_from -d "determine if watson is using a passed command and if it is using from"
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 2 -a $cmd[1] = 'watson' ]
-    if [ $argv[1] = $cmd[2] ]
-      if contains -- "$cmd[3]" -f --from
-        return 0
-      end
-    end
-  end
-  return 1
-end
-
-function __fish_watson_get_frames -d "return a list of frames" #TODO, use watson logs to get more info
-  command watson frames
-end
-
-function __fish_watson_needs_project -d "check if we need a project"
-  set cmd (commandline -opc)
-  if [ (count $cmd) -ge 2 -a $cmd[1] = 'watson' ]
-    if [ $argv[1] = $cmd[2] ]
-      for i in $cmd
-        if contains $i (__fish_watson_get_projects)
-          return 1 # return 1 because we alredy have a project
-        end
-      end
-      return 0 # we are using $argv as our command and the command does not contain any projects
-    end
-  end
-  return 1
-end
-
-# if a backend.url is set, use it in the command description
-if [ -e ~/.config/watson/config ]
-  set url_string (command watson config backend.url 2> /dev/null)
-  if test -n "$url_string"
-    set url $url_string
-  end
-else
-  set url "a remote Crick server"
-end
-
-# ungrouped
-complete -f -c watson -n '__fish_watson_needs_sub' -a cancel -d "Cancel the last start command"
-complete -f -c watson -n '__fish_watson_needs_sub' -a frames -d "Display the list of all frame IDs"
-complete -f -c watson -n '__fish_watson_needs_sub' -a help -d "Display help information"
-complete -f -c watson -n '__fish_watson_needs_sub' -a projects -d "Display the list of projects"
-complete -f -c watson -n '__fish_watson_needs_sub' -a sync -d "sync your work with $url"
-complete -f -c watson -n '__fish_watson_needs_sub' -a tags -d "Display the list of tags"
-
-# add
-complete -f -c watson -n '__fish_watson_needs_sub' -a add -d "Add time for project with tag(s) that was not tracked live"
-complete -f -c watson -n '__fish_watson_using_command add' -s f -l from -d "Start date for add"
-complete -f -c watson -n '__fish_watson_has_from add' -s t -l to -d "end date for add"
-complete -f -c watson -n '__fish_watson_using_command add' -s c -l confirm-new-project -d "Confirm addition of new project"
-complete -f -c watson -n '__fish_watson_using_command add' -s b -l confirm-new-tag -d "Confirm addition of new tag"
-
-# aggregate
-complete -f -c watson -n '__fish_watson_needs_sub' -a aggregate -d "Display a report of the time spent on each project aggregated by day"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s c -l current -d "include the running frame"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s C -l no-current -d "exclude the running frame (default)"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s f -l from -d "Start date for aggregate"
-complete -f -c watson -n '__fish_watson_has_from aggregate' -s t -l to -d "end date for aggregate"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s p -l project -d "restrict to project" -a "(__fish_watson_get_projects)"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s T -l tag -d "restrict to tag" -a "(__fish_watson_get_tags)"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s j -l json -d "output json"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s s -l csv -d "output csv"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s g -l pager -d "view through pager"
-complete -f -c watson -n '__fish_watson_using_command aggregate' -s G -l no-pager -d "don't vew through pager"
-
-# config
-complete -f -c watson -n '__fish_watson_needs_sub' -a config -d "Get and set configuration options"
-complete -f -c watson -n '__fish_watson_using_command config' -s e -l edit -d "Edit the config with an editor"
-
-# edit
-complete -f -c watson -n '__fish_watson_needs_sub' -a edit -d "Edit a frame"
-complete -f -c watson -n '__fish_watson_using_command edit' -a "(__fish_watson_get_frames)"
-
-# log
-complete -f -c watson -n '__fish_watson_needs_sub' -a log -d "Display sessions during the given timespan"
-complete -f -c watson -n '__fish_watson_using_command log' -s c -l current -d "include the running frame"
-complete -f -c watson -n '__fish_watson_using_command log' -s C -l no-current -d "exclude the running frame (default)"
-complete -f -c watson -n '__fish_watson_using_command log' -s f -l from -d "Start date for log"
-complete -f -c watson -n '__fish_watson_has_from log' -s t -l to -d "end date for log"
-complete -f -c watson -n '__fish_watson_using_command log' -s y -l year -d "show the last year"
-complete -f -c watson -n '__fish_watson_using_command log' -s m -l month -d "show the last month"
-complete -f -c watson -n '__fish_watson_using_command log' -s l -l luna -d "show the last lunar cycle"
-complete -f -c watson -n '__fish_watson_using_command log' -s w -l week -d "show week-to-day"
-complete -f -c watson -n '__fish_watson_using_command log' -s d -l day -d "show today"
-complete -f -c watson -n '__fish_watson_using_command log' -s a -l all -d "show all"
-complete -f -c watson -n '__fish_watson_using_command log' -s p -l project -d "restrict to project" -a "(__fish_watson_get_projects)"
-complete -f -c watson -n '__fish_watson_using_command log' -s T -l tag -d "restrict to tag" -a "(__fish_watson_get_tags)"
-complete -f -c watson -n '__fish_watson_using_command log' -s j -l json -d "output json"
-complete -f -c watson -n '__fish_watson_using_command log' -s s -l csv -d "output csv"
-complete -f -c watson -n '__fish_watson_using_command log' -s g -l pager -d "view through pager"
-complete -f -c watson -n '__fish_watson_using_command log' -s G -l no-pager -d "don't vew through pager"
-
-# merge
-complete -f -c watson -n '__fish_watson_needs_sub' -a merge -d "merge existing frames with conflicting ones"
-complete -f -c watson -n '__fish_watson_using_command merge' -s f -l force -d "silently merge"
-
-# remove
-complete -f -c watson -n '__fish_watson_needs_sub' -a remove -d "Remove a frame"
-complete -f -c watson -n '__fish_watson_using_command remove' -a "(__fish_watson_get_frames)"
-complete -f -c watson -n '__fish_watson_using_command remove' -s f -l force -d "silently remove"
-
-# rename
-complete -f -c watson -n '__fish_watson_needs_sub' -a rename -d "Rename a project or tag"
-complete -f -c watson -n '__fish_watson_using_command rename' -a "(__fish_watson_get_projects) (__fish_watson_get_tags)"
-
-# report
-complete -f -c watson -n '__fish_watson_needs_sub' -a report -d "Display a report of time spent"
-complete -f -c watson -n '__fish_watson_using_command report' -s c -l current -d "include the running frame"
-complete -f -c watson -n '__fish_watson_using_command report' -s C -l no-current -d "exclude the running frame (default)"
-complete -f -c watson -n '__fish_watson_using_command report' -s f -l from -d "Start date for report"
-complete -f -c watson -n '__fish_watson_has_from report' -s t -l to -d "end date for report"
-complete -f -c watson -n '__fish_watson_using_command report' -s y -l year -d "show the last year"
-complete -f -c watson -n '__fish_watson_using_command report' -s m -l month -d "show the last month"
-complete -f -c watson -n '__fish_watson_using_command report' -s l -l luna -d "show the last lunar cycle"
-complete -f -c watson -n '__fish_watson_using_command report' -s w -l week -d "show week-to-day"
-complete -f -c watson -n '__fish_watson_using_command report' -s d -l day -d "show today"
-complete -f -c watson -n '__fish_watson_using_command report' -s a -l all -d "show all"
-complete -f -c watson -n '__fish_watson_using_command report' -s p -l project -d "restrict to project" -a "(__fish_watson_get_projects)"
-complete -f -c watson -n '__fish_watson_using_command report' -s T -l tag -d "restrict to tag" -a "(__fish_watson_get_tags)"
-complete -f -c watson -n '__fish_watson_using_command report' -s j -l json -d "output json"
-complete -f -c watson -n '__fish_watson_using_command report' -s s -l csv -d "output csv"
-complete -f -c watson -n '__fish_watson_using_command report' -s g -l pager -d "view through pager"
-complete -f -c watson -n '__fish_watson_using_command report' -s G -l no-pager -d "don't vew through pager"
-
-# restart
-complete -f -c watson -n '__fish_watson_needs_sub' -a restart -d "Restart monitoring time for a stopped project"
-complete -f -c watson -n '__fish_watson_using_command restart' -s s -l stop -d "stop running project"
-complete -f -c watson -n '__fish_watson_using_command restart' -s S -l no-stop -d "do not stop running project"
-complete -f -c watson -n '__fish_watson_using_command restart' -a "(__fish_watson_get_frames)"
-
-# start
-complete -f -c watson -n '__fish_watson_needs_sub' -a start -d "Start monitoring time for a project"
-complete -f -c watson -n '__fish_watson_needs_project start' -a "(__fish_watson_get_projects)"
-complete -f -c watson -n '__fish_watson_has_project start' -a "+(__fish_watson_get_tags)"
-
-# status
-complete -f -c watson -n '__fish_watson_needs_sub' -a status -d "Display when the current project was started and time spent"
-complete -f -c watson -n '__fish_watson_using_command status' -s p -l project -d "only show project"
-complete -f -c watson -n '__fish_watson_using_command status' -s t -l tags -d "only show tags"
-complete -f -c watson -n '__fish_watson_using_command status' -s e -l elapsed -d "only show elapsed time"
-
-# stop
-complete -f -c watson -n '__fish_watson_needs_sub' -a stop -d "Stop monitoring time for the current project"
-complete -f -c watson -n '__fish_watson_using_command stop' -l at -d "Stop frame at this time (YYYY-MM-DDT)?HH:MM(:SS)?"
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
deleted file mode 100644
index e8fabf6..0000000
--- a/.config/fish/config.fish
+++ /dev/null
@@ -1,52 +0,0 @@
-set -U __fish_init_2_39_8 \x1d
-set -U __fish_init_2_3_0 \x1d
-set -U __fish_init_3_x \x1d
-set -U fish_color_autosuggestion 969896
-set -U fish_color_cancel \x2dr
-set -U fish_color_command b294bb
-set -U fish_color_comment f0c674
-set -U fish_color_cwd green
-set -U fish_color_cwd_root red
-set -U fish_color_end b294bb
-set -U fish_color_error cc6666
-set -U fish_color_escape 00a6b2
-set -U fish_color_history_current \x2d\x2dbold
-set -U fish_color_host normal
-set -U fish_color_match \x2d\x2dbackground\x3dbrblue
-set -U fish_color_normal normal
-set -U fish_color_operator 00a6b2
-set -U fish_color_param 81a2be
-set -U fish_color_quote b5bd68
-set -U fish_color_redirection 8abeb7
-set -U fish_color_search_match bryellow\x1e\x2d\x2dbackground\x3dbrblack
-set -U fish_color_selection white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-set -U fish_color_status red
-set -U fish_color_user brgreen
-set -U fish_color_valid_path \x2d\x2dunderline
-set -U fish_cursor_default block
-set -U fish_cursor_insert line
-set -U fish_cursor_replace_one underscore
-set -U fish_greeting 
-set -U fish_key_bindings fish_vi_key_bindings
-set -U fish_pager_color_completion normal
-set -U fish_pager_color_description B3A06D\x1eyellow
-set -U fish_pager_color_prefix white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-set -U fish_pager_color_progress brwhite\x1e\x2d\x2dbackground\x3dcyan
-
-set fish_prompt_pwd_dir_length 0
-
-set -x SSH_AUTH_SOCK (gpgconf --list-dir socketdir)'/S.gpg-agent.ssh'
-set -x GPG_TTY (tty)
-gpg-connect-agent updatestartuptty /bye > /dev/null
-
-set -x EDITOR 'nvim'
-set -x TERMINAL 'gnome-terminal'
-
-set -x PATH "$HOME/bin" "$HOME/.local/bin" "$HOME/JUCE" "$HOME/.gem/ruby/2.6.0/bin" $PATH
-set -x JUCE_PATH "$HOME/JUCE"
-set -x FRUT_PATH "$HOME/FRUT"
-
-set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH
-set -x CXXFLAGS '-std=c++14'
-
-set -x LIBGL_ALWAYS_INDIRECT 1
diff --git a/.config/fish/functions/construct_column_aware_prompt.fish b/.config/fish/functions/construct_column_aware_prompt.fish
deleted file mode 100644
index a255f19..0000000
--- a/.config/fish/functions/construct_column_aware_prompt.fish
+++ /dev/null
@@ -1,43 +0,0 @@
-function construct_column_aware_prompt -a prompt_prefix prompt_dir
-    set -l prompt_concat "$prompt_prefix$prompt_dir"
-
-    if test (expr length "$prompt_concat") -le $COLUMNS
-        echo $prompt_prefix$prompt_dir
-    else
-        if test (expr length "$prompt_prefix") -le $COLUMNS
-            set -l split_prompt_concat (string split "/" $prompt_dir)
-
-            if test (count $split_prompt_concat) -lt 2
-                echo (string sub -s 1 -l (math $COLUMNS - (expr length "$prompt_prefix")) $prompt_dir)
-            else
-                for i in (seq (count $split_prompt_concat))
-                    if test (expr length "> $split_prompt_concat[$i]/") -gt $COLUMNS
-                        set split_prompt_concat[$i] (string sub -s 1 -l (math $COLUMNS - 8) $split_prompt_concat[$i])'[...]'
-                    end
-                end
-
-                set -l tmp_lines "$prompt_prefix"
-
-                for item in $split_prompt_concat
-                    set -l tmp_line "$tmp_lines$item/"
-                    if test (expr length "$tmp_line") -le $COLUMNS
-                        set tmp_lines $tmp_line
-                    else
-                        echo $tmp_lines
-                        set tmp_lines "> $item/"
-                    end
-                end
-
-                set -l tmp_lines_length (expr length "$tmp_lines")
-                if test $tmp_lines_length -gt 0
-                    echo (string sub -s 1 -l (math $tmp_lines_length - 1) $tmp_lines)
-                end
-            end
-        else
-            set -l rec (construct_column_aware_prompt "" $prompt_dir)
-            for item in rec
-                echo $item
-            end
-        end
-    end
-end
diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
deleted file mode 100644
index 727b296..0000000
--- a/.config/fish/functions/fish_prompt.fish
+++ /dev/null
@@ -1,24 +0,0 @@
-function fish_prompt --description 'Write out the prompt'
-    if test (id -u) -eq 0
-        set prompt_symbol '#'
-    else
-        set prompt_symbol '$'
-    end
-
-    set -l prompt_prefix (set_color yellow)(whoami)'@'(set_color purple)(prompt_hostname)' '
-    set -l prompt_dir (set_color green)(prompt_pwd)
-
-    set -l column_aware_prompt (construct_column_aware_prompt $prompt_prefix $prompt_dir)
-
-    if test -z $WINDOW
-        for dir in $column_aware_prompt
-            echo $dir
-        end
-
-        set_color normal
-
-        echo $prompt_symbol' '
-    else
-        printf '%s%s@%s%s%s (%s)%s%s%s\n%s ' (set_color yellow) (whoami) (set_color purple) (prompt_hostname) (set_color white) (echo $WINDOW) (set_color green) (prompt_pwd) (set_color normal) $prompt_symbol
-    end
-end
diff --git a/.config/fish/functions/la.fish b/.config/fish/functions/la.fish
deleted file mode 100644
index 000833e..0000000
--- a/.config/fish/functions/la.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function la
-    ls -A $argv
-end
diff --git a/.config/fish/functions/layout.fish b/.config/fish/functions/layout.fish
deleted file mode 100644
index 1e90be8..0000000
--- a/.config/fish/functions/layout.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function layout
-    xkblayout-state print "%s %v"
-end
diff --git a/.config/fish/functions/ll.fish b/.config/fish/functions/ll.fish
deleted file mode 100644
index 4a69023..0000000
--- a/.config/fish/functions/ll.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function ll
-    ls -alhF $argv
-end
diff --git a/.config/fish/functions/picom_default.fish b/.config/fish/functions/picom_default.fish
deleted file mode 100644
index 42ac03a..0000000
--- a/.config/fish/functions/picom_default.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function picom_default
-    picom -bGC --backend glx --unredir-if-possible-delay 1000 --vsync
-end
diff --git a/.config/fish/functions/screenkey-obs.fish b/.config/fish/functions/screenkey-obs.fish
deleted file mode 100644
index 6b5b15c..0000000
--- a/.config/fish/functions/screenkey-obs.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function screenkey-obs
-    screenkey --no-systray -t 2 -p fixed -s small -g 960x36+960+4 --key-mode composed --bak-mode full --mods-mode normal --scr 0 -f Hack
-end
diff --git a/.config/fish/functions/tmate-obs.fish b/.config/fish/functions/tmate-obs.fish
deleted file mode 100644
index efc6ca0..0000000
--- a/.config/fish/functions/tmate-obs.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function tmate-obs
-    tmate -k tmk-ET35fx5m9cA7cxOt4jjWkSmaOy -r DustVoice
-end
diff --git a/.config/fish/functions/xfce-polkit.fish b/.config/fish/functions/xfce-polkit.fish
deleted file mode 100644
index 761cce9..0000000
--- a/.config/fish/functions/xfce-polkit.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function xfce-polkit
-    /usr/lib/xfce-polkit/xfce-polkit
-end
diff --git a/.config/i3/config b/.config/i3/config
deleted file mode 100644
index bc9ce3c..0000000
--- a/.config/i3/config
+++ /dev/null
@@ -1,317 +0,0 @@
-set $mod Mod1
-set $alt_mod Mod4
-
-#new_window none
-#new_float normal
-
-exec --no-startup-id xsetroot -solid "#333333"
-
-default_border normal
-default_floating_border normal
-
-focus_wrapping no
-
-hide_edge_borders none
-
-bindsym $mod+u border none
-bindsym $mod+i border pixel 1
-bindsym $mod+o border normal
-
-#font xft:URWGothic-Book 11
-font Hack 11
-
-floating_modifier $mod
-
-bindsym $mod+Return exec alacritty
-
-# Window kill command
-bindsym $mod+Shift+q kill
-
-# start program launcher
-#bindsym $mod+d exec dmenu_run
-bindsym $mod+d exec --no-startup-id rofi -show run
-#bindsym $mod+d exec --no-startup-id rofi -show run -lines 3 -eh 2 -width 100 -padding 800 -opacity "85" -bw 0 -bc "$bg-color" -bg "$bg-color" -fg "$text-color" -hlbg "$bg-color" -hlfg "#9575cd"
-bindsym $mod+Shift+d exec --no-startup-id rofi -show run -run-command 'sudo {cmd}'
-#bindsym $mod+d exec SUDO_ASKPASS=~/bin/askpass-rofi --no-startup-id rofi -show drun -run-command 'sudo -A {cmd}'
-
-# change focus
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-
-# move focused window
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move down
-bindsym $mod+Shift+k move up
-bindsym $mod+Shift+l move right
-
-# move workspace
-bindsym $mod+Shift+Ctrl+h move workspace to output left
-bindsym $mod+Shift+Ctrl+l move workspace to output right
-
-# workspace back and forth (with/without active container)
-workspace_auto_back_and_forth no
-bindsym $mod+b workspace back_and_forth
-bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
-
-# split orientation
-bindsym $mod+n split h;exec notify-send 'tile horizontally'
-bindsym $mod+v split v;exec notify-send 'tile vertically'
-bindsym $mod+q split toggle;exec notify-send 'tile toggle'
-
-# toggle fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking;exec notify-send 'layout stacking'
-bindsym $mod+w layout tabbed;exec notify-send 'layout tabbed'
-bindsym $mod+e layout toggle split;exec notify-send 'layout split'
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# toggle sticky
-bindsym $mod+Shift+s sticky toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# move the currently focused window to the scratchpad
-bindsym $mod+Shift+minus move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
-
-# navigate workspaces next / previous
-bindsym $mod+Ctrl+l workspace next
-bindsym $mod+Ctrl+h workspace prev
-
-# workspaces
-set $ws1 1
-set $ws2 2
-set $ws3 3
-set $ws4 4
-set $ws5 5
-set $ws6 6
-set $ws7 7
-set $ws8 8
-set $ws9 9
-set $ws10 10
-set $ws11 11
-set $ws12 12
-set $ws13 13
-set $ws14 14
-set $ws15 15
-set $ws16 16
-set $ws17 17
-set $ws18 18
-set $ws19 19
-set $ws20 20
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-
-# Move to workspace
-bindsym $mod+Ctrl+1 move container to workspace $ws1
-bindsym $mod+Ctrl+2 move container to workspace $ws2
-bindsym $mod+Ctrl+3 move container to workspace $ws3
-bindsym $mod+Ctrl+4 move container to workspace $ws4
-bindsym $mod+Ctrl+5 move container to workspace $ws5
-bindsym $mod+Ctrl+6 move container to workspace $ws6
-bindsym $mod+Ctrl+7 move container to workspace $ws7
-bindsym $mod+Ctrl+8 move container to workspace $ws8
-bindsym $mod+Ctrl+9 move container to workspace $ws9
-bindsym $mod+Ctrl+0 move container to workspace $ws10
-
-# Move to workspace with focused container
-bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10; workspace $ws10
-
-bindsym $mod+x exec --no-startup-id i3-input -F 'workspace "%s"' -P 'Go to workspace: '
-bindsym $mod+Shift+x exec --no-startup-id "i3-input -F 'move container to workspace \\"%s\\"; workspace \\"%s\\"' -P 'Move container and go to workspace: '"
-bindsym $mod+Ctrl+x exec --no-startup-id i3-input -F 'move container to workspace "%s"' -P 'Move container to workspace: '
-
-# Open specific applications in floating mode
-for_window [title="alsamixer"] floating enable border pixel 1
-for_window [class="Calamares"] floating enable border normal
-for_window [class="Clipgrab"] floating enable
-for_window [title="File Transfer*"] floating enable
-for_window [class="Galculator"] floating enable border pixel 1
-for_window [class="GParted"] floating enable border normal
-for_window [title="i3_help"] floating enable sticky enable border normal
-for_window [class="Lightdm-gtk-greeter-settings"] floating enable
-for_window [class="Lxappearance"] floating enable sticky enable border normal
-for_window [class="Manjaro-hello"] floating enable
-for_window [class="Manjaro Settings Manager"] floating enable border normal
-for_window [title="MuseScore: Play Panel"] floating enable
-for_window [class="Nitrogen"] floating enable sticky enable border normal
-for_window [class="Oblogout"] fullscreen enable
-for_window [class="octopi"] floating enable
-for_window [title="About Pale Moon"] floating enable
-for_window [class="Pamac-manager"] floating enable
-for_window [class="Pavucontrol"] floating enable
-for_window [class="qt5ct"] floating enable sticky enable border normal
-for_window [class="Qtconfig-qt4"] floating enable sticky enable border normal
-for_window [class="Simple-scan"] floating enable border normal
-for_window [class="(?i)System-config-printer.py"] floating enable border normal
-for_window [class="Skype"] floating enable border normal
-for_window [class="Thus"] floating enable border normal
-for_window [class="Timeset-gui"] floating enable border normal
-for_window [class="(?i)virtualbox"] floating enable border normal
-for_window [class="Xfburn"] floating enable
-
-# switch to workspace with urgent window automatically
-for_window [urgent=latest] focus
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-
-# exit i3 (logs you out of your X session)
-# bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+Shift+e exec i3-msg exit
-
-# Set shut down, restart and locking features
-bindsym $mod+= mode "$mode_system"
-set $mode_system (l)ock, (e)xit, switch_(u)ser, (s)uspend, (h)ibernate, (r)eboot, (Shift+s)hutdown
-mode "$mode_system" {
-    bindsym l exec --no-startup-id i3exit lock, mode "default"
-    bindsym s exec --no-startup-id i3exit suspend, mode "default"
-    bindsym u exec --no-startup-id i3exit switch_user, mode "default"
-    bindsym e exec --no-startup-id i3exit logout, mode "default"
-    bindsym h exec --no-startup-id i3exit hibernate, mode "default"
-    bindsym r exec --no-startup-id i3exit reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default"
-
-    # exit system mode: "Enter" or "Escape"
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-
-# Resize window (you can also use the mouse for that)
-bindsym $mod+r mode "resize"
-mode "resize" {
-        # These bjndings trigger as soon as you enter the resize mode
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym h resize shrink width 5 px or 5 ppt
-        bindsym j resize grow height 5 px or 5 ppt
-        bindsym k resize shrink height 5 px or 5 ppt
-        bindsym l resize grow width 5 px or 5 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # exit resize mode: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-# Rename workspace
-bindsym $mod+z exec --no-startup-id i3-input -F 'rename workspace to "%s"' -P 'New name for this workspace: '
-
-# Autostart applications
-exec --no-startup-id nitrogen --restore; sleep 1;
-# exec --no-startup-id picom -bCG --backend glx --unredir-if-possible-delay 1000 --vsync
-exec --no-startup-id /usr/lib/xfce-polkit/xfce-polkit
-exec --no-startup-id xss-lock -- i3lock -n -e -c 333333
-# exec --no-startup-id xfce4-power-manager
-# exec_always --no-startup-id ~/.config/polybar/i3wmthemer_bar_launch.sh
-
-bar {
-    position top
-    status_command i3status
-    binding_mode_indicator yes
-}
-
-# Theme colors
-client.focused #a6f6c6 #3f853f #e6e6e6 #ff0077 #8abeb7
-client.focused_inactive #c6c6c6 #1f1f1f #c6c6c6 #1f1f1f #8abeb7
-client.unfocused #c6c6c6 #1f1f1f #c6c6c6 #ff0077 #8abeb7
-client.urgent #f6a6a6 #3f1f1f #e6c6c6 #3f1f1f #8abeb7
-client.placeholder #c6c6c6 #1f1f1f #c6c6c6 #1f1f1f #8abeb7
-
-client.background #1f1f1f
-
-# Gaps
-#gaps inner 10
-#gaps outer -4
-#
-#smart_gaps on
-
-set $mode_gaps Gaps: (o) outer, (i) inner
-set $mode_gaps_outer Outer Gaps: l|h|0 (local), Shift + l|h|0 (global)
-set $mode_gaps_inner Inner Gaps: l|h|0 (local), Shift + l|h|0 (global)
-bindsym $mod+Shift+g mode "$mode_gaps"
-
-mode "$mode_gaps" {
-        bindsym o      mode "$mode_gaps_outer"
-        bindsym i      mode "$mode_gaps_inner"
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_inner" {
-        bindsym l           gaps inner current plus 5
-        bindsym h           gaps inner current minus 5
-        bindsym 0           gaps inner current set 0
-
-        bindsym Shift+l     gaps inner all plus 5
-        bindsym Shift+h     gaps inner all minus 5
-        bindsym Shift+0     gaps inner all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_outer" {
-        bindsym l           gaps outer current plus 5
-        bindsym h           gaps outer current minus 5
-        bindsym 0           gaps outer current set 0
-
-        bindsym Shift+l     gaps outer all plus 5
-        bindsym Shift+h     gaps outer all minus 5
-        bindsym Shift+0     gaps outer all set 0
-
-        bindsym Return mode "$mode_gaps"
-        bindsym Escape mode "default"
-}
-
-# set power-manager and volume control
-# exec --no-startup-id mate-power-manager
-
-# bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 0 -q set Master 2dB+ unmute
-# bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 0 -q set Master 2db- unmute
-# bindsym XF86AudioMute exec --no-startup-id amixer -q set Master toggle
-#
-# touchpad on and off controller on laptop with Fn+<touchpad control functional key>
-# bindsym XF86TouchpadOn exec --no-startup-id synclient Touchpadoff=0
-# bindsym XF86TouchpadOff exec --no-startup-id synclient Touchpadoff=1
diff --git a/.config/i3status/config b/.config/i3status/config
deleted file mode 100644
index d5b0e70..0000000
--- a/.config/i3status/config
+++ /dev/null
@@ -1,64 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 5
-}
-
-order += "volume master"
-order += "wireless _first_"
-order += "ethernet _first_"
-order += "battery all"
-order += "disk /"
-order += "cpu_usage"
-order += "memory"
-order += "tztime local"
-
-volume master {
-    format = "VOL: %volume"
-    device = "default"
-    mixer = "Master"
-}
-
-wireless _first_ {
-    format_up = "W: %ip (%quality at %essid, %bitrate)"
-    format_down = "W: down"
-}
-
-ethernet _first_ {
-    format_up = "E: %ip (%speed)"
-    format_down = "E: down"
-}
-
-battery all {
-    format = "%status %percentage (%remaining)"
-    format_down = "No battery found"
-    status_chr = "CHR"
-    status_bat = "BAT"
-    status_unk = "UNK"
-    status_full = "FULL"
-}
-
-disk "/" {
-    format = "%used / %total"
-}
-
-cpu_usage {
-    format = "%usage"
-}
-
-memory {
-    format = "%used | %available"
-    threshold_degraded = "1G"
-    format_degraded = "MEMORY < %available"
-}
-
-tztime local {
-    format = "%Y-%m-%d %H:%M:%S"
-}
diff --git a/.gitignore b/.gitignore
index af54b21..34897f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 
 !/.bashrc
 !/.gitconfig
-!/.inputrc
 !/.nvidia-xinitrc
 !/.oh-my-zsh
 !/.password-store
@@ -13,7 +12,6 @@
 !/.vimrc
 !/.xinitrc
 !/.Xmodmap.example
-!/.Xresources
 !/.zshenv
 !/.zshpath.example
 !/.zshrc
diff --git a/.password-store b/.password-store
index 45d2903..0990315 160000
--- a/.password-store
+++ b/.password-store
@@ -1 +1 @@
-Subproject commit 45d2903e0f4684cfbaaf9e8b1e3f5f5c9519efc1
+Subproject commit 0990315861cc27af6701ba9ef9006209581622db