diff --git a/.install/cleanup.sh b/.install/cleanup.sh
index 2528658..bbd5335 100644
--- a/.install/cleanup.sh
+++ b/.install/cleanup.sh
@@ -31,6 +31,11 @@ else
     echo "bluetooth.service activated successfully."    
 fi
 
+if [ -d ~/dotfiles/hypr/settings/modules/waybar/defaults ] ;then
+    rm -rf ~/dotfiles/hypr/settings/modules/waybar/defaults
+    echo "~/dotfiles/hypr/settings/modules/waybar/defaults removed."
+fi
+
 # Create default folder structure
 xdg-user-dirs-update
 echo "Default folders created..."
diff --git a/.settings/terminal.sh b/.settings/terminal.sh
new file mode 100755
index 0000000..f681b82
--- /dev/null
+++ b/.settings/terminal.sh
@@ -0,0 +1 @@
+alacritty
\ No newline at end of file
diff --git a/hypr/conf/keybindings/default.conf b/hypr/conf/keybindings/default.conf
index da3d479..ec842ad 100644
--- a/hypr/conf/keybindings/default.conf
+++ b/hypr/conf/keybindings/default.conf
@@ -7,7 +7,7 @@
 $mainMod = SUPER
 
 # Applications
-bind = $mainMod, RETURN, exec, alacritty
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
 bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
 
 # Windows
diff --git a/hypr/settings/modules/waybar/defaults/browser/config.sh b/hypr/settings/modules/system/defaults/browser/config.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/browser/config.sh
rename to hypr/settings/modules/system/defaults/browser/config.sh
diff --git a/hypr/settings/modules/waybar/defaults/browser/module.sh b/hypr/settings/modules/system/defaults/browser/module.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/browser/module.sh
rename to hypr/settings/modules/system/defaults/browser/module.sh
diff --git a/hypr/settings/modules/waybar/defaults/config.sh b/hypr/settings/modules/system/defaults/config.sh
similarity index 56%
rename from hypr/settings/modules/waybar/defaults/config.sh
rename to hypr/settings/modules/system/defaults/config.sh
index 69b50bc..82883e9 100644
--- a/hypr/settings/modules/waybar/defaults/config.sh
+++ b/hypr/settings/modules/system/defaults/config.sh
@@ -1,3 +1,3 @@
-name="Quick Launcher"
+name="Default Applications"
 order=1
 author="Stephan Raabe ML4W"
diff --git a/hypr/settings/modules/waybar/defaults/filemanager/config.sh b/hypr/settings/modules/system/defaults/filemanager/config.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/filemanager/config.sh
rename to hypr/settings/modules/system/defaults/filemanager/config.sh
diff --git a/hypr/settings/modules/waybar/defaults/filemanager/module.sh b/hypr/settings/modules/system/defaults/filemanager/module.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/filemanager/module.sh
rename to hypr/settings/modules/system/defaults/filemanager/module.sh
diff --git a/hypr/settings/modules/waybar/defaults/module.sh b/hypr/settings/modules/system/defaults/module.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/module.sh
rename to hypr/settings/modules/system/defaults/module.sh
diff --git a/hypr/settings/modules/waybar/defaults/networkmanager/config.sh b/hypr/settings/modules/system/defaults/networkmanager/config.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/networkmanager/config.sh
rename to hypr/settings/modules/system/defaults/networkmanager/config.sh
diff --git a/hypr/settings/modules/waybar/defaults/networkmanager/module.sh b/hypr/settings/modules/system/defaults/networkmanager/module.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/networkmanager/module.sh
rename to hypr/settings/modules/system/defaults/networkmanager/module.sh
diff --git a/hypr/settings/modules/waybar/defaults/software/config.sh b/hypr/settings/modules/system/defaults/software/config.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/software/config.sh
rename to hypr/settings/modules/system/defaults/software/config.sh
diff --git a/hypr/settings/modules/waybar/defaults/software/module.sh b/hypr/settings/modules/system/defaults/software/module.sh
similarity index 100%
rename from hypr/settings/modules/waybar/defaults/software/module.sh
rename to hypr/settings/modules/system/defaults/software/module.sh
diff --git a/hypr/settings/modules/system/defaults/terminal/config.sh b/hypr/settings/modules/system/defaults/terminal/config.sh
new file mode 100644
index 0000000..04bdc6f
--- /dev/null
+++ b/hypr/settings/modules/system/defaults/terminal/config.sh
@@ -0,0 +1,2 @@
+name="Terminal"
+order=1
diff --git a/hypr/settings/modules/system/defaults/terminal/module.sh b/hypr/settings/modules/system/defaults/terminal/module.sh
new file mode 100755
index 0000000..98088e3
--- /dev/null
+++ b/hypr/settings/modules/system/defaults/terminal/module.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+_getHeader "$name" "$author"
+
+echo "Define the command to open the terminal (Default: alacritty)."
+
+# Define File
+targetFile="$HOME/dotfiles/.settings/terminal.sh"
+
+# Current Value
+echo "Current Value: $(cat $targetFile)"
+
+# Select Value
+customvalue=$(gum input --placeholder "Command to start")
+if [ ! -z $customvalue ] ;then
+    # Write into file
+    echo "$customvalue" > $targetFile
+else 
+    echo "Please define a command"
+    sleep 1
+fi
+    _goBack
+
+