diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index d938c35..50956d3 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -14,7 +14,7 @@ dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \
 
  Source archives must be placed in the 'src' directory or will be downloaded during the build from a geoIP located mirror site.
 
- A package build list is created and successfully built and installed packages are removed from that list as the build progresses.
+ A package build list is created, and successfully built and installed packages are removed from that list as the build progresses.
 
  US English is the default language and support for additional languages can be added.
 
@@ -197,10 +197,9 @@ EXITVAL=2
 until [[ $EXITVAL -lt 2 ]] ; do
 dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "README" --title " Select Additional Languages " --inputbox \
 "
- Additional language support
+ This is the complete list of additional languages supported by TDE.
 
- This is the complete list for tde-i18n - and will also apply for other packages.
- Other package sources may not have support for all these additional languages, but they will be included in the build for that package when the translations are included in the source.
+ Other package sources may not have support for all these additional languages, but they will be included in the build for that package when the translations are included in its source.
  If any other translation is included in the package source, it can be added here but won't be supported by TDE.
 
  Multiple selections may be made - space separated.
@@ -208,19 +207,19 @@ dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "REA
  Build language packages/support for any of:
 \Zb\Z6af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW\Zn
 " \
-26 75 \
+24 75 \
 2> $TMPVARS/I18N && break
 [[ $EXITVAL == 2 ]] && dialog --cr-wrap --defaultno --yes-label "Ascii" --no-label "Utf-8" --no-shadow --colors --no-collapse --yesno \
 "
-If you can see the two 'y' like characters, then you've probably got
-a suitable terminal font installed and can choose \Zr\Z4\ZbUtf-8\Zb\Zn,
-otherwise choose \Z1A\Zb\Z0scii\Zn.
+The source unpacked is ~950MB, so to save on build space, the SlackBuild script extracts, builds, and removes source for each language package one at a time.
+
+If you can see the two 'y' like characters, then you've probably got a suitable terminal font installed and can choose \Zr\Z4\ZbUtf-8\Zb\Zn, otherwise choose \Z1A\Zb\Z0scii\Zn.
 
                             <<\Z3\Zb ҷ ɣ \Zn>>
 
 \Zb\Z0A suitable font in a utf8 enabled terminal is needed to display all the extended characters in this list. Liberation Mono in an 'xterm' is known to work. Setting up a 'tty' is not worth the effort.\Zn
 " \
-15 75
+19 75
 EXVAL=$?
 [[ $EXVAL == 1 ]] && dialog --cr-wrap --no-shadow --colors --no-collapse --ok-label "Return" --msgbox \
 "
@@ -331,7 +330,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selectio
 "
 Required builds for a basic working TDE are marked \Zb\Zr\Z4R\Zn.
 
-The packages selected form the build list and so dependencies are listed before the packages that need them. After the \Zb\Zr\Z4R\Znequired packages, the listing is grouped Core/Libs/Apps and then alphabetically, excluding tde prefixes added to package names, and the dependencies.
+The packages selected form the build list and so dependencies are listed before the packages that need them. After the \Zb\Zr\Z4R\Znequired packages, the listing is grouped Core/Libs/Apps and then alphabetically within those groups, excluding tde prefixes added to package names, and the dependencies.
 
 Look out for messages in the bottom line of the screen, especially relating to dependencies.
 
@@ -450,7 +449,7 @@ EXITVAL=$?
 [[ $EXITVAL == 1 ]] && echo 3 > $TMPVARS/RUNLEVEL
 [[ $EXITVAL == 2 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --msgbox \
 "
-$(cat Core/tdebase/README)
+$(cat Core/tdebase/README|sed "s|/{TDE_installation_dir}|$(cat $TMPVARS/INSTALL_TDE)|;s|(|\\\Z6\\\Zb|;s|)|\\\Zn|")
 " \
 30 75
 done
@@ -482,12 +481,12 @@ There are three options that can be set up for building the imaging app in koffi
 GM_VERSION=$(grep VERSION:- $ROOT/Misc/GraphicsMagick/GraphicsMagick.SlackBuild|cut -d- -f2|cut -d} -f1)
 [[ $(cat $TMPVARS/Krita_OPTS) == *useGM* ]] && \
 [[ $(cat $TMPVARS/TDEbuilds) != *GraphicsMagick* ]] && \
-[[ ! $(ls /var/log/packages/GraphicsMagick-${GM_VERSION}*) ]] && \
+[[ ! $(ls /var/log/packages/GraphicsMagick-$GM_VERSION*) ]] && \
 sed -i 's|Apps/koffice|Misc/GraphicsMagick &|' $TMPVARS/TDEbuilds
 ## If libpng-1.4 has been selected and hasn't already been built, add it to the build list before koffice
 PNG_VERSION=$(grep VERSION:- $ROOT/Misc/libpng/libpng.SlackBuild|cut -d- -f2|cut -d} -f1)
 [[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && \
-[[ ! $(ls $LIBPNG_TMP/libpng-${PNG_VERSION}-*-1.txz) ]] && \
+[[ ! $(ls $LIBPNG_TMP/libpng-$PNG_VERSION-*-1.txz) ]] && \
 sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds
 }
 
@@ -495,14 +494,14 @@ sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds
 ## this dialog will only run if any of the selected packages has a README
 rm -f $TMPVARS/READMEs
 ## generate list of READMEs ..
-RM_LIST=$(find . -name "*README*" | grep -v tdebase | grep -o "[ACDLM][a-z]*/[-_0-z]*")
+RM_LIST=$(find . -name "README" | grep -v tdebase | grep -o "[ACDLM][a-z]*/[-_0-z]*")
 for package in $(cat $TMPVARS/TDEbuilds)
 do
 [[ $RM_LIST == *$package* ]] && {
-echo "\Zb\Z6\Zu$package\ZU\Zn" >> $TMPVARS/READMEs
-echo >> $TMPVARS/READMEs
-echo "$(cat $package/README)" >> $TMPVARS/READMEs
-echo >> $TMPVARS/READMEs
+echo "\Zb\Z6\Zu$package\ZU\Zn
+
+$(cat $package/README)
+" >> $TMPVARS/READMEs
 }
 done
 ## .. if there is a list, run dialog
@@ -511,7 +510,7 @@ dialog --cr-wrap --defaultno --no-shadow --colors --title " READMEs " --yesno \
 "
 A number of selected packages have READMEs in their SlackBuilds directories.
 
-Do you want to read the READMEs?
+Do you want to read them?
  " \
 10 75
 [[ $? == 0 ]] && dialog --no-collapse --cr-wrap --no-shadow --colors --ok-label "Close" --msgbox \
@@ -665,17 +664,17 @@ do
   cd $ROOT/$dir || ${EXIT_FAIL:-"true"}
 
   # Get the version
-  version=$(cat ${package}.SlackBuild | grep "VERSION:" | head -n1 | cut -d "-" -f2 | rev | cut -c 2- | rev)
+  version=$(cat $package.SlackBuild | grep "VERSION:" | head -n1 | cut -d "-" -f2 | rev | cut -c 2- | rev)
 
   # Get the build
-  build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev)
+  build=$(cat $package.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev)
 
   # The real build starts here
-  script -c "sh ${package}.SlackBuild" $TMP/${package}-build-log || ${EXIT_FAIL:-"true"}
+  script -c "sh $package.SlackBuild" $TMP/$package-build-log || ${EXIT_FAIL:-"true"}
 
 # remove colorizing escape sequences from build-log
 # Re: http://serverfault.com/questions/71285/in-centos-4-4-how-can-i-strip-escape-sequences-from-a-text-file
-  sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/${package}-build-log || ${EXIT_FAIL:-"true"}
+  sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$package-build-log || ${EXIT_FAIL:-"true"}
 
 checkinstall ()
 {
@@ -684,9 +683,9 @@ checkinstall ()
 ## otherwise test for the libpng package only, not installed
 {
 {
-[[ ${package} != libpng ]] && [[ $(ls /var/log/packages/${package}-*$(eval echo $version)-*-${build}*) ]]
+[[ $package != libpng ]] && [[ $(ls /var/log/packages/$package-*$(eval echo $version)-*-$build*) ]]
 } || {
-[[ ${package} == libpng ]] && [[ $(ls $LIBPNG_TMP/${package}-$(eval echo $version)-*-${build}*.txz) ]]
+[[ $package == libpng ]] && [[ $(ls $LIBPNG_TMP/$package-$(eval echo $version)-*-$build*.txz) ]]
 }
 } && \
 ## if either test is successful, the above will exit 0, then remove 'package' from the build list \
@@ -694,8 +693,8 @@ sed -i "s|$dir ||" $TMPVARS/TDEbuilds || \
 ## if unsuccessful, display error message \
 {
 echo "
-      Error:  ${package} package build failed
-      Check the build log $TMP/${package}-build-log
+      Error:  $package package build failed
+      Check the build log $TMP/$package-build-log
       "
 ## if koffice was building with libpng14, restore the libpng16 headers for any following builds
 [[ ${USE_PNG14:-} == yes ]] && source $ROOT/get-source.sh && libpng16_fn || true
@@ -705,13 +704,13 @@ ${EXIT_FAIL:-":"}
 # tde-i18n package installation is handled in tde-i18n.SlackBuild because if more than one i18n package is being built, only the last one will be installed by upgradepkg
 ## tidy-html5 is a special case because the version number is not in the archive name
 ## create libpng-1.4 package only - it will be installed by the koffice.SB because it overrides libpng headers which for Sl14.2/current point to libpng16.
-[[ ${package} == tidy-html5 ]] && version=$(unzip -c tidy-html5-master.zip | grep -A 1 version.txt | tail -n 1)
-if [[ $INST == 1 ]] && [[ ${package} != tde-i18n ]] && [[ ${package} != libpng ]]; then upgradepkg --install-new --reinstall $TMP/${package}-$(eval echo $version)-*-${build}*.txz
+[[ $package == tidy-html5 ]] && version=$(unzip -c tidy-html5-master.zip | grep -A 1 version.txt | tail -n 1)
+if [[ $INST == 1 ]] && [[ $package != tde-i18n ]] && [[ $package != libpng ]]; then upgradepkg --install-new --reinstall $TMP/$package-$(eval echo $version)-*-$build*.txz
 checkinstall
 ## test for last language in the I18N list to ensure they've all been built
-elif [[ $INST == 1 ]] && [[ ${package} == tde-i18n ]]; then package=${package}-$(cat $TMPVARS/LASTLANG)
+elif [[ $INST == 1 ]] && [[ $package == tde-i18n ]]; then package=$package-$(cat $TMPVARS/LASTLANG)
 checkinstall
-elif [[ ${package} == libpng ]]; then checkinstall
+elif [[ $package == libpng ]]; then checkinstall
 fi
 
   # back to original directory
diff --git a/Core/tde-i18n/README b/Core/tde-i18n/README
deleted file mode 100755
index 672552a..0000000
--- a/Core/tde-i18n/README
+++ /dev/null
@@ -1,9 +0,0 @@
-The source unpacked is ~950MB, so to save on build space, the
-SlackBuild script extracts, builds, and removes source for each
-language package one at a time.
-
-Any number of packages can be built - set by the I18N variable
-
-Language identification is shown in the 
-'\Zb\Z3Select Additional Languages\Zn' screen README.
- 
diff --git a/Core/tdeaddons/arkplugin-diffs-1 b/Core/tdeaddons/arkplugin-diffs-1
deleted file mode 100755
index fe6c2df..0000000
--- a/Core/tdeaddons/arkplugin-diffs-1
+++ /dev/null
@@ -1,46 +0,0 @@
---- konq-plugins/arkplugin/arkplugin.cpp-original	2015-09-23 04:07:12.000000000 +0100
-+++ konq-plugins/arkplugin/arkplugin.cpp	2016-03-09 17:43:02.427341264 +0000
-@@ -304,10 +304,7 @@
-         if ( havegz )
-             m_archiveMimeTypes << "application/x-tgz";
-         if ( havebz2 )
--        {
-             m_archiveMimeTypes << "application/x-tbz";
--            m_archiveMimeTypes << "application/x-tbz2";
--        }
-         if ( havelzop )
-             m_archiveMimeTypes << "application/x-tzo";
-         if ( havelzma )
-@@ -379,14 +376,14 @@
-     if ( !TDEStandardDirs::findExe( "lzma" ).isNull() )
-     {
-         havelzma = true;
--        m_archiveMimeTypes << "application/x-lzma";
-+        m_extractMimeTypes << "application/x-lzma";
-     }
- 
-     bool havexz = false;
-     if ( !TDEStandardDirs::findExe( "xz" ).isNull() )
-     {
-         havexz = true;
--        m_archiveMimeTypes << "application/x-xz";
-+        m_extractMimeTypes << "application/x-xz";
-     }
- 
-     if ( !TDEStandardDirs::findExe( "tar" ).isNull() )
-@@ -395,14 +392,11 @@
-         if ( havegz )
-             m_extractMimeTypes << "application/x-tgz";
-         if ( havebz2 )
--        {
-             m_extractMimeTypes << "application/x-tbz";
--            m_extractMimeTypes << "application/x-tbz2";
--        }
-         if ( havelzop )
-             m_extractMimeTypes << "application/x-tzo";
-         if ( havelzma )
--            m_extractMimeTypes << "application/x-lzma";
-+            m_extractMimeTypes << "application/x-tlz";
-         if ( havexz )
-             m_extractMimeTypes << "application/x-txz";
-     }
diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild
index cba7925..b65cf04 100755
--- a/Core/tdeaddons/tdeaddons.SlackBuild
+++ b/Core/tdeaddons/tdeaddons.SlackBuild
@@ -35,7 +35,61 @@ untar_fn
 listdocs_fn
 
 # patch for TDE bug 2043
-patch -p0 < $SRCDIR/arkplugin-diffs-1
+echo $'
+--- konq-plugins/arkplugin/arkplugin.cpp
++++ konq-plugins/arkplugin/arkplugin.cpp
+@@ -307 +306,0 @@
+-        {
+@@ -309,2 +307,0 @@
+-            m_archiveMimeTypes << "application/x-tbz2";
+-        }
+@@ -382 +379 @@
+-        m_archiveMimeTypes << "application/x-lzma";
++        m_extractMimeTypes << "application/x-lzma";
+@@ -389 +386 @@
+-        m_archiveMimeTypes << "application/x-xz";
++        m_extractMimeTypes << "application/x-xz";
+@@ -398 +394,0 @@
+-        {
+@@ -400,2 +395,0 @@
+-            m_extractMimeTypes << "application/x-tbz2";
+-        }
+@@ -405 +399 @@
+-            m_extractMimeTypes << "application/x-lzma";
++            m_extractMimeTypes << "application/x-tlz";
+' | while read line
+do
+patch -p0
+done
+
+## Set the default compression as tar.xz
+## enable jar & ar compression in Compress As menu
+## remove application/x-rar-compressed
+echo $'
+--- konq-plugins/arkplugin/arkplugin.cpp
++++ konq-plugins/arkplugin/arkplugin.cpp
+@@ -96 +96 @@
+-        m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
++        m_ext = m_conf->readEntry( "LastExtension", ".tar.xz" );
+@@ -107 +107 @@
+-                                    "LastMimeType", "application/x-tgz" ) )->comment(),
++                                    "LastMimeType", "application/x-txz" ) )->comment(),
+@@ -323 +323 @@
+-        if ( m_conf->readBoolEntry( "UseJar", false ) )
++        if ( m_conf->readBoolEntry( "UseJar", true ) )
+@@ -328 +328 @@
+-        m_archiveMimeTypes << "application/x-rar" << "application/x-rar-compressed";
++        m_archiveMimeTypes << "application/x-rar";
+@@ -346 +346 @@
+-    if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) )
++    if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", true ) )
+@@ -411 +411 @@
+-        m_extractMimeTypes << "application/x-rar" << "application/x-rar-compressed";
++        m_extractMimeTypes << "application/x-rar";
+' | while read line
+do
+patch -p0
+done
 
 chown_fn
 
@@ -50,17 +104,17 @@ chown_fn
 
 cd_builddir_fn
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_COMPILER=${COMPILER} \
-    -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \
+    -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \
+    -DCMAKE_C_COMPILER=$COMPILER \
+    -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DWITH_ALL_OPTIONS="ON" \
     -DBUILD_ALL="ON" \
     -DBUILD_ATLANTIKDESIGNER=${ATLANTIKDESIGNER:-"OFF"} \
@@ -101,19 +155,19 @@ $PRGNAM: Home: http://www.trinitydesktop.org/
 cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
+  chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
 fi
 
 # Update hicolor theme cache:
 if [ -d usr/share/icons/hicolor ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
+    chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
   fi
 fi
 
 # Update the mime database:
 if [ -x usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1
+  chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1
 fi
 
 EOINS
diff --git a/Core/tdebase/README b/Core/tdebase/README
index cec5762..0a3022a 100755
--- a/Core/tdebase/README
+++ b/Core/tdebase/README
@@ -1,12 +1,12 @@
 TDM
 
-\ZuInstalling tdebase\ZU
+(Installing tdebase)
 In line with normal practice, tdmrc will not be overwritten and tdmrc.new will be installed for admin decision on whether to use it as tdmrc. Where tdmrc doesn't exist, it will be created by doinst.sh from tdmrc.new.
 
-\Zuroot logins\ZU
+(root logins)
 AllowRootLogin is set to true in tdmrc.new, and will therefore be the default for new installations.
 
-\Zurc.4.local\ZU
+(rc.4.local)
 This has been included on the assumption that the standard entry in rc.4[.new] from the package sysvinit-scripts exists:
 
     # If you'd like to start something different or in a
@@ -22,24 +22,30 @@ To enable tdm if this isn't the case, either
 or
 [2] copy the contents of rc.4.local to rc.4 above other session manager options
 
-\ZuRunlevel\ZU
+(Runlevel)
 Set this to 4 and tdm should work out-of-the-box, especially for new installations.
 
 ------------------
 
-\ZuKonqueror file manager\ZU as-built defaults to 'Icon View' when starting.
-Setting 'Tree View' and saving that view profile should then default to 'Tree View' when starting kfm or opening it in a new tab - the former works but not the latter.
+(Konqueror file manager) as-built defaults to 'Icon View' when starting.
+Setting 'another View' and saving that view profile should, but doesn't, override this.
 
-The problem seems to be that TDE lacks the entry in konquerorrc that exists in KDE3:
-[MainView Settings]
-ToggableViewsShown=konq_sidebartng
-ViewMode=konq_treeview
+The problem seems to be that TDE lacks the [MainView Settings] entry in konquerorrc that exists in KDE3.
 
-Until this is sorted out in the source code, this hack works:
+Until this is fixed, to set 'Tree View' for example:
 
-1] Start kfm to generate the ~/.trinity/share/config/konquerorrc file.
+VIEWMODE=konq_treeview
+sed -i "s|konq_iconview|$VIEWMODE|" /{TDE_installation_dir}/share/apps/konqueror/profiles/filemanagement
+echo "[MainView Settings]
+ViewMode=$VIEWMODE" > ~/.trinity/share/config/konquerorrc
 
-2] Close kfm
+The ViewMode options are:
 
-3] echo -e "\n\n[MainView Settings]\nViewMode=konq_treeview" >> ~/.trinity/share/config/konquerorrc
+konq_iconview
+konq_multicolumnview
+konq_treeview
+konq_infolistview
+konq_detailedlistview
+konq_textview
+fsview_part [File Size]
 
diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild
index 52b3a43..3b0b5c9 100755
--- a/Core/tdebase/tdebase.SlackBuild
+++ b/Core/tdebase/tdebase.SlackBuild
@@ -99,8 +99,8 @@ chmod 755 $PKG/etc/profile.d/tde.{,c}sh
 
 # Add some configuration files / scripts needed by TDE.
 mkdir -p $PKG/etc/trinity
-mv $PKG/$INSTALL_TDE/share/config/tdm $PKG/etc/trinity/tdm
-( cd $PKG/$INSTALL_TDE/share/config ; ln -sf /etc/trinity/tdm tdm )
+mv $PKG$INSTALL_TDE/share/config/tdm $PKG/etc/trinity/tdm
+( cd $PKG$INSTALL_TDE/share/config ; ln -sf /etc/trinity/tdm tdm )
 
 # Add rc.4.local to give TDM priority over rc.4 X11 session manager options
 # Assumes that rc.4.new from sysvinit-scripts still has the rc.4.local option
@@ -109,16 +109,16 @@ sed "s|\$INSTALL_TDE|$INSTALL_TDE|" < $SRCDIR/rc.4.local > $PKG/etc/rc.d/rc.4.lo
 chmod 755 $PKG/etc/rc.d/rc.4.local
 
 # Set sane permissions for the include files.
-if [ -d $PKG/$INSTALL_TDE/include ]; then
-   find $PKG/$INSTALL_TDE/include -type f -exec chmod 0644 {} \;
+if [ -d $PKG$INSTALL_TDE/include ]; then
+   find $PKG$INSTALL_TDE/include -type f -exec chmod 0644 {} \;
 fi
 
 # Ensure correct login manager session file is available.
 mkdir -p $PKG/usr/share/apps/tdm/sessions
-cp $PKG/$INSTALL_TDE/share/apps/tdm/sessions/tde.desktop $PKG/usr/share/apps/tdm/sessions/ || true
+cp $PKG$INSTALL_TDE/share/apps/tdm/sessions/tde.desktop $PKG/usr/share/apps/tdm/sessions/ || true
 
 # Setup config files for TDM:
-$PKG/$INSTALL_TDE/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG/etc/trinity/tdm
+$PKG$INSTALL_TDE/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG/etc/trinity/tdm
 ## set correct paths for config files
 sed -i 's|/opt/trinity/share/config/tdm/|/etc/trinity/tdm/|' $PKG/etc/trinity/tdm/tdmrc
 # Allow root to login
@@ -129,8 +129,8 @@ rm $PKG/etc/trinity/tdm/tdmrc
 mv $PKG/etc/trinity/tdm/Xsession $PKG/etc/trinity/tdm/Xsession.orig
 cat $SRCDIR/config/Xsession | sed "s|\$INSTALL_TDE|$INSTALL_TDE|" > $PKG/etc/trinity/tdm/Xsession
 mv $PKG/etc/trinity/tdm/backgroundrc $PKG/etc/trinity/tdm/backgroundrc.new
-if [[ -r $PKG/$INSTALL_TDE/etc/trinity/tdm/README ]]; then
- sed -i "s|$TMP/package-tdebase/etc/trinity/tdm|/etc/trinity/tdm|" $PKG/$INSTALL_TDE/etc/trinity/tdm/README
+if [[ -r $PKG$INSTALL_TDE/etc/trinity/tdm/README ]]; then
+ sed -i "s|$TMP/package-tdebase/etc/trinity/tdm|/etc/trinity/tdm|" $PKG$INSTALL_TDE/etc/trinity/tdm/README
 fi
 
 mkdir_install_fn
diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild
index 49e4571..b94da97 100644
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@@ -33,6 +33,9 @@ getsource_fn
 
 untar_fn
 
+## remove x-rar-compressed.desktop
+sed -i '/x-rar-compressed.desktop/d' mimetypes/application/{CMakeLists.txt,Makefile.am}
+
 ## patch for building with clang
 echo $'
 --- tdeabc/tests/testaddresseelist.cpp
@@ -70,16 +73,16 @@ chown_fn
 cd_builddir_fn
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_COMPILER=${COMPILER} \
-    -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \
+    -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \
+    -DCMAKE_C_COMPILER=$COMPILER \
+    -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DCMAKE_SKIP_RPATH="OFF" \
     -DWITH_CUPS="ON" \
     -DWITH_SUDO_TDESU_BACKEND="ON" \
@@ -132,19 +135,19 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
 cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share//applications > /dev/null 2>&1
+  chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share//applications > /dev/null 2>&1
 fi
 
 # Update hicolor theme cache:
 if [ -d usr/share/icons/hicolor ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
+    chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
   fi
 fi
 
 # Update the mime database:
 if [ -x usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1
+  chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1
 fi
 EOINS
 
diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild
index 46ffdaa..eebff8e 100755
--- a/Core/tdeutils/tdeutils.SlackBuild
+++ b/Core/tdeutils/tdeutils.SlackBuild
@@ -32,6 +32,72 @@ source ../../get-source.sh
 getsource_fn
 
 untar_fn
+
+## remove redundant application/x-tbz2 references [line 55] to get rid of ark warning:
+## tdeio (KMimeType): WARNING: mimetype not valid '' (missing entry in the file ?)
+## the other removals are a general clear out of the mimetype before they cause problems
+## application/x-rar-compressed causes a double entry in the Compress As menu without adding any functionality
+echo $'
+--- ark/archiveformatinfo.cpp
++++ ark/archiveformatinfo.cpp
+@@ -55 +54,0 @@
+-  addFormatInfo( TAR_FORMAT, "application/x-tbz2", ".tar.bz2" );
+@@ -80 +78,0 @@
+-  addFormatInfo( RAR_FORMAT, "application/x-rar-compressed", ".rar" );
+--- ark/tar.cpp
++++ ark/tar.cpp
+@@ -94,7 +93,0 @@
+-    if ( m_fileMimeType == "application/x-tbz2" )
+-    {
+-        // ark treats .tar.bz2 as x-tbz, instead of duplicating the mimetype
+-        // let\'s just alias it to the one we already handle.
+-        m_fileMimeType = "application/x-tbz";
+-    }
+-
+--- superkaramba/src/sknewstuff.cpp
++++ superkaramba/src/sknewstuff.cpp
+@@ -67 +66,0 @@
+-      result->name() == "application/x-tbz2" ||
+--- ark/ark.desktop
++++ ark/ark.desktop
+@@ -2 +2 @@
+-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz
+--- ark/ark_part.desktop
++++ ark/ark_part.desktop
+@@ -2 +2 @@
+-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-tlz;application/x-txz
++MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-tlz;application/x-txz
+' | while read line
+do
+patch -p0
+done
+
+## fix bug 2794 - ark can't open rar files
+echo $'
+--- ark/rar.cpp
++++ ark/rar.cpp
+@@ -102 +102 @@
+-    TQRegExp versionRegExp (TQString::fromLatin1 ("RAR\\\\s(\\\\d+)\\\\.(\\\\d+)\\\\s(beta (\\\\d+))?\\\\s+Copyright.*"));
++    TQRegExp versionRegExp (TQString::fromLatin1 ("(UN)?RAR\\\\s(\\\\d+)\\\\.(\\\\d+)( beta (\\\\d+))?.*"));
+@@ -107,3 +107,3 @@
+-      m_version  = versionRegExp.cap(1).toShort() * VERSION_MAJOR;
+-      m_version += versionRegExp.cap(2).toShort()/10 * VERSION_MINOR;
+-      m_version += versionRegExp.cap(2).toShort()%10 * VERSION_PATCH;
++      m_version  = versionRegExp.cap(2).toShort() * VERSION_MAJOR;
++      m_version += versionRegExp.cap(3).toShort()/10 * VERSION_MINOR;
++      m_version += versionRegExp.cap(3).toShort()%10 * VERSION_PATCH;
+@@ -111 +111 @@
+-      if (!versionRegExp.cap(4).isEmpty()) { // beta versions should go befor release ones
++      if (!versionRegExp.cap(5).isEmpty()) { // beta versions should go before release ones
+@@ -113 +113 @@
+-        m_version += versionRegExp.cap(4).toShort();
++        m_version += versionRegExp.cap(5).toShort();
+' | while read line
+do
+patch -p0
+done
+
 listdocs_fn
 
 chown_fn
@@ -39,17 +105,17 @@ chown_fn
 ## See CMakeLists.txt for specific laptop support
 cd_builddir_fn
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_COMPILER=${COMPILER} \
-    -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \
+    -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
+    -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \
+    -DCMAKE_C_COMPILER=$COMPILER \
+    -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \
+    -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-    -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+    -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DWITH_DPMS="ON" \
     -DWITH_XSCREENSAVER="OFF" \
     -DWITH_SENSORS="ON" \
@@ -90,19 +156,19 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
 cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
+  chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
 fi
 
 # Update hicolor theme cache:
 if [ -d usr/share/icons/hicolor ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
+    chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
   fi
 fi
 
 # Update the mime database:
 if [ -x usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1
+  chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1
 fi
 EOINS
 
diff --git a/get-source.sh b/get-source.sh
index 4fea26f..49394aa 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -49,8 +49,8 @@ getsource_fn ()
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
-[[ ! -s $SRCDIR/../../src/${PRGNAM}-${VERSION}.${ARCHIVE_TYPE:-"tar.bz2"} ]] && rm $SRCDIR/../../src/${PRGNAM}-${VERSION}.${ARCHIVE_TYPE:-"tar.bz2"} 2>/dev/null
-ln -sf $SRCDIR/../../src/${PRGNAM}-${VERSION}.${ARCHIVE_TYPE:-"tar.bz2"} $SRCDIR
+[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} ]] && rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} 2>/dev/null
+ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} $SRCDIR
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -60,9 +60,9 @@ OUTPUT=${OUTPUT:-/tmp}
 # remove any previous builds
 [[ $KEEP_BUILD != "yes" ]] && rm -rf $TMP/{tmp,package}*
 
-SOURCE=$SRCDIR/${PRGNAM}-${VERSION}.${ARCHIVE_TYPE:-"tar.bz2"}
+SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"}
 # SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.bz2 URL
-SRCURL=${SRCURL:-"http://$TDE_MIRROR/releases/${VERSION}$TDEMIR_SUBDIR/${PRGNAM}-${VERSION}.tar.bz2"}
+SRCURL=${SRCURL:-"http://$TDE_MIRROR/releases/$VERSION$TDEMIR_SUBDIR/$PRGNAM-$VERSION.tar.bz2"}
 
 # Automatically determine the architecture we're building on:
 ## 2017-09 removed - ARCH is set in BUILD-TDE.sh
@@ -76,7 +76,7 @@ SRCURL=${SRCURL:-"http://$TDE_MIRROR/releases/${VERSION}$TDEMIR_SUBDIR/${PRGNAM}
 
 # Exit the script on errors:
 set -e
-trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+trap 'echo "$0 FAILED at line $LINENO" | tee $OUTPUT/error-$PRGNAM.log' ERR
 # Catch unitialized variables:
 set -u
 P1=${1:-1}
@@ -94,21 +94,21 @@ rm -rf $TMP/tmp-$PRGNAM/*
 rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
 
 # Source file availability:
-if ! [ -f ${SOURCE} ]; then
-  echo "Source '$(basename ${SOURCE})' not available yet..."
+if ! [ -f $SOURCE ]; then
+  echo "Source '$(basename $SOURCE)' not available yet..."
   # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
   [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
-  if ! [ "x${SRCURL}" == "x" ]; then
+  if [ -f $SOURCE ]; then echo "Ah, found it!"; continue; fi
+  if ! [ "x$SRCURL" == "x" ]; then
     echo "Will download file to $(dirname $SOURCE)"
-    wget -T 20 -O "${SOURCE}" "${SRCURL}" 
-    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
-      mv -f "${SOURCE}" "${SOURCE}".FAIL
+    wget -T 20 -O "$SOURCE" "$SRCURL" 
+    if [ $? -ne 0 -o ! -s "$SOURCE" ]; then
+      echo "Downloading '$(basename $SOURCE)' failed... aborting the build."
+      mv -f "$SOURCE" "$SOURCE".FAIL
       ${EXIT_FAIL:-":"}
     fi
   else
-    echo "File '$(basename ${SOURCE})' not available... aborting the build."
+    echo "File '$(basename $SOURCE)' not available... aborting the build."
     ${EXIT_FAIL:-":"}
   fi
 fi
@@ -122,9 +122,9 @@ fi
 untar_fn ()
 {
 cd $TMP/tmp-$PRGNAM
-echo -e "\n unpacking $(basename ${SOURCE}) ... \n"
-tar -xf ${SOURCE}
-[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) && cd ${PRGNAM} || cd ${PRGNAM}-${VERSION}
+echo -e "\n unpacking $(basename $SOURCE) ... \n"
+tar -xf $SOURCE
+[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) && cd $PRGNAM || cd $PRGNAM-$VERSION
 
 ## patch to allow automake 1.16.x
 [[ -s admin/cvs.sh ]] && echo $'
@@ -162,8 +162,8 @@ make -f admin/Makefile.common
 
 cd_builddir_fn ()
 {
-mkdir -p build-${PRGNAM}
-cd build-${PRGNAM}
+mkdir -p build-$PRGNAM
+cd build-$PRGNAM
 }
 
 make_fn ()
@@ -175,11 +175,11 @@ make DESTDIR=$PKG install || exit 1
 installdocs_fn ()
 {
 [[ $TDEMIR_SUBDIR == misc || $PRGNAM == libart-lgpl ]] && INSTALL_TDE=/usr
-mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
-(cd $DOCDIR;cp -a --parents ${DOCS:-} $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true
-cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION
-find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \;
+mkdir -p $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION
+(cd $DOCDIR;cp -a --parents ${DOCS:-} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION) || true
+cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION
+find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \;
 }
 
 mangzip_fn ()
@@ -206,10 +206,10 @@ makepkg_fn ()
 cd $PKG
 [[ ! $ARM_FABI ]] || { [[ $ARM_FABI == hard ]] && ARCH=${ARCH}_hf || ARCH=${ARCH}_sf
 }
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz} 
+makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} 
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz}.md5
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+md5sum $PRGNAM-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} > $PRGNAM-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz}.md5
+cat $PKG/install/slack-desc | grep "^$PRGNAM" | grep -v handy > $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.txt
 
 # Restore the original umask:
 umask ${_UMASK_}