diff --git a/.config/autostart/emacs.desktop b/.config/autostart/emacs.desktop
new file mode 100644
index 0000000..5bd1eb1
--- /dev/null
+++ b/.config/autostart/emacs.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Categories=Development;TextEditor;
+Comment=Edit text
+Exec=emacs %F
+GenericName=Text Editor
+Icon=emacs
+Keywords=Text;Editor;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Name=Emacs
+StartupWMClass=Emacs
+Terminal=false
+Type=Application
diff --git a/.config/autostart/signal-tray.desktop b/.config/autostart/signal-tray.desktop
new file mode 100644
index 0000000..cde768c
--- /dev/null
+++ b/.config/autostart/signal-tray.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Categories=Network;InstantMessaging;
+Comment[en_IE]=Signal Private Messenger for Linux
+Comment=Signal Private Messenger for Linux
+Exec=signal-desktop --use-tray-icon --start-in-tray
+GenericName[en_IE]=
+GenericName=
+Icon=signal-desktop
+MimeType=
+Name[en_IE]=Signal-Tray
+Name=Signal-Tray
+Path=
+StartupNotify=true
+StartupWMClass=Signal
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/.config/autostart/st.desktop##hostname.elephant-arch b/.config/autostart/st.desktop##hostname.elephant-arch
new file mode 100644
index 0000000..97a6e43
--- /dev/null
+++ b/.config/autostart/st.desktop##hostname.elephant-arch
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Exec=st
+Icon=
+Name=st
+Path=
+Terminal=False
+Type=Application
diff --git a/.config/autostart/stretchly.desktop b/.config/autostart/stretchly.desktop
new file mode 100644
index 0000000..918ee1b
--- /dev/null
+++ b/.config/autostart/stretchly.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories=Utility;
+Comment=The break time reminder app
+Exec=/opt/Stretchly/stretchly %U
+Icon=stretchly
+Name=Stretchly
+StartupWMClass=Stretchly
+Terminal=false
+Type=Application
diff --git a/.config/autostart/update-keyboard-layout.desktop b/.config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch
similarity index 100%
rename from .config/autostart/update-keyboard-layout.desktop
rename to .config/autostart/update-keyboard-layout.desktop##hostname.pavilion-arch
diff --git a/.local/bin/scripts/git-p b/.local/bin/scripts/git-p
index cd25769..e69778b 100755
--- a/.local/bin/scripts/git-p
+++ b/.local/bin/scripts/git-p
@@ -1,2 +1,5 @@
 #!/bin/sh
-git rev-parse @{u} 2>/dev/null >/dev/null && git push || git push --set-upstream
+if git rev-parse @{u} 2>/dev/null >/dev/null
+  then git push
+  else git push --set-upstream
+fi
diff --git a/.local/bin/scripts/update-keyboard-layout b/.local/bin/scripts/update-keyboard-layout
index c82206f..f9c5038 100755
--- a/.local/bin/scripts/update-keyboard-layout
+++ b/.local/bin/scripts/update-keyboard-layout
@@ -1,14 +1,15 @@
 #!/bin/sh
-(
+{
 case $ACTION in
 	add) id=1;;
 	remove) id=0;;
-esac || id=$(test -c /dev/ttyACM0 && echo 1 || echo 0)
+	*) id=$(test -c /dev/ttyACM0 && echo 1 || echo 0);;
+esac
 echo "Keyboard layout update to $id($ACTION) at $(date)" >>/tmp/scripts.log
 export XAUTHORITY="/run/user/1000/Xauthority" DISPLAY=:0
 # setxkbmap "$id" #nodeadkeys
-$(dirname $(dirname $0))/xkblayout-state set $id
+test $(xkblayout-state print '%C') -gt 1 && $(dirname $(dirname $0))/xkblayout-state set $id
 # Swap semicolon and colon - https://unix.stackexchange.com/questions/615799/swap-semicolon-colon-to-p-unexpected-cause-semicolon-colon-affected-by-cpas-lock
 # test "$id" = "eu" && xmodmap -e 'keysym semicolon = colon semicolon colon semicolon'
 test "$id" = "1" && xmodmap -e 'keysym semicolon = colon semicolon colon semicolon' || setxkbmap de nodeadkeys
-) >>/tmp/scripts.log 2>&1
+} 2>&1 | tee -a /tmp/scripts.log