diff --git a/i3-gaps-home/.config/i3/config b/i3-gaps-home/.config/i3/config
index f32b9f0c..f8757a2c 100644
--- a/i3-gaps-home/.config/i3/config
+++ b/i3-gaps-home/.config/i3/config
@@ -1,38 +1,19 @@
# ArchLabs i3 config
-# Xresources var value fallback
-set_from_resource $bg background #19043C
-set_from_resource $fg foreground #F1F1F1
-set_from_resource $black color0 #19043C
-set_from_resource $red color1 #EE79A9
-set_from_resource $green color2 #8C9440
-set_from_resource $yellow color3 #DE935F
-set_from_resource $blue color4 #05C6F1
-set_from_resource $purple color5 #85678F
-set_from_resource $cyan color6 #5E8D87
-set_from_resource $grey color7 #969CD3
-
-# class bd bg txt ind child_bd
-client.focused $grey $bg $fg $blue $grey
-client.unfocused $grey $bg $black $bg $bg
-client.focused_inactive $grey $bg $black $bg $bg
-client.urgent $red $bg $red $red $red
-client.placeholder $grey $bg $bg $bg $bg
-client.background $bg
-
-# border & title.. Must be set to border pixel for gaps to work
-for_window [class="^.*"] border pixel 2, title_format " %class >> %title "
+# border & title
+for_window [class="^.*"] border pixel 1, title_format " %class >> %title "
# gaps
-gaps inner 15
-gaps outer 5
+gaps inner 8
+gaps outer 0
# font
font pango:monospace 11
-# $Mod = Super or Alt?
+# mod key used for most binds
+# Mod1 = Alt
+# Mod4 = Super
set $Mod Mod4
-#set $Mod Mod1
# direction keys
set $up l
@@ -40,26 +21,12 @@ set $down k
set $left j
set $right semicolon
-set $WS1 "1: "
-set $WS2 "2: "
-set $WS3 "3: "
-set $WS4 "4: "
-set $WS5 "5: "
-set $WS6 "6: "
-set $WS7 "7: "
-set $WS8 "8: "
-
-#####################################################
############### Bar ##################
-#####################################################
-
bar {
status_command i3status
}
-#####################################################
############### Autostart ##################
-#####################################################
# run with reload
exec_always --no-startup-id xrdb -load ~/.Xresources
@@ -70,9 +37,7 @@ exec --no-startup-id xfsettingsd
# needed for super to launch rofi through ksuperkey, see ~/.xprofile
bindsym Mod1+F1 exec --no-startup-id rofi_run -r
-###########################################################
############# Bindings ##################
-###########################################################
# kill focused window
bindsym $Mod+Shift+q kill
@@ -95,76 +60,67 @@ bindsym $Mod+x exec --no-startup-id rofi_run -l
# Screenshot
bindsym Print exec --no-startup-id "scrot '%S.png' -e 'mv $f $$(xdg-user-dir PICTURES)/ArchLabs-%S-$wx$h.png ; feh $$(xdg-user-dir PICTURES)/ArchLabs-%S-$wx$h.png'"
-# reload status
-set $refresh_i3status killall -SIGUSR1 i3status
-
# audio
bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
bindsym XF86AudioNext exec --no-startup-id playerctl next
bindsym XF86AudioPrev exec --no-startup-id playerctl previous
bindsym XF86AudioStop exec --no-startup-id playerctl stop
-
-# reload status when changing volume
-bindsym XF86AudioMute exec --no-startup-id pamixer -t && $refresh_i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pamixer -i 2 && $refresh_i3status
-bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 2 && $refresh_i3status
+bindsym XF86AudioMute exec --no-startup-id pamixer -t
+bindsym XF86AudioRaiseVolume exec --no-startup-id pamixer -i 2
+bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 2
# backlight
bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10
bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10
-################################################################
########### Workspace Bindings ###############
-################################################################
# 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+1 workspace 1
+bindsym $Mod+2 workspace 2
+bindsym $Mod+3 workspace 3
+bindsym $Mod+4 workspace 4
+bindsym $Mod+5 workspace 5
+bindsym $Mod+6 workspace 6
+bindsym $Mod+7 workspace 7
+bindsym $Mod+8 workspace 8
# switch to workspace - numpad alternatives
-bindsym $mod+Mod2+KP_1 workspace $WS1
-bindsym $mod+Mod2+KP_2 workspace $WS2
-bindsym $mod+Mod2+KP_3 workspace $WS3
-bindsym $mod+Mod2+KP_4 workspace $WS4
-bindsym $mod+Mod2+KP_5 workspace $WS5
-bindsym $mod+Mod2+KP_6 workspace $WS6
-bindsym $mod+Mod2+KP_7 workspace $WS7
-bindsym $mod+Mod2+KP_8 workspace $WS8
+bindsym $mod+Mod2+KP_1 workspace 1
+bindsym $mod+Mod2+KP_2 workspace 2
+bindsym $mod+Mod2+KP_3 workspace 3
+bindsym $mod+Mod2+KP_4 workspace 4
+bindsym $mod+Mod2+KP_5 workspace 5
+bindsym $mod+Mod2+KP_6 workspace 6
+bindsym $mod+Mod2+KP_7 workspace 7
+bindsym $mod+Mod2+KP_8 workspace 8
# switch to next or previous workspace
bindsym $mod+Mod1+Left workspace prev
bindsym $mod+Mod1+Right workspace next
# move focused container to workspace
-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+1 move container to workspace 1; workspace 1
+bindsym $Mod+Shift+2 move container to workspace 2; workspace 2
+bindsym $Mod+Shift+3 move container to workspace 3; workspace 3
+bindsym $Mod+Shift+4 move container to workspace 4; workspace 4
+bindsym $Mod+Shift+5 move container to workspace 5; workspace 5
+bindsym $Mod+Shift+6 move container to workspace 6; workspace 6
+bindsym $Mod+Shift+7 move container to workspace 7; workspace 7
+bindsym $Mod+Shift+8 move container to workspace 8; workspace 8
# move focused container to workspace - numpad alternatives
-bindsym $Mod+Shift+Mod2+KP_End move container to workspace $WS1; workspace $WS1
-bindsym $Mod+Shift+Mod2+KP_Down move container to workspace $WS2; workspace $WS2
-bindsym $Mod+Shift+Mod2+KP_Next move container to workspace $WS3; workspace $WS3
-bindsym $Mod+Shift+Mod2+KP_Left move container to workspace $WS4; workspace $WS4
-bindsym $Mod+Shift+Mod2+KP_Begin move container to workspace $WS5; workspace $WS5
-bindsym $Mod+Shift+Mod2+KP_Right move container to workspace $WS6; workspace $WS7
-bindsym $Mod+Shift+Mod2+KP_Home move container to workspace $WS7; workspace $WS7
-bindsym $Mod+Shift+Mod2+KP_Up move container to workspace $WS8; workspace $WS8
+bindsym $Mod+Shift+Mod2+KP_End move container to workspace 1; workspace 1
+bindsym $Mod+Shift+Mod2+KP_Down move container to workspace 2; workspace 2
+bindsym $Mod+Shift+Mod2+KP_Next move container to workspace 3; workspace 3
+bindsym $Mod+Shift+Mod2+KP_Left move container to workspace 4; workspace 4
+bindsym $Mod+Shift+Mod2+KP_Begin move container to workspace 5; workspace 5
+bindsym $Mod+Shift+Mod2+KP_Right move container to workspace 6; workspace 7
+bindsym $Mod+Shift+Mod2+KP_Home move container to workspace 7; workspace 7
+bindsym $Mod+Shift+Mod2+KP_Up move container to workspace 8; workspace 8
-############################################################
############## Reload configs ################
-############################################################
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
bindsym $Mod+Shift+r restart
@@ -172,9 +128,7 @@ bindsym $Mod+Shift+r restart
# reload the configuration file
bindsym $Mod+Shift+c reload
-########################################################
############ Container/Window control ############
-########################################################
# Scratchpad, Floating
bindsym $Mod+space floating toggle
@@ -233,9 +187,7 @@ bindsym $Mod+Shift+h layout toggle split
default_orientation horizontal
-######################################################
############### Border & Gaps ###############
-######################################################
new_window normal
new_float normal
@@ -259,24 +211,17 @@ bindsym $Mod+Control+minus gaps inner all minus 5
bindsym $Mod+Control+Shift+plus gaps outer all plus 5
bindsym $Mod+Control+Shift+minus gaps outer all minus 5
-###################################################
############ application settings ############
-###################################################
-for_window [class="(?i)(?:qt5ct|pinentry)"] floating enable, focus
-for_window [class="(?i)(?:termite|thunar)"] focus
-for_window [class="(?i)(?:geany|firefox)"] focus
-
-# Assign Applications to specific workspace
-# get class with xprop
-assign [class="(?i)(?:firefox)"] → $WS1
-assign [class="(?i)(?:geany)"] → $WS2
-assign [class="(?i)(?:thunar)"] → $WS3
+# assign applications to specific workspace
+assign [class="(?i)(?:firefox)"] → 1
+assign [class="(?i)(?:geany)"] → 2
+assign [class="(?i)(?:thunar)"] → 3
# focus, floating, & sticky
+for_window [class="(?i)(?:qt5ct|pinentry)"] floating enable, focus
for_window [title="(?i)(?:copying|deleting|moving)"] floating enable
for_window [window_role="(?i)(?:pop-up|setup)"] floating enable
popup_during_fullscreen smart
-exec --no-startup-id i3-msg workspace $WS1