diff --git a/install b/install
index c408513..99d08f9 100755
--- a/install
+++ b/install
@@ -171,7 +171,7 @@ print_section "Create issue file"
 {
 echo '\e{red}';
 < "/etc/hostname" tr '[:lower:]' '[:upper:]' | figlet -f big | sed "s/\\\\/\\\\\\\/g";
-echo -e "\\\r";
+echo -e "\\\r (\\\l)";
 echo '\e{reset}';
 } >> "/tmp/issue"
 sudo mv "/tmp/issue" "/etc/issue"
diff --git a/system/.config/autokey/autokey.json b/system/.config/autokey/autokey.json
index 88c716f..70666eb 100644
--- a/system/.config/autokey/autokey.json
+++ b/system/.config/autokey/autokey.json
@@ -13,7 +13,7 @@
         "undoUsingBackspace": true,
         "windowDefaultSize": [
             924,
-            962
+            336
         ],
         "hPanePosition": 233,
         "columnWidths": [
diff --git a/system/.config/polybar/config b/system/.config/polybar/config
index 9d4d9e2..964f9f5 100644
--- a/system/.config/polybar/config
+++ b/system/.config/polybar/config
@@ -54,6 +54,14 @@ scroll-down = i3wm-deskprev
 inherit = bar/top
 monitor = eDP-1
 
+[bar/top-nvidia]
+inherit = bar/top
+monitor = HDMI-1-1
+
+[bar/top2-nvidia]
+inherit = bar/top
+monitor = eDP-1-1
+
 
 #######################################
 # Bottom bar
@@ -71,6 +79,14 @@ inherit = bar/bottom
 monitor = eDP-1
 tray-position = left
 
+[bar/bottom-nvidia]
+inherit = bar/bottom
+monitor = HDMI-1-1
+
+[bar/bottom2-nvidia]
+inherit = bar/bottom
+monitor = eDP-1-1
+
 
 #######################################
 # i3 workspaces
diff --git a/system/.config/polybar/launch b/system/.config/polybar/launch
index 447284d..24c0a00 100755
--- a/system/.config/polybar/launch
+++ b/system/.config/polybar/launch
@@ -18,8 +18,14 @@ killall -q polybar
 # Wait until the processes have been shut down
 while pgrep -x polybar >/dev/null; do sleep 1; done
 
+
 # Launch bar1 and bar2
 polybar top &
 polybar top2 &
 polybar bottom &
 polybar bottom2 &
+
+polybar top-nvidia &
+polybar top2-nvidia &
+polybar bottom-nvidia &
+polybar bottom2-nvidia &
\ No newline at end of file
diff --git a/system/.config/zsh/.zprofile b/system/.config/zsh/.zprofile
index c7cc221..c8e4f76 100644
--- a/system/.config/zsh/.zprofile
+++ b/system/.config/zsh/.zprofile
@@ -29,3 +29,8 @@ crontab "${XDG_CONFIG_HOME}/cron/crontab"
 if [ "$(tty)" = "/dev/tty1" ]; then
     startx "${XDG_CONFIG_HOME}/X11/xinitrc" && exit
 fi
+
+# If we are on tty2 we start the x-server using nvidia-xrun
+if [ "$(tty)" = "/dev/tty2" ]; then
+    nvidia-xrun && exit
+fi
diff --git a/system/.local/bin/games b/system/.local/bin/games
index d5bdadf..508f88f 100755
--- a/system/.local/bin/games
+++ b/system/.local/bin/games
@@ -32,9 +32,9 @@ case "${SELECTION}" in
         gw2
         ;;
     "3")
-        optirun -b primus java minecraft-launcher
+        java minecraft-launcher
         ;;
     "4")
-        optirun -b primus pegasus-fe
+        pegasus-fe
         ;;
 esac
diff --git a/system/.local/bin/gw2 b/system/.local/bin/gw2
index 249c8cc..378e04c 100755
--- a/system/.local/bin/gw2
+++ b/system/.local/bin/gw2
@@ -28,6 +28,6 @@ export LOGFILE=/dev/null
 
 # Enable esync
 export WINEESYNC=1
- 
-# Run it using optirun
-optirun -b primus wine64 "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2-64.exe" -dx9single -mapLoadInfo
+
+# Run GW2 using some settings
+wine64 "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2-64.exe" -dx9single -mapLoadInfo
diff --git a/system/.local/bin/resolution b/system/.local/bin/resolution
index 5c546b4..6793745 100755
--- a/system/.local/bin/resolution
+++ b/system/.local/bin/resolution
@@ -8,9 +8,12 @@
 #
 # DESCRIPTION:
 # This is the script that is used to setup my monitors. This script
-# is used by i3 and lightdm.
+# is used by i3.
 #
 # USAGE:
 # ./resolution
-#xrandr --setprovideroutputsource modesetting NVIDIA-0
-xrandr --output HDMI3 --off --output HDMI2 --off --output HDMI-1 --mode 1280x1024 --pos 80x56 --rotate normal --output eDP-1 --primary --mode 1920x1080 --pos 1360x0 --rotate normal --output DP3 --off --output DP2 --off --output DP1 --off
+xrandr \
+--output HDMI-1 --mode 1280x1024 --pos 80x56 --rotate normal \
+--output HDMI-1-1 --mode 1280x1024 --pos 80x56 --rotate normal \
+--output eDP-1 --primary --mode 1920x1080 --pos 1360x0 --rotate normal \
+--output eDP-1-1 --primary --mode 1920x1080 --pos 1360x0 --rotate normal