Navy theme.

9 files changed, 178 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 645cc65fceb7..4f7d5bd3242f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xdm-xfreq
 	pkgdesc = A customized XDM for XFreq
-	pkgver = 0.12
-	pkgrel = 3
+	pkgver = 0.13
+	pkgrel = 1
 	url = http://github.com/cyring/xdm-xfreq
 	install = xdm-xfreq.install
 	arch = any
@@ -20,6 +20,7 @@ pkgbase = xdm-xfreq
 	depends = gawk
 	optdepends = imagemagick
 	optdepends = numlockx
+	backup = etc/xdm-xfreq/xdm-xfreq.rc
 	backup = etc/xdm-xfreq/twm-xfreq.rc
 	backup = etc/xdm-xfreq/twm-xfreq.Xresources
 	source = xdm-config
@@ -34,6 +35,8 @@ pkgbase = xdm-xfreq
 	source = twm-xfreq.Xresources
 	source = start-twm-xfreq
 	source = chocolate.rc
+	source = navy.rc
+	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 889ddf9f39ab..933e7cddcbf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: CyrIng <xfreq[at]cyring[dot]fr>
 # Contributor: CyrIng <xfreq[at]cyring[dot]fr>
 pkgname=xdm-xfreq
-pkgver=0.12
-pkgrel=3
+pkgver=0.13
+pkgrel=1
 pkgdesc="A customized XDM for XFreq"
 arch=(any)
 license=('GPL')
 url="http://github.com/cyring/xdm-xfreq"
 depends=('xfreq-git' 'xorg-xdm' 'xorg-xclock' 'xorg-xmessage' 'xorg-xsetroot' 'xorg-xdpyinfo' 'xorg-twm' 'xdg-utils' 'xterm' 'scrot' 'dmenu' 'gawk')
 optdepends=('imagemagick' 'numlockx')
-backup=(etc/xdm-xfreq/twm-xfreq.rc
+backup=(etc/xdm-xfreq/xdm-xfreq.rc
+	etc/xdm-xfreq/twm-xfreq.rc
 	etc/xdm-xfreq/twm-xfreq.Xresources)
 install=xdm-xfreq.install
 source=(xdm-config
@@ -23,7 +24,8 @@ source=(xdm-config
 	twm-xfreq.rc
 	twm-xfreq.Xresources
 	start-twm-xfreq
-	chocolate.rc)
+	chocolate.rc
+	navy.rc)
 md5sums=('SKIP'
 	 'SKIP'
 	 'SKIP'
@@ -35,16 +37,17 @@ md5sums=('SKIP'
 	 'SKIP'
 	 'SKIP'
 	 'SKIP'
+	 'SKIP'
 	 'SKIP')
 
 package() {
   mkdir -p ${pkgdir}/etc/xdm-xfreq/theme
-  cp chocolate.rc ${pkgdir}/etc/xdm-xfreq/theme
-  cp xdm-xfreq.rc xdm-config twm-xfreq.rc twm-xfreq.Xresources ${pkgdir}/etc/xdm-xfreq
+  cp chocolate.rc navy.rc ${pkgdir}/etc/xdm-xfreq/theme
+  cp xdm-xfreq.rc twm-xfreq.rc twm-xfreq.Xresources ${pkgdir}/etc/xdm-xfreq
   chmod 0755 ${pkgdir}/etc/xdm-xfreq/xdm-xfreq.rc
   ln -s /etc/xdm-xfreq/theme/chocolate.rc ${pkgdir}/etc/xdm-xfreq/xdm-theme.rc
   mkdir -p ${pkgdir}/etc/X11/xdm/xdm-xfreq
-  cp Xsession Xsetup Xstartup ${pkgdir}/etc/X11/xdm/xdm-xfreq
+  cp Xsession Xsetup Xstartup xdm-config ${pkgdir}/etc/X11/xdm/xdm-xfreq
   chmod 0755 ${pkgdir}/etc/X11/xdm/xdm-xfreq/{Xsession,Xsetup,Xstartup}
   install -Dm755 ${srcdir}/xdm-xfreq-xdesktops ${pkgdir}/usr/lib/systemd/scripts/xdm-xfreq-xdesktops
   install -Dm0644 ${srcdir}/xdm-xfreq.service ${pkgdir}/usr/lib/systemd/system/xdm-xfreq.service
diff --git a/chocolate.rc b/chocolate.rc
index c7c525a0d286..d4fb97a971a7 100755
--- a/chocolate.rc
+++ b/chocolate.rc
@@ -3,7 +3,7 @@
 # General
 FOREGROUND="#cc4c00"
 BACKGROUND="#2a0308"
-## WALLPAPER="/etc/wallpaper.jpg"
+WALLPAPER="/etc/xdm-xfreq/theme/wallpaper.jpg"
 
 # Greeter
 GREETFONT="-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*"
@@ -37,7 +37,7 @@ LISTFACE="DejaVuSans-9"
 CMDFACE="DejaVuSans-9"
 
 # Logo
-## LOGOFILENAME="/usr/share/xdm/pixmaps/xorg.xpm"
+LOGOFILENAME="/etc/xdm-xfreq/theme/logo.xpm"
 LOGOPADDING="0"
 
 # Menu
@@ -56,5 +56,16 @@ NOTIFYTIMEOUT="15"
 NOTIFYGEOMETRY="+24-64"
 
 # XFreq
+XFREQFONT="Fixed"
+XFREQFILLGFX="1"
+XFREQSHOWFREQ="1"
+XFREQSHOWCYCLES="0"
+XFREQSHOWIPS="0"
+XFREQSHOWIPC="0"
+XFREQSHOWCPI="0"
+XFREQSHOWRATIO="1"
+XFREQSHOWCSTATE="0"
+XFREQWALLBOARD="1"
 XFREQFOREGROUND="0x994c00"
-XFREQBACKGROUND=$BACKGROUND
+XFREQBACKGROUND="0x2a0308"
+XFREQGEOMETRY="0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
diff --git a/navy.rc b/navy.rc
new file mode 100755
index 000000000000..2175a8a285d1
--- /dev/null
+++ b/navy.rc
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# General
+FOREGROUND="#cc4c00"
+BACKGROUND="#000077"
+WALLPAPER="/etc/xdm-xfreq/theme/wallpaper.jpg"
+
+# Greeter
+GREETFONT="-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*"
+GREETFACE="DejaVuSans-8"
+
+GREETFOREGROUND="#cc4c00"
+
+
+# Login
+LOGINFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+LOGINFACE="Sans-9"
+
+PROMPTFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+PROMPTFACE="DejaVuSans-9"
+
+FAILFONT="-*-arial-*-i-*-*-*-*-*-*-*-*-*-*"
+FAILFACE="DejaVuSans-9:bold:italic"
+FAILTEXT="Access denied"
+FAILTIMEOUT="10"
+
+LOGINBACKGROUND="#0000aa"
+LOGINFOREGROUND="white"
+LOGINSHDCOLOR="#404040"
+LOGINHICOLOR="#737373"
+FAILFOREGROUND="#cccc00"
+
+# Chooser
+LABELFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+LABELFACE="DejaVuSans-9"
+LISTFACE="DejaVuSans-9"
+CMDFACE="DejaVuSans-9"
+
+# Logo
+LOGOFILENAME="/etc/xdm-xfreq/theme/logo.xpm"
+LOGOPADDING="0"
+
+# Menu
+MENUFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
+MENUFACE="DejaVuSans-9"
+MENUGEOMETRY="$(( $WIDTH - 256 ))x32+0-0"
+
+# Clock
+CLOCKFACE="DejaVuSans-10"
+CLOCKFORMAT="%a %e %b %H:%M:%S"
+CLOCKUPDATE="1"
+CLOCKGEOMETRY="256x32-0-0"
+
+# Notification
+NOTIFYTIMEOUT="15"
+NOTIFYGEOMETRY="+24-64"
+
+# XFreq
+XFREQFONT="Fixed"
+XFREQFILLGFX="1"
+XFREQSHOWFREQ="1"
+XFREQSHOWCYCLES="0"
+XFREQSHOWIPS="0"
+XFREQSHOWIPC="0"
+XFREQSHOWCPI="0"
+XFREQSHOWRATIO="1"
+XFREQSHOWCSTATE="0"
+XFREQWALLBOARD="1"
+XFREQFOREGROUND="0xcccc00"
+XFREQBACKGROUND="0x000077"
+XFREQGEOMETRY="0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
diff --git a/twm-xfreq.rc b/twm-xfreq.rc
index 05079bedfad5..465d445756ed 100644
--- a/twm-xfreq.rc
+++ b/twm-xfreq.rc
@@ -1,5 +1,5 @@
 #
-AutoRaise               { "TWM Icon Manager" "Clock" "PopUp" "Terminal" "XFreq-Gui" }
+AutoRaise               { "TWM Icon Manager" "Clock" "PopUp" "XFreq-Gui" }
 BorderWidth		4
 ButtonIndent		2
 # ClientBorderWidth
diff --git a/xdm-config b/xdm-config
index 24bf9dedf875..990d2b725e9f 100644
--- a/xdm-config
+++ b/xdm-config
@@ -2,9 +2,9 @@ DisplayManager.authDir:		/var/lib/xdm
 DisplayManager.errorLogFile:	/var/log/xdm.log
 DisplayManager.pidFile:		/var/run/xdm.pid
 DisplayManager.keyFile:		/etc/X11/xdm/xdm-keys
-DisplayManager.servers:		:0 local /usr/bin/X :0 vt11
+DisplayManager.servers:		/etc/X11/xdm/Xservers
 DisplayManager.accessFile:	/etc/X11/xdm/Xaccess
-DisplayManager*resources:	/var/run/xdm-xfreq-xdesktops
+DisplayManager*resources:	/var/run/xdm-xfreq.Xresources
 DisplayManager.willing:		su nobody -s /bin/sh -c /etc/X11/xdm/Xwilling
 DisplayManager*authorize:	true
 
diff --git a/xdm-xfreq-xdesktops b/xdm-xfreq-xdesktops
index c7a1dc374d0e..e428b472aa80 100755
--- a/xdm-xfreq-xdesktops
+++ b/xdm-xfreq-xdesktops
@@ -16,6 +16,11 @@ case $# in
 		echo "Usage: $(basename $0) XSessionDir [DesktopNum] [AbortKey]"
 		exit 0
 	elif [ -d $P ]; then
+
+		if [[ -v XSESSION_LAST_NUM ]]; then
+			X=$XSESSION_LAST_NUM
+		fi
+
 		declare G
 		declare -i I=1
 		if (( $X == $I )); then
@@ -23,8 +28,8 @@ case $# in
 		else
 			G="xlogin*greeting: [F1] XSession\\040\\040\\040"
 		fi
-		echo "xlogin*login.translations: #override \\" > /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>F1: set-session-argument() finish-field()\n\\" >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*login.translations: #override \\" > /var/run/xdm-xfreq.Xresources
+		echo "    <Key>F1: set-session-argument() finish-field()\n\\" >> /var/run/xdm-xfreq.Xresources
 
 		declare D A
 		for D in $P/*.desktop
@@ -38,82 +43,82 @@ case $# in
 			else
 				G=$G"[F$I] ${N}\\040\\040\\040"
 			fi
-			echo "    <Key>F${I}: set-session-argument(${R}) finish-field()\n\\" >> /var/run/xdm-xfreq-xdesktops
+			echo "    <Key>F${I}: set-session-argument(${R}) finish-field()\n\\" >> /var/run/xdm-xfreq.Xresources
 		done
 		if [[ -v K && $K == "AbortKey" ]]; then
-			echo "    Ctrl<Key>R: abort-display()\n\\" >> /var/run/xdm-xfreq-xdesktops
-			echo "    Ctrl<Key>S: abort-session()\n\\" >> /var/run/xdm-xfreq-xdesktops
-			echo "    Ctrl<Key>C: restart-session()\n\\" >> /var/run/xdm-xfreq-xdesktops
+			echo "    Ctrl<Key>R: abort-display()\n\\" >> /var/run/xdm-xfreq.Xresources
+			echo "    Ctrl<Key>S: abort-session()\n\\" >> /var/run/xdm-xfreq.Xresources
+			echo "    Ctrl<Key>C: restart-session()\n\\" >> /var/run/xdm-xfreq.Xresources
 		fi
-		echo "    <Key>Delete: delete-character()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>Left: move-backward-character()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>Right: move-forward-character()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>Home: move-to-begining()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>End: move-to-end()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>KP_Enter: set-session-argument($A) finish-field()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    Ctrl<Key>Return: set-session-argument(failsafe) finish-field()\n\\" >> /var/run/xdm-xfreq-xdesktops
-		echo "    <Key>Return: set-session-argument($A) finish-field()" >> /var/run/xdm-xfreq-xdesktops
-		echo "" >> /var/run/xdm-xfreq-xdesktops
-		echo $G >> /var/run/xdm-xfreq-xdesktops
+		echo "    <Key>Delete: delete-character()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    <Key>Left: move-backward-character()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    <Key>Right: move-forward-character()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    <Key>Home: move-to-begining()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    <Key>End: move-to-end()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    <Key>KP_Enter: set-session-argument($A) finish-field()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    Ctrl<Key>Return: set-session-argument(failsafe) finish-field()\n\\" >> /var/run/xdm-xfreq.Xresources
+		echo "    <Key>Return: set-session-argument($A) finish-field()" >> /var/run/xdm-xfreq.Xresources
+		echo "" >> /var/run/xdm-xfreq.Xresources
+		echo $G >> /var/run/xdm-xfreq.Xresources
 
-		echo "*Foreground:"$FOREGROUND >> /var/run/xdm-xfreq-xdesktops
-		echo "*Background:"$BACKGROUND >> /var/run/xdm-xfreq-xdesktops
+		echo "*Foreground:"$FOREGROUND >> /var/run/xdm-xfreq.Xresources
+		echo "*Background:"$BACKGROUND >> /var/run/xdm-xfreq.Xresources
 
-		echo "xlogin*greetFont:"$GREETFONT >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*greetFace:"$GREETFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*greetFont:"$GREETFONT >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*greetFace:"$GREETFACE >> /var/run/xdm-xfreq.Xresources
 
-		echo "xlogin*font:"$LOGINFONT >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*face:"$LOGINFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*promptFont:"$PROMPTFONT >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin.Login.promptFace:"$PROMPTFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*failFont:"$FAILFONT >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin.Login.failFace:"$FAILFACE >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*font:"$LOGINFONT >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*face:"$LOGINFACE >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*promptFont:"$PROMPTFONT >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin.Login.promptFace:"$PROMPTFACE >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*failFont:"$FAILFONT >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin.Login.failFace:"$FAILFACE >> /var/run/xdm-xfreq.Xresources
 
-		echo "xlogin*greetColor:"$GREETFOREGROUND >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*background:"$LOGINBACKGROUND >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*foreground:"$LOGINFOREGROUND >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*shdColor:"$LOGINSHDCOLOR >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*hiColor:"$LOGINHICOLOR >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*failColor:"$FAILFOREGROUND >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*greetColor:"$GREETFOREGROUND >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*background:"$LOGINBACKGROUND >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*foreground:"$LOGINFOREGROUND >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*shdColor:"$LOGINSHDCOLOR >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*hiColor:"$LOGINHICOLOR >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*failColor:"$FAILFOREGROUND >> /var/run/xdm-xfreq.Xresources
 
-		echo "xlogin*fail:"$FAILTEXT >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin.Login.failTimeout:"$FAILTIMEOUT >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*sepWidth:0" >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*borderWidth:1" >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*frameWidth:1" >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*innerFramesWidth:2" >> /var/run/xdm-xfreq-xdesktops
-		echo "xlogin*useShape:true" >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*fail:"$FAILTEXT >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin.Login.failTimeout:"$FAILTIMEOUT >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*sepWidth:0" >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*borderWidth:1" >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*frameWidth:1" >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*innerFramesWidth:2" >> /var/run/xdm-xfreq.Xresources
+		echo "xlogin*useShape:true" >> /var/run/xdm-xfreq.Xresources
 
-		if [[ -v LOGOFILENAME ]]; then
-			echo "xlogin*logoFileName:"$LOGOFILENAME >> /var/run/xdm-xfreq-xdesktops
+		if [[ -v LOGOFILENAME && -e $LOGOFILENAME ]]; then
+			echo "xlogin*logoFileName:"$LOGOFILENAME >> /var/run/xdm-xfreq.Xresources
 		fi
-		echo "xlogin*logoPadding:"$LOGOPADDING >> /var/run/xdm-xfreq-xdesktops
+		echo "xlogin*logoPadding:"$LOGOPADDING >> /var/run/xdm-xfreq.Xresources
 
-		echo "Chooser*label.font:"$LABELFONT >> /var/run/xdm-xfreq-xdesktops
-		echo "Chooser*label.face:"$LABELFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "Chooser*list.face:"$LISTFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "Chooser*Command.Face:"$CMDFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "Chooser*allowShellResize:false" >> /var/run/xdm-xfreq-xdesktops
-		echo "Chooser*viewport.forceBars:false" >> /var/run/xdm-xfreq-xdesktops
-		echo "Chooser*label.label:XDMCP Host Menu from CLIENTHOST" >> /var/run/xdm-xfreq-xdesktops
+		echo "Chooser*label.font:"$LABELFONT >> /var/run/xdm-xfreq.Xresources
+		echo "Chooser*label.face:"$LABELFACE >> /var/run/xdm-xfreq.Xresources
+		echo "Chooser*list.face:"$LISTFACE >> /var/run/xdm-xfreq.Xresources
+		echo "Chooser*Command.Face:"$CMDFACE >> /var/run/xdm-xfreq.Xresources
+		echo "Chooser*allowShellResize:false" >> /var/run/xdm-xfreq.Xresources
+		echo "Chooser*viewport.forceBars:false" >> /var/run/xdm-xfreq.Xresources
+		echo "Chooser*label.label:XDMCP Host Menu from CLIENTHOST" >> /var/run/xdm-xfreq.Xresources
 
-		echo "Xmessage*font:"$MENUFONT >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*Text.face:"$MENUFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*message.scrollVertical:never" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*message.scrollHorizontal:never" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*borderWidth:0" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*Text.borderWidth:0" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*Command.highlightThickness:1" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*Command.internalWidth:12" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*Command.internalHeight:4" >> /var/run/xdm-xfreq-xdesktops
-		echo "Xmessage*Command.shapeStyle:rectangle" >> /var/run/xdm-xfreq-xdesktops
+		echo "Xmessage*font:"$MENUFONT >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*Text.face:"$MENUFACE >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*message.scrollVertical:never" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*message.scrollHorizontal:never" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*borderWidth:0" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*Text.borderWidth:0" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*Command.highlightThickness:1" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*Command.internalWidth:12" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*Command.internalHeight:4" >> /var/run/xdm-xfreq.Xresources
+		echo "Xmessage*Command.shapeStyle:rectangle" >> /var/run/xdm-xfreq.Xresources
 
-		echo "XClock*face:"$CLOCKFACE >> /var/run/xdm-xfreq-xdesktops
-		echo "XClock*strftime:"$CLOCKFORMAT >> /var/run/xdm-xfreq-xdesktops
-		echo "XClock*update:"$CLOCKUPDATE >> /var/run/xdm-xfreq-xdesktops
-		echo "XClock*analog:false" >> /var/run/xdm-xfreq-xdesktops
-		echo "XClock*borderWidth:0" >> /var/run/xdm-xfreq-xdesktops
+		echo "XClock*face:"$CLOCKFACE >> /var/run/xdm-xfreq.Xresources
+		echo "XClock*strftime:"$CLOCKFORMAT >> /var/run/xdm-xfreq.Xresources
+		echo "XClock*update:"$CLOCKUPDATE >> /var/run/xdm-xfreq.Xresources
+		echo "XClock*analog:false" >> /var/run/xdm-xfreq.Xresources
+		echo "XClock*borderWidth:0" >> /var/run/xdm-xfreq.Xresources
 
 		exit 0
 	else
diff --git a/xdm-xfreq.rc b/xdm-xfreq.rc
index 7aeca28d4c7a..a0dabb69331b 100755
--- a/xdm-xfreq.rc
+++ b/xdm-xfreq.rc
@@ -18,7 +18,7 @@ XDM_XFREQ_BG_COLOR_PATH=xsetroot
 XDM_XFREQ_BG_COLOR_ARGS="-solid $BACKGROUND"
 
 # Background picture
-if [[ -v WALLPAPER ]]; then
+if [[ -v WALLPAPER && -e $WALLPAPER ]]; then
 	XDM_XFREQ_BG_WALLPAPER_PATH=display
 	XDM_XFREQ_BG_WALLPAPER_ARGS="-backdrop -window root $WALLPAPER"
 fi
@@ -56,7 +56,7 @@ XDM_XFREQ_SCREENSAVER[5]=1500
 
 # XFreq
 XDM_XFREQ_GUI_PATH=xfreq-gui
-XDM_XFREQ_GUI_ARGS="-D 0 -f $XFREQFOREGROUND -b $XFREQBACKGROUND -l 1 -w 1 -n 1 -N 1 -I 0x1000 -U 0x21 -g 0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
+XDM_XFREQ_GUI_ARGS="-D 0 -f $XFREQFOREGROUND -b $XFREQBACKGROUND -l $XFREQFILLGFX -z $XFREQSHOWFREQ -y $XFREQSHOWCYCLES -j $XFREQSHOWIPS -J $XFREQSHOWIPC -i $XFREQSHOWCPI -r $XFREQSHOWRATIO -p $XFREQSHOWCSTATE -w $XFREQWALLBOARD -n 1 -N 1 -I 0x1000 -U 0x21 -F $XFREQFONT -g $XFREQGEOMETRY"
 XDM_XFREQ_GUI_PID=/var/run/xdm-xfreq-gui.pid
 
 # PowerOff
@@ -76,3 +76,4 @@ XDM_XFREQ_RESCUE_CMD="systemctl rescue"
 
 # Users settings
 XSESSION_ERR_PATH="$HOME/.xsession-errors"
+XSESSION_LAST_NUM=1
diff --git a/xdm-xfreq.service b/xdm-xfreq.service
index cc3f3c316d32..821c6869c1e2 100644
--- a/xdm-xfreq.service
+++ b/xdm-xfreq.service
@@ -4,8 +4,8 @@ After=systemd-user-sessions.service
 
 [Service]
 ExecStartPre=/usr/lib/systemd/scripts/xdm-xfreq-xdesktops /usr/share/xsessions 1
-ExecStart=/usr/bin/xdm -nodaemon -config /etc/xdm-xfreq/xdm-config
-ExecStopPost=/usr/bin/rm -f /var/run/xdm-xfreq-buttons.pid /var/run/xdm-xfreq-clock.pid /var/run/xdm-xfreq-gui.pid /var/run/xdm-xfreq-xdesktops
+ExecStart=/usr/bin/xdm -nodaemon -config /etc/X11/xdm/xdm-xfreq/xdm-config
+ExecStopPost=/usr/bin/rm -f /var/run/xdm-xfreq-buttons.pid /var/run/xdm-xfreq-clock.pid /var/run/xdm-xfreq-gui.pid /var/run/xdm-xfreq.Xresources
 
 [Install]
 Alias=display-manager.service