diff --git a/.install/keyboard.sh b/.install/keyboard.sh
index dd219a4..2c13c15 100755
--- a/.install/keyboard.sh
+++ b/.install/keyboard.sh
@@ -44,14 +44,14 @@ else
     _confirmKeyboard
     
     cp .install/templates/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
-    cp .install/templates/keyboard.py ~/dotfiles-versions/$version/qtile/conf/keyboard.py
+    cp .install/templates/autostart.sgh ~/dotfiles-versions/$version/qtile/autostart.sh
 
     SEARCH="KEYBOARD_LAYOUT"
     REPLACE="$keyboard_layout"
     sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
 
-    SEARCH="\"setxkbmap en\""
-    REPLACE="\"setxkbmap $keyboard_layout\""
+    SEARCH="\"KEYBOARD_LAYOUT\""
+    REPLACE="\"$keyboard_layout\""
     sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/autostart.sh
 
     echo ""
diff --git a/.install/templates/autostart.sh b/.install/templates/autostart.sh
new file mode 100755
index 0000000..9ef127a
--- /dev/null
+++ b/.install/templates/autostart.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#   ___ _____ ___ _     _____   ____  _             _    
+#  / _ \_   _|_ _| |   | ____| / ___|| |_ __ _ _ __| |_  
+# | | | || |  | || |   |  _|   \___ \| __/ _` | '__| __| 
+# | |_| || |  | || |___| |___   ___) | || (_| | |  | |_  
+#  \__\_\|_| |___|_____|_____| |____/ \__\__,_|_|   \__| 
+#                                                        
+#  
+# by Stephan Raabe (2023) 
+# ----------------------------------------------------- 
+
+# My screen resolution
+# xrandr --rate 120
+
+# For Virtual Machine 
+# xrandr --output Virtual-1 --mode 1920x1080
+
+# Keyboard layout
+setxkbmap KEYBOARD_LAYOUT
+
+# Load picom
+picom &
+
+# Load power manager
+xfce4-power-manager &
+
+# Load notification service
+dunst &
+
+# Launch polybar
+~/dotfiles/qtile/scripts/loadbar.sh
+
+sleep 1
+
+# Setup Wallpaper and update colors
+~/dotfiles/qtile/scripts/wallpaper.sh init
diff --git a/.install/templates/keyboard.py b/.install/templates/keyboard.py
deleted file mode 100644
index 9939dbb..0000000
--- a/.install/templates/keyboard.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Setup global keyboard layout here
-
-keyboard_layout = "KEYBOARD_LAYOUT"