Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 slimski (1.5.0-6.0antix1) unstable; urgency=medium
 .
     * Updates from upstream
Author: anticapitalista <antix@operamail.com>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2021-08-29

--- slimski-1.5.0.orig/app.cpp
+++ slimski-1.5.0/app.cpp
@@ -759,6 +759,10 @@ void App::Login() {    //  WAS   DoLogin
             } else {
                 system(sessStart.c_str());     //  e.g.    /usr/bin/sessreg -a -l $DISPLAY %username
             }
+            bool autologin = cfg->getOption("autologin_enabled")=="true";  // howdy   miserable syntax
+            // Restart background to remove all text messages
+            string themedir =  "/usr/share/slimski/themes/" + themeName;
+            setBackground(themedir);
         } else {
             //    howdy bub      should we check blank, and fail, at an earlier codepoint?
             if (testing)
--- slimski-1.5.0.orig/cfg.cpp
+++ slimski-1.5.0/cfg.cpp
@@ -553,9 +553,25 @@ string Cfg::removeSpaces(string str) {
 }
 
 bool Cfg::isValidSesstype(string hoo) {                      //   v--- If no elements match, find() returns the last.
-    if ( std::find(sessiontypes.begin(), sessiontypes.end(), hoo) != sessiontypes.end() ) {
+    std::vector<string>::iterator it;
+    //~ std::string ssessiontype;
+
+    if (zeebug) {
+        cout << "Searching for " << hoo << " between list of sessiontypes" << endl;
+    }
+
+    it = std::find (sessiontypes.begin(), sessiontypes.end(), hoo);
+    if ( it != sessiontypes.end() ) {
+        //~ ssessiontype = sessiontypes.at(it);
+        if (zeebug) {
+            cout << "Result of search is: " << hoo << endl;
+        }
         return true;      //                                <--^   counterintuitive, eh
     } else {
+        //~ ssessiontype = "not-found";
+        if (zeebug) {
+            cout << "Result of search is: not-found" << endl;
+        }
         return false;    //   howdy bub   TEST    blank string yields false
     }
 }
--- slimski-1.5.0.orig/panel.cpp
+++ slimski-1.5.0/panel.cpp
@@ -928,8 +928,10 @@ bool Panel::IsCleanString(const string&
 ////if ( s.empty() )   return false;      //an empty string is unusable
     if ( s.empty() )   return false;    // necessary for validating string read from lastused file
 
-    for (const char c : s) {
-        if ( iscntrl(c) || isspace(c) )   return false;
+    if ( cfg->getOption("xsessionsdir") == "" ) {
+        for (const char c : s) {
+            if ( iscntrl(c) || isspace(c) )   return false;
+        }
     }
     return true;
 }
@@ -1048,7 +1050,8 @@ void Panel::showMuMsg(string& bess, int
 
 void Panel::readLastUsed(string lufile) {
     string aline;
-    bool needfallback = false;
+    bool needfallback;
+    needfallback = true;
     ifstream afile;
     afile.open(lufile);
     if (afile.is_open()) {     // howdy   if it exists...
@@ -1067,30 +1070,44 @@ void Panel::readLastUsed(string lufile)
                 //  so test for exact match against the names of currently-available sessiontype names.
                 if ( cfg->isValidSesstype(aline) ) {
                     sessiontype = aline; //   set prefilled sessiontype
+                    if (zeebug) {
+                        cout << "Session will use last used: " <<  sessiontype << endl;
+                    }
+                    needfallback = false;
                 } else {
                     if (zeebug) {
                         cout << "The lastused file declares an INVALID sessiontype." << endl;
                         cout << "Will fallback to default_sessiontype, if a valid default has been specified." << endl;
                     }
-                    needfallback = true;
                 }
-            } else
-                needfallback = true;
-        } else
-            needfallback = true;
-    } else {
-        if (zeebug)     cout << "Cannot read slimski.lastused file: " << lufile << endl;
-
-        needfallback = true;
+            } else if (zeebug)
+                cout << aline << " is not Clean" << endl;
+        } else if (zeebug)
+            cout << "Last session doesn't exist (empty)" << endl;
+    } else if (zeebug)
+        cout << "Cannot read slimski.lastused file: " << lufile << endl;
+
+    if (needfallback) {
+        if (cfg->isValidSesstype(cfg->getOption("default_sessiontype")) ) {
+            sessiontype = cfg->getOption("default_sessiontype");
+            if (zeebug) {
+                cout << "Fallback to default_sessiontype " << sessiontype << endl;
+            }
+        } else {
+            //  a further fallback, handled elsewhere, applies the first listed name specified  in "sessiontypes" line within slimski.conf
+            //   BUT whatif the default no longer has a  matching xsessiondir item ?
+            if (zeebug) {
+                cout << "Checking if xsessionsdir was set: " << cfg->getOption("xsessionsdir") << endl;
+            }
+            if ( cfg->getOption("xsessionsdir") != "" ) {
+                sessiontype = cfg->dacurrentSessiontype();
+                if (zeebug) {
+                    cout << "Fallback to first available session " << sessiontype << endl;
+                }
+            }
+        }
     }
-
-    if (needfallback  &&  cfg->isValidSesstype(cfg->getOption("default_sessiontype")) )
-    {
-        sessiontype = cfg->getOption("default_sessiontype");
-    } else {
-        //  a further fallback, handled elsewhere, applies the first listed name specified  in "sessiontypes" line within slimski.conf
-        //   BUT whatif the default no longer has a  matching xsessiondir item ?
-        if ( cfg->getOption("xsessionsdir") != "")
-            sessiontype = cfg->dacurrentSessiontype();
+    if (zeebug) {
+        cout << "Slimski has decided that the default session be: " <<  sessiontype << endl;
     }
 }
--- /dev/null
+++ slimski-1.5.0/slimski-old.conf
@@ -0,0 +1,275 @@
+:::  FOR A COMPLETE LIST OF AVAILABLE CONFIGURATION OPTIONS,
+:::  REFER TO  /usr/share/doc/slimski/OPTIONS_LIST.txt
+
+::: Path, X server, and arguments (if needed)
+:::    Note: -xauth $authfile is automatically appended
+:::
+::: must specify path values, else slimski will apply implicit defaults
+:::
+:::     v--- defined for use by atlogin_cmd, reboot_cmd, et cetera
+default_path        /usr/local/bin:/usr/bin:/usr/local/games:/usr/games
+
+default_xserver     /usr/bin/X11/X
+
+::: Full path to the xauth binary
+xauth_path     /usr/bin/xauth
+#                     ^------    executable "xauth" does exist in two places.  antiX19 "which xauth" reports "/usr/bin/xauth"
+
+::: Xauth file for server (created at runtime)
+authfile           /var/run/slimski.auth
+
+#xserver_arguments  -dpi 75
+xserver_arguments  -nolisten tcp
+#xserver_arguments -nolisten tcp  -background none
+:::                                        ^---- this caused Xserver to abort (emitting an errmsg stating "unknown option")
+:::
+::: For a list of available server_arguments, refer to
+:::       http://www.x.org/archive/X11R6.8.1/doc/Xserver.1.html
+
+
+:::      FOR ALL _cmd COMMANDSTRINGS
+:::      IT IS ADVISABLE (IS PROBABLY NECESSARY) TO SPECIFY THE
+:::      FULL PATH /to/the/executable
+
+
+
+#systemhalt_cmd           /usr/sbin/shutdown -h now
+#reboot_cmd         /usr/sbin/shutdown -r now
+:::          ^----v
+::: Custom commands for systemhalt, login, etc. on antiX
+:::
+:::  SECURITY NOTE: the antiX as-shipped sudoers policy
+:::                 adds all user account into sudoers group
+:::                 AND grants ( via /etc/sudoers.d/antixers )
+:::                    %users ALL=(root) NOPASSWD: /usr/sbin/halt
+:::                    %users ALL=(root) NOPASSWD: /usr/sbin/poweroff
+:::                    %users ALL=(root) NOPASSWD: /usr/sbin/reboot
+:::     so consider leaving blank these to-be-exposed-via-login-screen commands
+systemhalt_enabled  false
+systemhalt_cmd      /usr/local/bin/persist-config --shutdown --command halt
+
+reboot_enabled      false
+reboot_cmd          /usr/local/bin/persist-config --shutdown --command reboot
+
+
+::: if popfirst_cmd is non-blank, _AND_ slimski is started with -k commandline option
+::: (and autologin is set false)
+::: slimski will launch the specified command//program immediately after painting the
+::: login panel. If the command launches a windowed program, it window will appear
+::: in front of (aka stacked atop) the panel. "Your mileage may vary" ~~ test to
+::: determine which programs are (or are not) well-suited. The expectation is
+::: that a windowed text reader might be launched to display helptext, tips,
+::: terms-n-conditions or whatever you might care to, unmistakeably, call to
+::: the users' attention.
+:::
+::: Bear in mind that no window manager is running. A fullscreen program will not
+::: have a window "titlebar". Ensure the user is able to, and understands how to
+#popfirst_cmd   /usr/bin/bash -c '/usr/local/bin/yad --center --color'
+#popfirst_cmd   /usr/bin/bash -c 'xvbkd'
+:::           SECURITY: TEST THIS (NOT PREVIEW MODE)
+:::           TO VERIFY WHICH USER ACCOUNT "OWNS THE LAUNCHED PROCESS.
+:::           ALLOW xvbkd TO REMAIN RUNNING UNTIL ENTERING SESSION AND
+:::           USING htop OR OTHER METHOD TO CHECK OWNER OF THE RUNNING PROCESS.
+
+
+
+
+exit_enabled        true
+
+
+::: Activate numlock when slimski starts. Valid values: true|false
+numlock_enabled             false
+
+::: atlogin_cmd is the commandstring to be executed after a succesful login.
+::: You can, optionally, instruct slimski to pass
+::: the %sessiontype and %theme variable namestrings as commandline options.
+::: This enables you to accommodate conditional launch of commands in .xinitrc
+::: (conditional, based on the passed-in themename and/or sessiontype strings)
+:::
+#atlogin_cmd      exec /usr/bin/bash -login /etc/X11/Xsession %sessiontype
+:::::::::#           ^----- for Debian and derivatives (not for antiX)
+:::::::::#  v---OLD LOGIN COMMANDS (seen in prior antiX versions )::::::#
+#atlogin_cmd      exec /usr/bin/sh -login ~/.xinitrc %sessiontype
+#atlogin_cmd      exec dbus-launch /usr/bin/bash -login ~/.xinitrc %sessiontype >~/.xsession-errors 2>&1
+#atlogin_cmd      exec /usr/bin/bash -login ~/.xinitrc %sessiontype >~/.xsession-errors$DISPLAY 2>&1
+:::::::::::::::::::::::::::::::::::::::::::::::::::#
+atlogin_cmd   setsid /usr/local/bin/desktop-session %sessiontype
+
+::: Commands executed when starting and exiting a session.
+::: They can be used for registering a X11 session with sessreg
+:::        ( aka  /usr/bin/sessreg )
+::: You can, optionally, instruct slimski to the pass the %username variable
+::: (username, as typed from the login screen)
+:::
+:::      NOTE:  THESE WERE USED IN antiX 17, BUT ARE ARE UNUSED IN antiX 19
+#sessionstart_cmd    /usr/bin/sessreg -a -l $DISPLAY %username
+#sessionstop_cmd     /usr/bin/sessreg -d -l $DISPLAY %username
+##sessionstop_cmd    /usr/bin/sessreg -d -l
+
+::: Start in daemon mode
+::: note: This option, if set true here, can be temporarily overriden
+:::       at runtime by the command line options
+:::       "-d" and "-nodaemon",
+::: and
+:::       slimski is (as-shipped, packaged for debian // antiX)
+:::       already setup to launch as daemon via an initscript
+:::       installed by the slimski .deb package
+::: so
+:::       typically, you would leave it false (or altogether outcommented) here
+#daemonmode_enabled       true
+
+#   ^-------   start-stop-daemon will (does) pass -d
+#
+#   instead of editing /etc/init.d/slimski, can  specify   false   here in conf
+#    to override what is specified in init, thereby causing slimski to NOT launch in (self-restarting) daemon mode
+
+
+
+::: Available sessiontypes (first one listed shall be the default selection).
+::: The current chosen sessiontype name is replaced in the atlogin_cmd
+::: (specified above), so that your login command may handle different sessiontypes.
+::: see the xinitrc.sample file shipped with slimski sources
+:::
+::: THE VALUE FOR sessiontypes SHOULD BE COMMA-SEPARATED, NO SPACES
+sessiontypes rox-fluxbox,space-fluxbox,fluxbox,fluxbox-min,rox-icewm,space-icewm,icewm,icewm-min,rox-jwm,space-jwm,jwm
+#sessiontypes            xfce4,icewm-session,wmaker,fluxbox,openbox
+
+::: When slimski launches, if the "default_user" conf variable is non-blank
+::: the last-used sessiontype for that user can be prefilled. However,
+::: if a default_user has not been specified, slimski will fallback to
+::: using one of the configured sessiontypes... but which one?
+::: Via the default_sessiontype variable, you instruct which one will
+::: serve as the default.
+default_sessiontype     rox-icewm
+
+:::::: OPTIONALLY, you may specify a BLANK sessiontypes line (above),
+:::    and instead choose to have the list of available sessiontypes
+:::    auto-populated from the Exec= line gleaned from .desktop files residing
+:::    within a specified directory (/usr/share/xsessions or other directory).
+:::    If you (uncomment below, and) supply a non-blank pathstring,
+:::    xsessionsdir lookup will be performed
+:::    (and the "sessiontypes" conf option will be suppressed).
+# xsessionsdir     /usr/share/xsessions
+
+
+
+
+
+::: CUSTOM COMMAND to be executed when pressing F11
+#F11_cmd      import -window root /slimski.png
+:::                ^--- for example, if IMAGEMAGICK IS INSTALLED
+#  (requires scrot, which is preinstalled in antiX)
+#F11_cmd      scrot /root/slimski.png
+#     ^-----   YMMV, the above failed when tested
+F11_cmd      scrot    /tmp/slimski.png
+
+#
+::: Security note regarding custom commands:
+:::     When choosing a command (or none), bear in mind that this command
+:::     will be executed with elevated priviledges.
+:::     For instance, it would be unwise (insecure) to run a command which
+:::     writes an output file to /tmp/. Anyone with local access to the system
+:::     could place a symlink there (at the known destination), a symlink pointing
+:::     to a critical system file such as /usr/sbin/init
+
+:::  F5_cmd  provides ANOTHER optional customizable command,
+:::  will be executed if user presses the F5 key while viewing the slimski screen
+#F5_cmd
+#   v------- AN INNOCUOUS COMMAND, USEFUL FOR TESTING
+    F5_cmd       bash -c 'yad --color'
+
+:::  ^--- also, and INDENTED line, to test the parser (expect any indented lines will be ignored)
+
+
+:::
+:::    Keybinds can now, optionally, be assigned to each of the F2--F12 keys.
+:::    Except for F5 and F11, their as-shipped assignments are blank/undefined.
+:::
+:::    A corresponding number of  F<nn>_msg  options are also available for use.
+:::    The name of each (see: slimski_OPTIONS file, in doc directory)
+:::    is just a name ~~ each can display whatever textstring, regardless whether
+:::    any corresponding same-named Fkey command has been assigned.
+
+
+::: welcome message, displayed within the bounds of panel.
+:::       Available variables: %host, %domain
+welcome_msg         Welcome to %host
+
+::: F1 message, displayed on the root window (aka background)
+#F1_msg         (Press F1 repeatedly to toggle your choice of available xsessions)
+F1_msg         (Press F1 to change sessiontype)
+
+::: Prepended to the sessiontype name each time F1 is pressed
+:::   ala    "your sessiontype_msg text string here <min-icewm>"
+:::   note: one space char will be inserted between the msg and the sessionName
+#sessiontype_msg        Sessiontype:
+
+::: shutdown(aka systemhalt) / reboot messages
+systemhalt_msg   The system is shutting down...
+reboot_msg     The system is rebooting...
+
+::: the default  suspend_cmd  is blank.  You must investigate
+::: what commandstring is appropriate for your operating system.
+::: No enable|disable toggle provided (conf can leave blank to disable)
+#suspend_cmd     /usr/sbin/suspend
+#suspend_cmd     /usr/sbin/pm-suspend
+#suspend_cmd     /usr/sbin/pm-suspend-hybrid
+
+:::   If this 'current_theme' line is blank, or the line is absent,
+:::   the implicit themename is 'default' (noquotes)
+current_theme   default
+
+::: Immediately focus the password field.
+::: This option is moot (ignored) unless a default_user has been
+::: specified  AND  singleInputMode=false  AND  autologin_enabled=false
+#passwdfocus_enabled      true
+
+
+::: Automatically login the default user (without entering the password)
+::: If enabled, but no default_user has been specified ~~ no action.
+:::        note: during "preview" mode, autologin is ignored/disabled
+#autologin_enabled        true
+
+::: default user (leave blank or remove this line to avoid pre-loading the username)
+:::     NOTE: slimski is hardcoded to disallow 'root' user account login
+::: When autologin_enabled is NOT set TRUE,
+::: The default_user option can be outcommented or left blank.
+:::     -=-
+#default_user
+default_user
+
+
+:::   LOGIN TO GRAPHICAL XSESSION USING ROOTUSER ACCOUNT IS FORBIDDEN.
+:::   Understand that this is a non-configurable stipulation.
+:::   If you outcomment or remove this messagestring, an implicit default
+:::   messagestring will (still) be displayed and the login attempt will be denied.
+forbidden_msg   ROOTUSER ACCOUNT LOGIN IS FORBIDDEN
+
+
+::: ___________________________________
+:::
+:::  WITHIN THIS CONF FILE, AND WITHIN THEME FILE,
+:::  slimski WILL NOT RAISE AN ERROR IF IT ENCOUNTERS REDUNDANT LINES.
+:::  YOU MAY REASSIGN A VALUE WHICH WAS ALREADY ASSIGNED IN AN EARLIER
+:::  CONF LINE, OR YOU MIGHT ASSIGN A VALUE VIA A LINE IN CONF
+:::  AND THEN REASSIGN (OVERRIDE) THE VALUE VIA A LINE PLACED WITHIN
+:::  THE THEME FILE. NO PROBLEM, FUNCTIONALITY-WISE ~~ THE "LAST READ"
+:::  AMONG MATCHING LINES OVERSHADOWS THE OTHERS AND TAKES PRECEDENCE.
+:::  -=-
+:::  MAINTENANCE-WISE, HOWEVER, REDUNDANT LINES CAN LEAD TO CONFUSION.
+:::  If you forget that a given line has been overriden via theme file,
+:::  and edit (or add) a matching line within the conf file... you may
+:::  be left wondering "why didn't my edit have any effect?"
+
+:::    TROUBLESHOOTING TIP:
+::: lines (within themefiles as well as in this conf) are matched from 1st char
+::: ~~ any leading char (not just #) will cause a line to be ignored
+::: ~~ the above applies to ANY leading char(s), even leading spaces (not trimmed)
+::: ~~ end-of-line  #comments      are not possible (will be treaded as part of the value string)
+
+::: TROUBLESHOOTING TIP:
+::: in the event of seemingly inexplicable problems with having your option values applied
+::: check for the presence of stray (errant) equalsign chracters
+:::      grep -inr [^ei][=] /usr/share/slimski/themes/*
+:::      grep -inr [^ei][=] /etc/slimski.local.conf
+:::      grep -inr [^ei][=] /etc/slimski.conf
--- slimski-1.5.0.orig/slimski.conf
+++ slimski-1.5.0/slimski.conf
@@ -3,100 +3,57 @@
 
 ::: Path, X server, and arguments (if needed)
 :::    Note: -xauth $authfile is automatically appended
-:::
-::: must specify path values, else slimski will apply implicit defaults
-:::
-:::     v--- defined for use by atlogin_cmd, reboot_cmd, et cetera
 default_path        /usr/local/bin:/usr/bin:/usr/local/games:/usr/games
 
 default_xserver     /usr/bin/X11/X
 
 ::: Full path to the xauth binary
 xauth_path     /usr/bin/xauth
-#                     ^------    executable "xauth" does exist in two places.  antiX19 "which xauth" reports "/usr/bin/xauth"
 
 ::: Xauth file for server (created at runtime)
 authfile           /var/run/slimski.auth
 
 #xserver_arguments  -dpi 75
 xserver_arguments  -nolisten tcp
-#xserver_arguments -nolisten tcp  -background none
-:::                                        ^---- this caused Xserver to abort (emitting an errmsg stating "unknown option")
-:::
 ::: For a list of available server_arguments, refer to
 :::       http://www.x.org/archive/X11R6.8.1/doc/Xserver.1.html
 
 
-:::      FOR ALL _cmd COMMANDSTRINGS
 :::      IT IS ADVISABLE (IS PROBABLY NECESSARY) TO SPECIFY THE
 :::      FULL PATH /to/the/executable
+#~ systemhalt_cmd      /usr/local/bin/persist-config --shutdown --command halt
+systemhalt_cmd     sudo halt
+#~ reboot_cmd          /usr/local/bin/persist-config --shutdown --command reboot
+reboot_cmd         sudo reboot
 
-
-
-#systemhalt_cmd           /usr/sbin/shutdown -h now
-#reboot_cmd         /usr/sbin/shutdown -r now
-:::          ^----v
-::: Custom commands for systemhalt, login, etc. on antiX
-:::
-:::  SECURITY NOTE: the antiX as-shipped sudoers policy
-:::                 adds all user account into sudoers group
-:::                 AND grants ( via /etc/sudoers.d/antixers )
-:::                    %users ALL=(root) NOPASSWD: /usr/sbin/halt
-:::                    %users ALL=(root) NOPASSWD: /usr/sbin/poweroff
-:::                    %users ALL=(root) NOPASSWD: /usr/sbin/reboot
-:::     so consider leaving blank these to-be-exposed-via-login-screen commands
 systemhalt_enabled  false
-systemhalt_cmd      /usr/local/bin/persist-config --shutdown --command halt
-
 reboot_enabled      false
-reboot_cmd          /usr/local/bin/persist-config --shutdown --command reboot
-
-:::  Commands for halt, login, etc. on installed antiX
-#halt_cmd            sudo halt 
-#reboot_cmd        sudo reboot 
 
 ::: if popfirst_cmd is non-blank, _AND_ slimski is started with -k commandline option
 ::: (and autologin is set false)
 ::: slimski will launch the specified command//program immediately after painting the
-::: login panel. If the command launches a windowed program, it window will appear
-::: in front of (aka stacked atop) the panel. "Your mileage may vary" ~~ test to
-::: determine which programs are (or are not) well-suited. The expectation is
-::: that a windowed text reader might be launched to display helptext, tips,
-::: terms-n-conditions or whatever you might care to, unmistakeably, call to
-::: the users' attention.
-:::
+::: login panel.
 ::: Bear in mind that no window manager is running. A fullscreen program will not
 ::: have a window "titlebar". Ensure the user is able to, and understands how to
 #popfirst_cmd   /usr/bin/bash -c '/usr/local/bin/yad --center --color'
 #popfirst_cmd   /usr/bin/bash -c 'xvbkd'
-:::           SECURITY: TEST THIS (NOT PREVIEW MODE)
-:::           TO VERIFY WHICH USER ACCOUNT "OWNS THE LAUNCHED PROCESS.
-:::           ALLOW xvbkd TO REMAIN RUNNING UNTIL ENTERING SESSION AND
-:::           USING htop OR OTHER METHOD TO CHECK OWNER OF THE RUNNING PROCESS.
-
-
-
-
 exit_enabled        true
 
-
 ::: Activate numlock when slimski starts. Valid values: true|false
 numlock_enabled             false
 
+
 ::: atlogin_cmd is the commandstring to be executed after a succesful login.
 ::: You can, optionally, instruct slimski to pass
 ::: the %sessiontype and %theme variable namestrings as commandline options.
 ::: This enables you to accommodate conditional launch of commands in .xinitrc
 ::: (conditional, based on the passed-in themename and/or sessiontype strings)
 :::
-#atlogin_cmd      exec /usr/bin/bash -login /etc/X11/Xsession %sessiontype
+atlogin_cmd      exec /usr/bin/bash -login /etc/X11/Xsession "%sessiontype"
 :::::::::#           ^----- for Debian and derivatives (not for antiX)
-:::::::::#  v---OLD LOGIN COMMANDS (seen in prior antiX versions )::::::#
-#atlogin_cmd      exec /usr/bin/sh -login ~/.xinitrc %sessiontype
-#atlogin_cmd      exec dbus-launch /usr/bin/bash -login ~/.xinitrc %sessiontype >~/.xsession-errors 2>&1
-#atlogin_cmd      exec /usr/bin/bash -login ~/.xinitrc %sessiontype >~/.xsession-errors$DISPLAY 2>&1
-:::::::::::::::::::::::::::::::::::::::::::::::::::#
-atlogin_cmd   setsid /usr/local/bin/desktop-session %sessiontype
+#~ atlogin_cmd   setsid /usr/local/bin/desktop-session %sessiontype
+:::::::::#           ^----- for antiX Linux (with desktop-session manager)
+
 
 ::: Commands executed when starting and exiting a session.
 ::: They can be used for registering a X11 session with sessreg
@@ -104,7 +61,6 @@ atlogin_cmd   setsid /usr/local/bin/desk
 ::: You can, optionally, instruct slimski to the pass the %username variable
 ::: (username, as typed from the login screen)
 :::
-:::      NOTE:  THESE WERE USED IN antiX 17, BUT ARE ARE UNUSED IN antiX 19
 #sessionstart_cmd    /usr/bin/sessreg -a -l $DISPLAY %username
 #sessionstop_cmd     /usr/bin/sessreg -d -l $DISPLAY %username
 ##sessionstop_cmd    /usr/bin/sessreg -d -l
@@ -112,21 +68,9 @@ atlogin_cmd   setsid /usr/local/bin/desk
 ::: Start in daemon mode
 ::: note: This option, if set true here, can be temporarily overriden
 :::       at runtime by the command line options
-:::       "-d" and "-nodaemon",
-::: and
-:::       slimski is (as-shipped, packaged for debian // antiX)
-:::       already setup to launch as daemon via an initscript
-:::       installed by the slimski .deb package
-::: so
-:::       typically, you would leave it false (or altogether outcommented) here
+:::       "-d" and "-nodaemon"
 #daemonmode_enabled       true
 
-#   ^-------   start-stop-daemon will (does) pass -d
-#
-#   instead of editing /etc/init.d/slimski, can  specify   false   here in conf
-#    to override what is specified in init, thereby causing slimski to NOT launch in (self-restarting) daemon mode
-
-
 
 ::: Available sessiontypes (first one listed shall be the default selection).
 ::: The current chosen sessiontype name is replaced in the atlogin_cmd
@@ -134,65 +78,39 @@ atlogin_cmd   setsid /usr/local/bin/desk
 ::: see the xinitrc.sample file shipped with slimski sources
 :::
 ::: THE VALUE FOR sessiontypes SHOULD BE COMMA-SEPARATED, NO SPACES
-#sessiontypes rox-fluxbox,space-fluxbox,fluxbox,fluxbox-min,rox-icewm,space-icewm,icewm,icewm-min,rox-jwm,space-jwm,jwm
-#sessiontypes            xfce4,icewm-session,wmaker,fluxbox,openbox
+#~ sessiontypes rox-fluxbox,space-fluxbox,fluxbox,fluxbox-min,rox-icewm,space-icewm,icewm,icewm-min,rox-jwm,space-jwm,jwm
+:::   ^------ Used in antiX when deskop-session manages the desktop
 
 ::: When slimski launches, if the "default_user" conf variable is non-blank
-::: the last-used sessiontype for that user can be prefilled. However,
-::: if a default_user has not been specified, slimski will fallback to
-::: using one of the configured sessiontypes... but which one?
-::: Via the default_sessiontype variable, you instruct which one will
-::: serve as the default.
-#default_sessiontype     rox-icewm
+::: the last-used sessiontype for that user can be prefilled.
+#~ default_sessiontype     rox-icewm
 
 :::::: OPTIONALLY, you may specify a BLANK sessiontypes line (above),
 :::    and instead choose to have the list of available sessiontypes
 :::    auto-populated from the Exec= line gleaned from .desktop files residing
 :::    within a specified directory (/usr/share/xsessions or other directory).
-:::    If you (uncomment below, and) supply a non-blank pathstring,
-:::    xsessionsdir lookup will be performed
-:::    (and the "sessiontypes" conf option will be suppressed).
-::: Default on antiX since antiX-19
 xsessionsdir     /usr/share/xsessions
-
-
-
+:::      ^----- Comment above if using desktop-session in antiX and use 
+:::             sessiontypes instead
 
 
 ::: CUSTOM COMMAND to be executed when pressing F11
 #F11_cmd      import -window root /slimski.png
 :::                ^--- for example, if IMAGEMAGICK IS INSTALLED
 #  (requires scrot, which is preinstalled in antiX)
-#F11_cmd      scrot /root/slimski.png
-#     ^-----   YMMV, the above failed when tested
 F11_cmd      scrot    /tmp/slimski.png
 
-#
 ::: Security note regarding custom commands:
-:::     When choosing a command (or none), bear in mind that this command
-:::     will be executed with elevated priviledges.
-:::     For instance, it would be unwise (insecure) to run a command which
-:::     writes an output file to /tmp/. Anyone with local access to the system
-:::     could place a symlink there (at the known destination), a symlink pointing
-:::     to a critical system file such as /usr/sbin/init
+:::     Commands will be executed with elevated priviledges. Be aware.
 
 :::  F5_cmd  provides ANOTHER optional customizable command,
 :::  will be executed if user presses the F5 key while viewing the slimski screen
-#F5_cmd
-#   v------- AN INNOCUOUS COMMAND, USEFUL FOR TESTING
-    F5_cmd       bash -c 'yad --color'
-
-:::  ^--- also, and INDENTED line, to test the parser (expect any indented lines will be ignored)
+F5_cmd       bash -c 'yad --color'
 
 
-:::
 :::    Keybinds can now, optionally, be assigned to each of the F2--F12 keys.
 :::    Except for F5 and F11, their as-shipped assignments are blank/undefined.
-:::
 :::    A corresponding number of  F<nn>_msg  options are also available for use.
-:::    The name of each (see: slimski_OPTIONS file, in doc directory)
-:::    is just a name ~~ each can display whatever textstring, regardless whether
-:::    any corresponding same-named Fkey command has been assigned.
 
 
 ::: welcome message, displayed within the bounds of panel.
@@ -224,56 +142,14 @@ reboot_msg     The system is rebooting..
 current_theme   default
 
 ::: Immediately focus the password field.
-::: This option is moot (ignored) unless a default_user has been
-::: specified  AND  singleInputMode=false  AND  autologin_enabled=false
 #passwdfocus_enabled      true
 
-
 ::: Automatically login the default user (without entering the password)
-::: If enabled, but no default_user has been specified ~~ no action.
-:::        note: during "preview" mode, autologin is ignored/disabled
 #autologin_enabled        true
 
 ::: default user (leave blank or remove this line to avoid pre-loading the username)
-:::     NOTE: slimski is hardcoded to disallow 'root' user account login
-::: When autologin_enabled is NOT set TRUE,
-::: The default_user option can be outcommented or left blank.
-:::     -=-
-#default_user
 default_user
 
-
 :::   LOGIN TO GRAPHICAL XSESSION USING ROOTUSER ACCOUNT IS FORBIDDEN.
 :::   Understand that this is a non-configurable stipulation.
-:::   If you outcomment or remove this messagestring, an implicit default
-:::   messagestring will (still) be displayed and the login attempt will be denied.
 forbidden_msg   ROOTUSER ACCOUNT LOGIN IS FORBIDDEN
-
-
-::: ___________________________________
-:::
-:::  WITHIN THIS CONF FILE, AND WITHIN THEME FILE,
-:::  slimski WILL NOT RAISE AN ERROR IF IT ENCOUNTERS REDUNDANT LINES.
-:::  YOU MAY REASSIGN A VALUE WHICH WAS ALREADY ASSIGNED IN AN EARLIER
-:::  CONF LINE, OR YOU MIGHT ASSIGN A VALUE VIA A LINE IN CONF
-:::  AND THEN REASSIGN (OVERRIDE) THE VALUE VIA A LINE PLACED WITHIN
-:::  THE THEME FILE. NO PROBLEM, FUNCTIONALITY-WISE ~~ THE "LAST READ"
-:::  AMONG MATCHING LINES OVERSHADOWS THE OTHERS AND TAKES PRECEDENCE.
-:::  -=-
-:::  MAINTENANCE-WISE, HOWEVER, REDUNDANT LINES CAN LEAD TO CONFUSION.
-:::  If you forget that a given line has been overriden via theme file,
-:::  and edit (or add) a matching line within the conf file... you may
-:::  be left wondering "why didn't my edit have any effect?"
-
-:::    TROUBLESHOOTING TIP:
-::: lines (within themefiles as well as in this conf) are matched from 1st char
-::: ~~ any leading char (not just #) will cause a line to be ignored
-::: ~~ the above applies to ANY leading char(s), even leading spaces (not trimmed)
-::: ~~ end-of-line  #comments      are not possible (will be treaded as part of the value string)
-
-::: TROUBLESHOOTING TIP:
-::: in the event of seemingly inexplicable problems with having your option values applied
-::: check for the presence of stray (errant) equalsign chracters
-:::      grep -inr [^ei][=] /usr/share/slimski/themes/*
-:::      grep -inr [^ei][=] /etc/slimski.local.conf
-:::      grep -inr [^ei][=] /etc/slimski.conf
--- slimski-1.5.0.orig/themes/default/en_AU
+++ slimski-1.5.0/themes/default/en_AU
@@ -1,10 +1 @@
-cust5_color                 #DD9CEF
-cust5_font                 Verdana:size=22
-cust5_msg                 cust5 _ msg        ☺
-cust5_x                 50
-cust5_y                 50
-
-bogus line to test whether "malformed" lines will be ignored
-
-
-roses_are_red           violets_are_tasty
+#Insert here the different wording the different messages
--- slimski-1.5.0.orig/themes/default/en_GB
+++ slimski-1.5.0/themes/default/en_GB
@@ -1,11 +1 @@
-cust1_color                 #9999EE
-cust1_font                 Verdana:size=24
-cust1_msg                 cust1 _ msg      en_GB
-cust1_x                 10%
-cust1_y                 10%
-
-cust2_color                 #8BEEFF
-cust2_font                 Verdana:size=20
-cust2_msg                 cust2 _ msg      content from  en_GB theme {-----
-cust2_x                 20%
-cust2_y                 20%
+#Insert here the different wording the different messages
--- slimski-1.5.0.orig/themes/default/en_NZ
+++ slimski-1.5.0/themes/default/en_NZ
@@ -1,10 +1 @@
-cust5_color                 #DD9CEF
-cust5_font                 Verdana:size=22
-cust5_msg                 cust5 _ msg        ☺
-cust5_x                 50
-cust5_y                 50
-
-bogus line to test whether "malformed" lines will be ignored
-
-
-roses_are_red           violets_are_tasty
+#Insert here the different wording the different messages
--- slimski-1.5.0.orig/themes/default/en_US
+++ slimski-1.5.0/themes/default/en_US
@@ -1,15 +1 @@
-cust2_color                 #99EE99
-cust2_font                 Verdana:size=20
-cust2_msg                 cust2 _ msg      content from   en_US localized theme
-cust2_x                 20%
-cust2_y                 20%
-
-cust5_color                 #DD9CEF
-cust5_font                 Verdana:size=22
-cust5_msg                 cust5 _ msg        ☺
-cust5_x                 50
-cust5_y                 50
-
-bogus line to demonstrate that  "malformed/unknown" lines will be ignored
-
- another bogus line  (lines containing any leading whitespace are also ignored)
+#Insert here the different wording the different messages
--- slimski-1.5.0.orig/themes/default/slimski.theme
+++ slimski-1.5.0/themes/default/slimski.theme
@@ -47,35 +47,37 @@ password_feedback_capslock_msg     Authe
 password_feedback_msg              Authentication failed
 
 
-cust1_color                 #9999EE
-cust1_font                 Verdana:size=24
-cust1_msg                 cust1 _ msg      ₭·₮·₯·₹
-cust1_x                 10%
-cust1_y                 10%
-
-cust2_color                 #99EE99
-cust2_font                 Verdana:size=20
-cust2_msg                 cust2 _ msg     content from default/slimski.theme (not localized variant)
-cust2_x                 20%
-cust2_y                 20%
-
-cust3_color                 #EE9999
-cust3_font                 Verdana:size=16
-cust3_msg                 cust3 _ msg      ¥·£·€·$·¢·₡·₢·₣·₤·₥·₦·₧·₨·₩·₪·₫·₭·₮·₯·₹
-cust3_x                 30%
-cust3_y                 30%
-
-cust4_color                 #8BEEFF
-cust4_font                 Verdana:size=14
-cust4_msg                 cust4 _ msg      ¥·£·€·$·¢·₡·₢·₣·₤·₥·₦·₧·₨·₩·₪·₫·₭·₮·₯·₹
-cust4_x                 40%
-cust4_y                 40%
-
-cust5_color                 #DD9CEF
-cust5_font                 Verdana:size=12
-cust5_msg                 cust5 _ msg      ¥·£·€·$·¢·₡·₢·₣·₤·₥·₦·₧·₨·₩·₪·₫·₭·₮·₯·₹
-cust5_x                 50%
-cust5_y                 50%
+# Custom messages. These below are to test different characters.
+# Preserved as example, but not used.
+#cust1_color                 #9999EE
+#cust1_font                 Verdana:size=24
+#cust1_msg                 cust1 _ msg      ₭·₮·₯·₹
+#cust1_x                 10%
+#cust1_y                 10%
+
+#cust2_color                 #99EE99
+#cust2_font                 Verdana:size=20
+#cust2_msg                 cust2 _ msg     content from default/slimski.theme (not localized variant)
+#cust2_x                 20%
+#cust2_y                 20%
+
+#cust3_color                 #EE9999
+#cust3_font                 Verdana:size=16
+#cust3_msg                 cust3 _ msg      ¥·£·€·$·¢·₡·₢·₣·₤·₥·₦·₧·₨·₩·₪·₫·₭·₮·₯·₹
+#cust3_x                 30%
+#cust3_y                 30%
+
+#cust4_color                 #8BEEFF
+#cust4_font                 Verdana:size=14
+#cust4_msg                 cust4 _ msg      ¥·£·€·$·¢·₡·₢·₣·₤·₥·₦·₧·₨·₩·₪·₫·₭·₮·₯·₹
+#cust4_x                 40%
+#cust4_y                 40%
+
+#cust5_color                 #DD9CEF
+#cust5_font                 Verdana:size=12
+#cust5_msg                 cust5 _ msg      ¥·£·€·$·¢·₡·₢·₣·₤·₥·₦·₧·₨·₩·₪·₫·₭·₮·₯·₹
+#cust5_x                 50%
+#cust5_y                 50%
 
 
 
