diff --git a/dot_config/mako/config b/dot_config/mako/config
index 9e53de7..d75d08b 100644
--- a/dot_config/mako/config
+++ b/dot_config/mako/config
@@ -1,2 +1,90 @@
+# Enable Pango markup
+markup=1
+# Enable application to request an action associated with activating a notification
+actions=1
+
+# Gruvbox Colors
+#set $dark0_hard #1d2021
+#set $dark0_hard_t #1d2021e6
+#set $dark0 #282828
+#set $dark0_t #282828e6
+#set $dark0_soft #32302f
+#set $dark1 #3c3836
+#set $dark2 #504945
+#set $dark3 #665c54
+#set $dark4 #7c6f64
+#set $gray_245 #928374
+#set $gray_244 #928374
+#set $light0_hard #f9f5d7
+#set $light0 #fbf1c7
+#set $light0_soft #f2e5bc
+#set $light1 #ebdbb2
+#set $light2 #d5c4a1
+#set $light3 #bdae93
+#set $light4 #a89984
+#set $bright_red #fb4934
+#set $bright_green #b8bb26
+#set $bright_yellow #fabd2f
+#set $bright_blue #83a598
+#set $bright_purple #d3869b
+#set $bright_aqua #8ec07c
+#set $bright_orange #fe8019
+#set $neutral_red #cc241d
+#set $neutral_green #98971a
+#set $neutral_yellow #d79921
+#set $neutral_blue #458588
+#set $neutral_purple #b16286
+#set $neutral_aqua #689d6a
+#set $neutral_orange #d65d0e
+#set $faded_red #9d0006
+#set $faded_green #79740e
+#set $faded_yellow #b57614
+#set $faded_blue #076678
+#set $faded_purple #8f3f71
+#set $faded_aqua #427b58
+#set $faded_orange #af3a03
+#set $transparent #ffffff00
+
+# Format
+font=Hasklug Nerd Font 8
+border-color=#83a598
+border-size=2
+background-color=#1d2021e6
+text-color=#fdf6e3
+format=%s (%a)\n%b
+
+# Icons
+icon-path=/usr/share/icons/Papirus-Adapta-Nokto-Maia:/usr/share/icons/Papirus-Maia:/usr/share/icons/Papirus
+
+# Hidden format
+[hidden]
+format=Hidden: %h [%t]
+
+[urgency=low]
+text-color=#93a1a1
+
+[urgency=low actionable]
+border-color=#93a1a1
+
+[urgency=normal actionable]
+border-color=#268bd2
+
+[urgency=high]
+border-color=#cc241d
+
+[urgency=high actionable]
+border-color=#fb4934
+
+[app-name=playerctl]
+max-icon-size=96
+
+[app-name=clementine]
+max-icon-size=96
+
+[app-name=i3-hint]
+max-icon-size=48
+format=%s\n%b
+width=150
+
[mode=do-not-disturb]
invisible=1
diff --git a/dot_config/sway/config b/dot_config/sway/config
index b7e87d7..4b04d40 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -16,34 +16,6 @@ default_border normal
# Font
font pango:Hasklig Medium 9
-# autostart background applications
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec {
-# $xdg-dirs
-# $swayidle
- $mako
- $swappy_notify
-# $autostart_dex
-# $flashfocus
-# $wlsunset
-# $autotiling
-# $foot_server
-# $help_menu
-# $cliphist_store
-# $cliphist_watch
-# $workspace_icons
-# $mounting_daemon
-}
-exec_always {
-# $kanshi
-# $auto_xdg_keyboard
-# $poweralert
-# $watch_playerctl
-# $calendar_daemon
-# $update_rofi_theme
-# $create_rofi_config
-# $swayr_daemon
-}
# https://github.com/Alexays/Waybar/issues/1093#issuecomment-841846291
exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -173,13 +145,54 @@ bar swaybar_command waybar
###################
exec --no-startup-id gammastep
# overrule mako and start mako
-exec --no-startup-id pkill dunst
-exec --no-startup-id mako
+# exec --no-startup-id pkill dunst
+# exec --no-startup-id mako
# start multi touch support
exec --no-startup-id libinput-gestures-setup start
# start greenclip, this somehow fails to start at launch (sometimes?)
exec --no-startup-id greenclip daemon>/dev/null
+# autostart background applications
+exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec {
+# $xdg-dirs
+# $swayidle
+ $mako
+ $swappy_notify
+# $autostart_dex
+# $flashfocus
+ $wlsunset
+# $autotiling
+# $foot_server
+ $help_menu
+# $cliphist_store
+# $cliphist_watch
+ $workspace_icons
+# $mounting_daemon
+}
+exec_always {
+# $kanshi
+# $auto_xdg_keyboard
+# $poweralert
+# $watch_playerctl
+# $calendar_daemon
+# $update_rofi_theme
+# $create_rofi_config
+# $swayr_daemon
+}
+
+# theme settings
+exec_always {
+ gsettings set org.gnome.desktop.interface gtk-theme "$gtk-theme"
+ gsettings set org.gnome.desktop.interface icon-theme "$icon-theme"
+ gsettings set org.gnome.desktop.interface cursor-theme "$cursor-theme"
+ gsettings set org.gnome.desktop.interface font-name "$gui-font"
+ gsettings set org.gnome.desktop.interface color-scheme "$gtk-color-scheme"
+ gsettings set org.gnome.desktop.input-sources show-all-sources true
+ gsettings set org.gnome.desktop.interface monospace-font-name "$term-font"
+ kvantummanager --set "$kvantum-theme"
+}
+
####################
# SOURCE OTHER FILES
####################
diff --git a/dot_config/sway/keybinding.conf b/dot_config/sway/keybinding.conf
index c5f381d..1cfecfb 100644
--- a/dot_config/sway/keybinding.conf
+++ b/dot_config/sway/keybinding.conf
@@ -15,7 +15,7 @@ bindsym $mod+c exec rofi -modi "clipboard:greenclip print" -show clipboard -run-
bindsym --release Print exec ~/.config/i3/screenshot.sh
# Custom 'help' screen
-bindsym $mod+F1 exec $term -e chezmoi edit ~/.dotfiles/README.md
+# bindsym $mod+F1 exec $term -e chezmoi edit ~/.dotfiles/README.md
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
@@ -60,35 +60,46 @@ bindsym $mod+Shift+bracketright move workspace to output right
#############
# WORKSPACES
#############
+# workspace names
+set $ws1 number 1
+set $ws2 number 2
+set $ws3 number 3
+set $ws4 number 4
+set $ws5 number 5
+set $ws6 number 6
+set $ws7 number 7
+set $ws8 number 8
+set $ws9 number 9
+set $ws10 number 10
# Special workspaces names
set $ws11 ""
set $ws12 ""
# Switch to workspace
-bindsym $mod+1 workspace number 1
-bindsym $mod+2 workspace number 2
-bindsym $mod+3 workspace number 3
-bindsym $mod+4 workspace number 4
-bindsym $mod+5 workspace number 5
-bindsym $mod+6 workspace number 6
-bindsym $mod+7 workspace number 7
-bindsym $mod+8 workspace number 8
-bindsym $mod+9 workspace number 9
-bindsym $mod+0 workspace number 10
+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
bindsym $mod+comma workspace $ws11
bindsym $mod+period workspace $ws12
# Move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number 1
-bindsym $mod+Shift+2 move container to workspace number 2
-bindsym $mod+Shift+3 move container to workspace number 3
-bindsym $mod+Shift+4 move container to workspace number 4
-bindsym $mod+Shift+5 move container to workspace number 5
-bindsym $mod+Shift+6 move container to workspace number 6
-bindsym $mod+Shift+7 move container to workspace number 7
-bindsym $mod+Shift+8 move container to workspace number 8
-bindsym $mod+Shift+9 move container to workspace number 9
-bindsym $mod+Shift+0 move container to workspace number 10
-bindsym $mod+Shift+comma move container to workspace $ws11
-bindsym $mod+Shift+period move container to workspace $ws12
+bindsym $mod+Shift+1 move container to workspace $ws1, exec $focus_ws $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2, exec $focus_ws $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3, exec $focus_ws $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4, exec $focus_ws $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5, exec $focus_ws $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6, exec $focus_ws $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7, exec $focus_ws $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8, exec $focus_ws $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9, exec $focus_ws $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10, exec $focus_ws $ws10
+bindsym $mod+Shift+comma move container to workspace $ws11, exec $focus_ws $ws11
+bindsym $mod+Shift+period move container to workspace $ws12, exec $focus_ws $ws12
###############
# Layout stuff
@@ -117,6 +128,7 @@ bindsym $mod+z focus child
#bindsym $mod+Ctrl+space exec dunstctl close
#bindsym $mod+Ctrl+Shift+space exec dunstctl close-all
#bindsym $mod+Ctrl+$mod1+space exec dunstctl history-pop
+bindsym $mod+Ctrl+space exec makoctl dismiss
#############
# SCRATCHPAD
@@ -130,7 +142,7 @@ bindsym $mod+Shift+BackSpace move scratchpad
bindsym $mod+BackSpace scratchpad show
## Launch // Toggle Help ##
-$bindsym $mod+question exec $help
+$bindsym $mod+F1 exec $help
# allow to kill focused floating shell windows using Esc (manjaro)
$bindsym --release Escape [app_id="floating_shell" con_id=__focused__] kill
@@ -155,3 +167,5 @@ bindsym $mod+equal exec $scale_up
## Action // Scale down ##
bindsym $mod+minus exec $scale_down
+## Launch // Toggle Help ##
+$bindsym $mod+question exec $help
diff --git a/dot_config/sway/variables.conf b/dot_config/sway/variables.conf
index c875070..8b67d72 100644
--- a/dot_config/sway/variables.conf
+++ b/dot_config/sway/variables.conf
@@ -13,6 +13,7 @@ set $swayscripts $swayconfig/scripts
# resize behaviour
set $resizestepsize 30px
+
###
### Variables
# Logo key. Use Mod1 for Alt.
@@ -60,6 +61,20 @@ set $faded_aqua #427b58
set $faded_orange #af3a03
set $transparent #ffffff00
+set $background-color $dark0_hard
+set $text-color $light0_hard_
+set $selection-color $bright_orange
+set $accent-color $bright_green
+
+# manjaro originals
+set $gtk-theme Matcha-dark-sea
+set $icon-theme Papirus-Dark-Maia
+set $cursor-theme xcursor-breeze
+set $gui-font Roboto 11
+set $term-font Hasklug Nerd Font Mono 8
+set $gtk-color-scheme prefer-dark
+set $kvantum-theme Matcha-Dark
+
# Direction keys
set $left Left
set $down Down
@@ -112,6 +127,22 @@ set $mic_mute $onscreen_bar $(pactl set-source-mute @DEFAULT_SOURCE@ toggle && p
set $scale_up $swayscripts/scale.sh up
set $scale_down $swayscripts/scale.sh down
+# autostarts
+#set $autostart_dex '[ -x "$(command -v dex)" ] && gdbus wait --session org.kde.StatusNotifierWatcher && dex --autostart'
+#set $flashfocus '[ -x "$(command -v flashfocus)" ] && flashfocus'
+set $wlsunset '[ -x "$(command -v wlsunset)" ] && $swayscripts/scripts/sunset.sh "on"'
+#set $autotiling '[ -x "$(command -v autotiling-rs)" ] && autotiling-rs'
+#set $foot_server '[ -x "$(command -v foot)" ] && /usr/share/sway/scripts/foot.sh --server'
+set $workspace_icons '[ -x "$(command -v sworkstyle)" ] && sworkstyle -d -l info &> /tmp/sworkstyle.log'
+#set $mounting_daemon '[ -x "$(command -v pcmanfm)" ] && pcmanfm -d'
+## restart kanshi https://github.com/emersion/kanshi/issues/43#issuecomment-531679213
+#set $kanshi '[ -x "$(command -v kanshi)" ] && pkill kanshi; exec kanshi'
+#set $xdg-dirs '[ -x "$(command -v xdg-user-dirs-update)" ] && exec xdg-user-dirs-update'
+## apply the keyboard layout from localectl if no keyboard layout has been set via config.d
+#set $auto_xdg_keyboard 'grep -q xkb_layout ~/.config/sway/config.d/*.conf || /usr/share/sway/scripts/keyboard.sh'
+#set $update_rofi_theme 'mkdir -p $HOME/.config/rofi/ && echo $rofi_theme > $HOME/.config/rofi/Manjaro.rasi'
+#set $create_rofi_config '[ ! -f $HOME/.config/rofi/config.rasi ] && echo '@import \\"Manjaro\\"' > $HOME/.config/rofi/config.rasi'
+
# daemons
set $mako '$HOME/.config/sway/scripts/mako.sh --font "$term-font" --text-color "$text-color" --border-color "$accent-color" --background-color "$background-color" --border-size 3 --width 400 --height 200 --padding 20 --margin 20 --default-timeout 15000'
set $swappy_notify '[ -x "$(command -v swappy)" ] && /usr/share/sway/scripts/screenshot-notify.sh'
@@ -122,3 +153,6 @@ set $swappy_notify '[ -x "$(command -v swappy)" ] && /usr/share/sway/scripts/scr
#set $calendar_daemon 'calcurse --daemon'
set $nm_applet '[ -x "$(command -v nm-applet)" ] && nm-applet'
#set $watch_playerctl '[ -x "$(command -v playerctl)" ] && pkill playerctl; playerctl -a metadata --format \'{{status}} {{title}}\' --follow | while read line; do pkill -RTMIN+5 waybar; done'
+
+# used when auto focusing moved windows, for example
+set $focus_ws [ $focus_after_move == 'true' ] && swaymsg workspace