diff --git a/boot.sh b/boot.sh
index 17ad668f..5ac33366 100755
--- a/boot.sh
+++ b/boot.sh
@@ -19,9 +19,10 @@ sudo pacman -Sy --noconfirm --needed git
 # Use custom repo if specified, otherwise default to basecamp/omarchy
 OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
 
-echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
+echo -e "\nCloning Omarchy from: https://git.itsscb.de/itsscb/omarchy.git"
 rm -rf ~/.local/share/omarchy/
-git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
+# git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
+git clone "https://git.itsscb.de/itsscb/omarchy.git" ~/.local/share/omarchy >/dev/null
 
 # Use custom branch if instructed, otherwise default to master
 OMARCHY_REF="${OMARCHY_REF:-master}"
diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf
index 8d708c5e..2398204f 100644
--- a/config/hypr/bindings.conf
+++ b/config/hypr/bindings.conf
@@ -1,8 +1,8 @@
 # Application bindings
-$terminal = uwsm app -- ghostty
+$terminal = ghostty
 $browser = omarchy-launch-browser
 
-bindd = SUPER, T, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)
+bindd = SUPER, T, Terminal, exec, $terminal #--working-directory $(omarchy-cmd-terminal-cwd)
 bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
 bindd = SUPER, B, Browser, exec, $browser
 bindd = SUPER, M, Music, exec, uwsm app -- spotify
diff --git a/default/hypr/bindings.conf b/default/hypr/bindings.conf
index 2927eb34..c79f9852 100644
--- a/default/hypr/bindings.conf
+++ b/default/hypr/bindings.conf
@@ -5,7 +5,7 @@ bindd = SUPER, F, File manager, exec, $fileManager
 bindd = SUPER, B, Web browser, exec, $browser
 bindd = SUPER, M, Music player, exec, $music
 bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-bindd = SUPER, T, Top, exec, $terminal -e btop
+# bindd = SUPER, T, Top, exec, $terminal -e btop
 bindd = SUPER, D, Lazy Docker, exec, $terminal -e lazydocker
 bindd = SUPER, G, Messenger, exec, $messenger
 bindd = SUPER, O, Obsidian, exec, obsidian -disable-gpu
diff --git a/default/hypr/bindings/tiling.conf b/default/hypr/bindings/tiling.conf
index caad61a9..87a2e39f 100644
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@@ -10,9 +10,13 @@ bindd = SHIFT, F11, Force full screen, fullscreen, 0
 
 # Move focus with SUPER + arrow keys
 bindd = SUPER, left, Move focus left, movefocus, l
+bindd = SUPER, h, Move focus left, movefocus, l
 bindd = SUPER, right, Move focus right, movefocus, r
+bindd = SUPER, l, Move focus right, movefocus, r
 bindd = SUPER, up, Move focus up, movefocus, u
+bindd = SUPER, k, Move focus up, movefocus, u
 bindd = SUPER, down, Move focus down, movefocus, d
+bindd = SUPER, j, Move focus down, movefocus, d
 
 # Switch workspaces with SUPER + [0-9]
 bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf
index 65ccd0d4..a4bef9f3 100644
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@@ -1,5 +1,5 @@
 # Menus
-bindd = SUPER, SPACE, Launch apps, exec, walker -p "Start…"
+bindd = SUPER, R, Launch apps, exec, walker -p "Start…"
 bindd = SUPER CTRL, E, Show clipboard, exec, walker -m Emojis
 bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
 bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system