diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index e5e8910..286379d 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -32,5 +32,9 @@ y = 2
 x = 30
 y = 10
 
+[window]
+decorations = "Buttonless"
+
+
 [general]
 import = ["~/.config/alacritty/themes/kanagawa_wave.toml"]
diff --git a/.config/skhd/skhdrc b/.config/skhd/skhdrc
new file mode 100644
index 0000000..d8af4c4
--- /dev/null
+++ b/.config/skhd/skhdrc
@@ -0,0 +1,67 @@
+alt - return : alacritty msg create-window || open -n -a 'Alacritty.app'
+alt - b : /Applications/LibreWolf.app/Contents/MacOS/librewolf
+
+# Navigation
+alt - h : yabai -m window --focus west
+alt - j : yabai -m window --focus south
+alt - k : yabai -m window --focus north
+alt - l : yabai -m window --focus east
+
+#kill Yabai
+shift + alt - c : brew services stop yabai
+#start Yabai
+alt - c : brew services start yabai
+
+# Moving windows
+shift + alt - h : yabai -m window --warp west
+shift + alt - j : yabai -m window --warp south
+shift + alt - k : yabai -m window --warp north
+shift + alt - l : yabai -m window --warp east
+
+#resize windows
+alt - y : yabai -m window --resize left:-50:0; \
+                  yabai -m window --resize right:-50:0
+alt - u : yabai -m window --resize bottom:0:50; \
+                  yabai -m window --resize top:0:50
+alt - i : yabai -m window --resize top:0:-50; \
+                  yabai -m window --resize bottom:0:-50
+alt - o : yabai -m window --resize right:50:0; \
+                  yabai -m window --resize left:50:0
+
+# Make window native fullscreen
+alt - f         : yabai -m window --toggle zoom-fullscreen
+shift + alt - f : yabai -m window --toggle native-fullscreen
+
+# Float / Unfloat window
+shift + alt - space : \
+    yabai -m window --toggle float; \
+    yabai -m window --toggle border
+
+shift + alt - r : \
+    /usr/bin/env osascript <<< \
+        "display notification \"Restarting Yabai\" with title \"Yabai\""; \
+    launchctl kickstart -k "gui/${UID}/homebrew.mxcl.yabai"
+
+shift + alt - 1 : yabai -m window --space 1;
+shift + alt - 2 : yabai -m window --space 2;
+shift + alt - 3 : yabai -m window --space 3;
+shift + alt - 4 : yabai -m window --space 4;
+shift + alt - 5 : yabai -m window --space 5;
+shift + alt - 6 : yabai -m window --space 6;
+shift + alt - 7 : yabai -m window --space 7;
+
+alt - 1 : yabai -m space --focus 1;
+alt - 2 : yabai -m space --focus 2;
+alt - 3 : yabai -m space --focus 3;
+alt - 4 : yabai -m space --focus 4;
+alt - 5 : yabai -m space --focus 5;
+alt - 6 : yabai -m space --focus 6;
+alt - 7 : yabai -m space --focus 7;
+
+
+play : mpc toggle;
+rewind : mpc prev;
+fast : mpc next;
+
+alt - 0x2C : mpc volume -10;
+alt - 0x1C : mpc volume +10;
diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc
new file mode 100755
index 0000000..a1ced99
--- /dev/null
+++ b/.config/yabai/yabairc
@@ -0,0 +1,45 @@
+yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
+sudo yabai --load-sa
+
+yabai -m config layout bsp
+yabai -m config window_placement second_child
+
+yabai -m config window_topmost on
+
+yabai -m config focus_follows_mouse autoraise
+
+yabai -m config window_opacity on
+yabai -m config active_window_opacity 0.95
+yabai -m config normal_window_opacity 0.85
+
+yabai -m config window_gap 10
+yabai -m config top_padding 10
+yabai -m config right_padding 10
+yabai -m config left_padding 10
+yabai -m config bottom_padding 10
+
+yabai -m config window_border off
+yabai -m config window_opacity off
+yabai -m config window_shadow off
+
+
+yabai -m rule --add label="Finder" app="^Finder$" title="(Co(py|nnect)|Move|Info|Pref)" manage=off
+yabai -m rule --add label="macfeh" app="^macfeh$" manage=off
+yabai -m rule --add label="System Preferences" app="^System Preferences$" title=".*" manage=off
+yabai -m rule --add label="App Store" app="^App Store$" manage=off
+yabai -m rule --add label="Activity Monitor" app="^Activity Monitor$" manage=off
+yabai -m rule --add label="KeePassXC" app="^KeePassXC$" manage=off
+yabai -m rule --add label="Calculator" app="^Calculator$" manage=off
+yabai -m rule --add label="Dictionary" app="^Dictionary$" manage=off
+yabai -m rule --add label="mpv" app="^mpv$" manage=off
+yabai -m rule --add label="Software Update" title="Software Update" manage=off
+yabai -m rule --add label="About This Mac" app="System Information" title="About This Mac" manage=off
+
+yabai -m signal --add event=application_front_switched action="${ubersicht_spaces_refresh_command}"
+yabai -m signal --add event=display_changed action="${ubersicht_spaces_refresh_command}"
+yabai -m signal --add event=space_changed action="${ubersicht_spaces_refresh_command}"
+yabai -m signal --add event=window_created action="${ubersicht_spaces_refresh_command}"
+yabai -m signal --add event=window_destroyed action="${ubersicht_spaces_refresh_command}"
+yabai -m signal --add event=window_focused action="${ubersicht_spaces_refresh_command}"
+yabai -m signal --add event=window_title_changed action="${ubersicht_spaces_refresh_command}"
+