diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch b/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switcher
similarity index 76%
rename from tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch
rename to tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switcher
index 07579471..57fb55da 100755
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switch
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/layout-switcher
@@ -16,49 +16,49 @@ disable-global-menus() {
 	killall appmenu-registrar &
 }
 choice=$(
-yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title 'Layout Switch' --text-align=center --text 'Changing to or from any layout that has global menus, will require your admin password' --form --columns 3 \
+yad --no-buttons --center --keep-icon-size --separator='' --use-interp --title 'Layout Switcher' --text-align=center --text 'Changing to or from any layout that has global menus, will require your admin password' --form --columns 3 \
 --field=!"$icons/windows.png"!'Windows-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'Windows-Like'" \
 --field=!"$icons/macos.png"!'MacOS-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'MacOS-Like'" \
 --field=!"$icons/mx.png"!'MX-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'MX-Like'" \
 --field=!"$icons/gnome.png"!'Gnome-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'Gnome-Like'" \
---field=!"$icons/unity.png"!'Unity-Like /default/':BTN "kill -USR1 \$YAD_PID; echo -n 'Unity-Like /default/'" \
+--field=!"$icons/unity.png"!'Unity-Like (default)':BTN "kill -USR1 \$YAD_PID; echo -n 'Unity-Like (default)'" \
 --field=!"$icons/topx.png"!'TopX-Like':BTN "kill -USR1 \$YAD_PID; echo -n 'TopX-Like'"
 )
 case "$choice" in
 	'Windows-Like')
 		disable-global-menus
 		xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
-                xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
+		xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
 		xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" &
 		xfce4-panel-profiles load "$profiles"/Windows-Like.tar.bz2 & ;;
-	'Unity-Like /default/')
+	'Unity-Like (default)')
 		enable-global-menus
 		xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
-                xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true &
+		xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true &
 		xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "CMH|" &
 		xfce4-panel-profiles load "$profiles"/Unity-Like.tar.bz2 & ;;
-'MX-Like')
+	'MX-Like')
 		disable-global-menus
 		xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
-                xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
+		xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
 		xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" &
 		xfce4-panel-profiles load "$profiles"/MX-Like.tar.bz2 & ;;
-'MacOS-Like')
+	'MacOS-Like')
 		enable-global-menus
 		xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
-                xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true &
+		xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s true &
 		xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "CMH|" &
 		xfce4-panel-profiles load "$profiles"/MacOS-Like.tar.bz2 & ;;
-'Gnome-Like')
+	'Gnome-Like')
 		disable-global-menus
 		xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
-                xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
+		xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
 		xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" &
 		xfce4-panel-profiles load "$profiles"/Gnome-Like.tar.bz2 & ;;
-'TopX-Like')
+	'TopX-Like')
 		disable-global-menus
 		xfconf-query -c xfwm4 -p /general/borderless_maximize -n -t bool -s true &
-                xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
+		xfconf-query -c xfwm4 -p /general/titleless_maximize -n -t bool -s false &
 		xfconf-query -c xfwm4 -p /general/button_layout -n -t string -s "|HMC" &
 		xfce4-panel-profiles load "$profiles"/TopX-Like.tar.bz2 & ;;
 	*) exit ;;
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switcher.desktop
similarity index 80%
rename from tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop
rename to tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switcher.desktop
index 409e17d3..dbeaeed4 100644
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switch.desktop
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/layout-switcher.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.1
 Type=Application
-Name=Layout Switch
-GenericName=Layout Switch
+Name=Layout Switcher
+GenericName=Layout Switcher
 Comment=Change how TROMjaro looks like. Make it look like Unity, Windows, Gnome, and so forth.
 Icon=layout-switch
-Exec=layout-switch
+Exec=layout-switcher
 Categories=DesktopSettings;GTK;Settings;X-XFCE-PersonalSettings;X-XFCE-SettingsDialog;XFCE;
 Keywords=settings;layout;toggle;switch;