import changes from debian package version 2.0.0

36 files changed, 675 insertions, 141 deletions

diff --git a/Xsession.d/55kanotix-kde b/Xsession.d/55kanotix-kde
new file mode 100644
index 0000000..788169c
--- /dev/null
+++ b/Xsession.d/55kanotix-kde
@@ -0,0 +1,14 @@
+# If we are running kde, export KDEDIRS with own Kanotix kde-settings dir
+
+BASESTARTUP=$(basename "$STARTUP" | cut -d\  -f1)
+if [ "$BASESTARTUP" = x-session-manager ]; then
+    BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
+fi
+if [ "$BASESTARTUP" = "startkde" ]; then
+    if [[ -z "$KDEDIRS" ]]; then 
+        KDEDIRS=/usr/share/kde-kanotix-settings/:/usr
+    else 
+        KDEDIRS=/usr/share/kde-kanotix-settings/:$KDEDIRS:/usr
+    fi
+    export KDEDIRS
+fi 
diff --git a/debian/changelog b/debian/changelog
index d0a3e6d..75c023a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+etcskel-kanotix (2.0.0) unstable; urgency=low
+
+  * first skeleton files for Kanotix Dragonfire
+  * updated Kanotix plasma desktop configuration
+  * disable screen lock after resume from suspend
+  * changed powerdevil critical battery level to 10%
+  * added new touchpad config and removed old configs
+  * added KDE default directories
+  * renew debian packaging to avoid lintian errors
+
+ -- Maximilian Gerhard <maxbox@directbox.com>  Mon, 17 Mar 2012 22:11:40 +0100
+
 etcskel-kanotix (1.1.5) unstable; urgency=low
 
   * merged with acritox version
diff --git a/debian/copyright b/debian/copyright
index bf6f667..fffd808 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,23 @@
 This work was packaged for Debian by:
 
-    Klaus Knopper <knoppix@knopper.net> on Fri, 1 Jun 2001 23:29:31 +0200
+    Maximilian Gerhard <maxbox@directbox.com> on Sat, 17 Mar 2012 22:39:49 +0100
 
-It was downloaded from:
+Upstream Authors:
 
-    http://www.knopper.net/knoppix/
-
-Upstream Author(s):
-
-    Klaus Knopper <knoppix@knopper.net>
+    Jörg Schirottke <master@kanotix.com>
+    Andreas Loibl <andreas@andreas-loibl.de>
+    Maximilian Gerhard <maxbox@directbox.com>
 
 Copyright:
 
-    Copyright (C) 2001 Klaus Knopper <knoppix@knopper.net>
+    initial etcskel packaging was made by Klaus Knopper (Knoppix)
 
 License:
 
-    This package is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation, either version 2 of the License, or
+    any later version.
 
     This package is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,16 +25,16 @@ License:
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>
+    along with this program. If not, see http://www.gnu.org/licenses/gpl-2.0.html.
 
 On Debian systems, the complete text of the GNU General
 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 The Debian packaging is:
 
-    Copyright (C) 2001 Klaus Knopper <knoppix@knopper.net>
+    Copyright (C) 2012 Maximilian Gerhard <maxbox@directbox.com>
 
-you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+and is licensed under the GPL version 3.
+
+On Debian systems, the complete text of the GNU General
+Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/kanotix-plasma-script.install b/debian/kanotix-plasma-script.install
index 2a76d4e..91fb47d 100644
--- a/debian/kanotix-plasma-script.install
+++ b/debian/kanotix-plasma-script.install
@@ -1,2 +1,4 @@
-plasma-desktop usr/share/kde4/apps/
-kanotix-reset-plasma-panel usr/bin
+kde-kanotix-settings usr/share/
+Xsession.d etc/X11/
+kanotix-reset-plasma-panel usr/bin/
+x-www-browser.desktop usr/share/applications/
diff --git a/debian/kanotix-plasma-script.postrm b/debian/kanotix-plasma-script.postrm
new file mode 100644
index 0000000..15dedd2
--- /dev/null
+++ b/debian/kanotix-plasma-script.postrm
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+remove_divert() {
+	diverter=$(dpkg-divert --listpackage $1)
+	if [ "$diverter" = "kanotix-plasma-script" ]; then
+		dpkg-divert --package kanotix-plasma-script --rename --remove $1
+	fi
+}
+
+if [ "$1" = remove ] || [ "$1" = deconfigure ]; then
+	remove_divert /usr/share/kde4/apps/plasma-desktop/init/00-defaultLayout.js
+fi
diff --git a/debian/kanotix-plasma-script.preinst b/debian/kanotix-plasma-script.preinst
new file mode 100644
index 0000000..5b97b24
--- /dev/null
+++ b/debian/kanotix-plasma-script.preinst
@@ -0,0 +1,31 @@
+#!/bin/bash
+set -e
+
+divert() {
+	dfile=$1
+	ltarget=$2
+	div=$(dpkg-divert --list $dfile)
+	distrib=${3:-$dfile.distrib}
+	temp=$dfile.tmp
+	if [ -z "$div" ]; then
+		# This differs from dpkg-divert's --rename because we
+		# first make a copy of $dfile (the file being diverted)
+		# in $distrib. Then, a symlink to $ltarget is forcibly created
+		# from $dfile; this is performed in two stages with an
+		# intermediate temporary file as ln -sf is not atomic.
+		# dpkg-divert's --rename direct equivalent would be:
+		# mv $dfile $distrib -- but we could end up without a symlink
+		if [ -e $dfile ]; then
+			cp -dp $dfile $distrib
+		fi
+		ln -sf $ltarget $temp
+		mv -f $temp $dfile
+		dpkg-divert --package kanotix-plasma-script --divert $distrib --add $dfile
+	fi
+}
+
+if [ install = "$1" -o upgrade = "$1" ]; then
+	# Divert the following files if no diversion exists already
+	divert /usr/share/kde4/apps/plasma-desktop/init/00-defaultLayout.js \
+		/usr/share/kde-kanotix-settings/share/apps/plasma-desktop/init/00-empty.js
+fi
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..f99d7ed
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,6 @@
+# we ignore ${Misc:Depends} because it's just configuration
+etcskel-kanotix source: debhelper-but-no-misc-depends user-profile-kanotix
+etcskel-kanotix source: debhelper-but-no-misc-depends badge-icon-kanotix
+etcskel-kanotix source: debhelper-but-no-misc-depends etcskel-kanotix-trinity
+etcskel-kanotix source: debhelper-but-no-misc-depends kanotix-plasma-script
+etcskel-kanotix source: debhelper-but-no-misc-depends etcskel-kanotix
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/kanotix-reset-plasma-panel b/kanotix-reset-plasma-panel
index 4974b52..79dbf9f 100755
--- a/kanotix-reset-plasma-panel
+++ b/kanotix-reset-plasma-panel
@@ -1,7 +1,15 @@
 #!/bin/sh
+if [ "$(id -u)" = "0" ]; then
+  echo "Error: Do NOT run this script as root!" >&2
+  exit 1
+fi
+if [ -z "$DISPLAY" ]; then
+  echo "Error: This script does NOT run without X!" >&2
+  exit 2
+fi
 echo "creating backup of ~/.kde/share/config/plasma-desktop-appletsrc"
 rm -f ~/.kde/share/config/plasma-desktop-appletsrc.bak
 cp ~/.kde/share/config/plasma-desktop-appletsrc ~/.kde/share/config/plasma-desktop-appletsrc.bak
 echo "loading panel reset script to plasma desktop console"
-qdbus org.kde.plasma-desktop /MainApplication loadScriptInInteractiveConsole /usr/share/kde4/apps/plasma-desktop/updates/01-kanotix-default-setup.js 2> /dev/null
+qdbus org.kde.plasma-desktop /MainApplication loadScriptInInteractiveConsole /usr/share/kde-kanotix-settings/share/apps/plasma-desktop/updates/02-kanotix-default-setup.js 2> /dev/null
 echo "to start plasma panel reset, press execute button"
diff --git a/kde-kanotix-settings/share/apps/plasma-desktop/init/00-empty.js b/kde-kanotix-settings/share/apps/plasma-desktop/init/00-empty.js
new file mode 100644
index 0000000..4812e04
--- /dev/null
+++ b/kde-kanotix-settings/share/apps/plasma-desktop/init/00-empty.js
@@ -0,0 +1 @@
+// empty script that prevent kde executing the default init scripts 
diff --git a/plasma-desktop/updates/01-kanotix-default-lock.js b/kde-kanotix-settings/share/apps/plasma-desktop/updates/01-kanotix-default-lock.js
index 80f258d..80f258d 100644
--- a/plasma-desktop/updates/01-kanotix-default-lock.js
+++ b/kde-kanotix-settings/share/apps/plasma-desktop/updates/01-kanotix-default-lock.js
diff --git a/plasma-desktop/updates/01-kanotix-default-setup.js b/kde-kanotix-settings/share/apps/plasma-desktop/updates/02-kanotix-default-setup.js
index 37ecbd0..b7d4a62 100644
--- a/plasma-desktop/updates/01-kanotix-default-setup.js
+++ b/kde-kanotix-settings/share/apps/plasma-desktop/updates/02-kanotix-default-setup.js
@@ -12,8 +12,23 @@ for (i = 0; i < pIds.length; ++i) {
     p.remove();
 }
 
-var panel = new Panel("panel");
-panel.location = "bottom";
+var activity = new Activity
+activity.name = i18n("Desktop");
+activity.wallpaperPlugin = "image";
+activity.wallpaperMode = "SingleImage";
+var wallpaper = "kanotix-starrise";
+activity.currentConfigGroup = new Array("Wallpaper", "image");
+activity.writeConfig("wallpaper", wallpaper);
+activity.writeConfig("userswallpaper", wallpaper);
+
+var folderview = activity.addWidget("folderview");
+folderview.writeConfig("url", userDataPath("desktop"));
+var geometry = screenGeometry(activity.screen).height > 800 ? QRectF(0,0,600,400) : QRectF(0,0,405,200);
+folderview.writeConfig("geometry", geometry);
+
+var panel = new Panel
+panel.location = 'bottom'
+panel.height = screenGeometry(panel.screen).height >= 1024 ? 35 : 27;
 launcher = panel.addWidget("launcher");
 launcher.globalShortcut = "Alt+F1"
 launcher.writeConfig("Share", "false");
@@ -22,19 +37,16 @@ launcher.reloadConfig();
 panel.addWidget("showdesktop");
 
 dolphinIcon = panel.addWidget("icon");
-dolphinIcon.writeConfig("Url", "file:///usr/share/applications/kde4/dolphin.desktop");
-dolphinIcon.reloadConfig();
+dolphinIcon.writeConfig("Url", applicationPath("dolphin.desktop"));
 
-iceweaselIcon = panel.addWidget("icon");
-iceweaselIcon.writeConfig("Url", "file:///usr/share/applications/iceweasel.desktop");
-iceweaselIcon.reloadConfig();
+webbrowserIcon = panel.addWidget("icon");
+webbrowserIcon.writeConfig("Url", applicationPath("x-www-browser.desktop"));
 
 konsoleIcon = panel.addWidget("icon");
-konsoleIcon.writeConfig("Url", "file:///usr/share/applications/kde4/konsole.desktop");
-konsoleIcon.reloadConfig();
+konsoleIcon.writeConfig("Url", applicationPath("konsole.desktop"));
 
-panel.addWidget("pager");
-panel.addWidget("tasks");
+panel.addWidget("pager")
+panel.addWidget("tasks")
 
 systray = panel.addWidget("systemtray");
 systray.writeConfig("alwaysShown", "notifier");
diff --git a/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultActivity/contents/layout.js b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultActivity/contents/layout.js
new file mode 100644
index 0000000..8b0966c
--- /dev/null
+++ b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultActivity/contents/layout.js
@@ -0,0 +1,26 @@
+// take care that the desktop isn't locked
+var was_locked = false;
+if (locked) {
+    was_locked = true;
+    locked = false;
+}
+
+var activity = new Activity
+activity.name = i18n("Desktop");
+activity.wallpaperPlugin = "image";
+activity.wallpaperMode = "SingleImage";
+var wallpaper = "kanotix-starrise";
+activity.currentConfigGroup = new Array("Wallpaper", "image");
+activity.writeConfig("wallpaper", wallpaper);
+activity.writeConfig("userswallpaper", wallpaper);
+
+var folderview = activity.addWidget("folderview");
+folderview.writeConfig("url", userDataPath("desktop"));
+folderview.writeConfig("geometry", QRectF(0,0,600,400));
+
+loadTemplate("com.kanotix.kde.plasma-desktop.defaultPanel");
+
+// restore previous lock state
+if (was_locked) {
+    locked = true;
+}
diff --git a/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultActivity/metadata.desktop b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultActivity/metadata.desktop
new file mode 100644
index 0000000..b26c48f
--- /dev/null
+++ b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultActivity/metadata.desktop
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Kanotix Activity
+Name[de]=Aktivität Kanotix
+Name[en_GB]=Kanotix Activity
+Name[es]=Actividad de Kanotix
+Name[fr]=Activité Kanotix
+Name[it]=Attività Kanotix
+Name[pt]=Actividade de Kanotix
+Name[pt_BR]=Atividade Kanotix
+Name[x-test]=xxKanotix Activityxx
+Icon=start-here-kanotix
+Type=Service
+ServiceTypes=Plasma/LayoutTemplate
+X-Plasma-Shell=plasma-desktop
+X-Plasma-ContainmentCategories=desktop
+X-Plasma-ContainmentLayout-ShowAsExisting=true
+X-KDE-PluginInfo-Author=Maximilian Gerhard
+X-KDE-PluginInfo-Email=maxbox@directbox.com
+X-KDE-PluginInfo-Name=com.kanotix.kde.plasma-desktop.defaultActivity
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://kanotix.com/
+X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultPanel/contents/layout.js b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultPanel/contents/layout.js
new file mode 100644
index 0000000..5ef8092
--- /dev/null
+++ b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultPanel/contents/layout.js
@@ -0,0 +1,53 @@
+// take care that desktop isn't locked
+var was_locked = false;
+if (locked) {
+    was_locked = true;
+    locked = false;
+}
+
+var panel = new Panel
+if (panelIds.length == 1) {
+    // we are the only panel, so set the location for the user
+    panel.location = 'bottom'
+}
+
+panel.height = screenGeometry(panel.screen).height >= 1024 ? 35 : 27;
+launcher = panel.addWidget("launcher");
+launcher.globalShortcut = "Alt+F1"
+launcher.writeConfig("Share", "false");
+launcher.writeConfig("icon", "start-here-kanotix");
+launcher.reloadConfig();
+panel.addWidget("showdesktop");
+
+dolphinIcon = panel.addWidget("icon");
+dolphinIcon.writeConfig("Url", applicationPath("dolphin.desktop"));
+
+webbrowserIcon = panel.addWidget("icon");
+webbrowserIcon.writeConfig("Url", applicationPath("x-www-browser.desktop"));
+
+konsoleIcon = panel.addWidget("icon");
+konsoleIcon.writeConfig("Url", applicationPath("konsole.desktop"));
+
+panel.addWidget("pager")
+panel.addWidget("tasks")
+
+systray = panel.addWidget("systemtray");
+systray.writeConfig("alwaysShown", "notifier");
+i = 0;
+if (hasBattery) {
+    systray.currentConfigGroup = new Array("Applets", ++i);
+    systray.writeConfig("plugin", "battery");
+}
+systray.currentConfigGroup = new Array("Applets", ++i);
+systray.writeConfig("plugin", "notifier");
+
+systray.currentConfigGroup = new Array("Applets", ++i);
+systray.writeConfig("plugin", "org.kde.networkmanagement");
+
+clock = panel.addWidget("digital-clock");
+clock.writeConfig("showDate", "true");
+
+// restore previous lock state
+if (was_locked) {
+    locked = true;
+}
diff --git a/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultPanel/metadata.desktop b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultPanel/metadata.desktop
new file mode 100644
index 0000000..c72849b
--- /dev/null
+++ b/kde-kanotix-settings/share/apps/plasma/layout-templates/com.kanotix.kde.plasma-desktop.defaultPanel/metadata.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Kanotix Panel
+Name[de]=Kanotix-Kontrollleiste
+Name[en_GB]=Kanotix Panel
+Name[es]=Panel Kanotix
+Name[fr]=Tableau de bord par Kanotix
+Name[it]=Pannello Kanotix
+Name[pt]=Painel Kanotix
+Name[pt_BR]=Painel Kanotix
+Name[x-test]=xxKanotix Panelxx
+Icon=start-here-kanotix
+Type=Service
+ServiceTypes=Plasma/LayoutTemplate
+X-Plasma-Shell=plasma-desktop
+X-Plasma-ContainmentCategories=panel
+X-KDE-PluginInfo-Author=Maximilian Gerhard
+X-KDE-PluginInfo-Email=maxbox@directbox.com
+X-KDE-PluginInfo-Name=com.kanotix.kde.plasma-desktop.defaultPanel
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://kanotix.com/
+X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/kde-kanotix-settings/share/kde4/services/plasma-layout-com.kanotix.kde.plasma-desktop.defaultActivity.desktop b/kde-kanotix-settings/share/kde4/services/plasma-layout-com.kanotix.kde.plasma-desktop.defaultActivity.desktop
new file mode 100644
index 0000000..b26c48f
--- /dev/null
+++ b/kde-kanotix-settings/share/kde4/services/plasma-layout-com.kanotix.kde.plasma-desktop.defaultActivity.desktop
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Kanotix Activity
+Name[de]=Aktivität Kanotix
+Name[en_GB]=Kanotix Activity
+Name[es]=Actividad de Kanotix
+Name[fr]=Activité Kanotix
+Name[it]=Attività Kanotix
+Name[pt]=Actividade de Kanotix
+Name[pt_BR]=Atividade Kanotix
+Name[x-test]=xxKanotix Activityxx
+Icon=start-here-kanotix
+Type=Service
+ServiceTypes=Plasma/LayoutTemplate
+X-Plasma-Shell=plasma-desktop
+X-Plasma-ContainmentCategories=desktop
+X-Plasma-ContainmentLayout-ShowAsExisting=true
+X-KDE-PluginInfo-Author=Maximilian Gerhard
+X-KDE-PluginInfo-Email=maxbox@directbox.com
+X-KDE-PluginInfo-Name=com.kanotix.kde.plasma-desktop.defaultActivity
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://kanotix.com/
+X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/kde-kanotix-settings/share/kde4/services/plasma-layout-com.kanotix.kde.plasma-desktop.defaultPanel.desktop b/kde-kanotix-settings/share/kde4/services/plasma-layout-com.kanotix.kde.plasma-desktop.defaultPanel.desktop
new file mode 100644
index 0000000..c72849b
--- /dev/null
+++ b/kde-kanotix-settings/share/kde4/services/plasma-layout-com.kanotix.kde.plasma-desktop.defaultPanel.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Kanotix Panel
+Name[de]=Kanotix-Kontrollleiste
+Name[en_GB]=Kanotix Panel
+Name[es]=Panel Kanotix
+Name[fr]=Tableau de bord par Kanotix
+Name[it]=Pannello Kanotix
+Name[pt]=Painel Kanotix
+Name[pt_BR]=Painel Kanotix
+Name[x-test]=xxKanotix Panelxx
+Icon=start-here-kanotix
+Type=Service
+ServiceTypes=Plasma/LayoutTemplate
+X-Plasma-Shell=plasma-desktop
+X-Plasma-ContainmentCategories=panel
+X-KDE-PluginInfo-Author=Maximilian Gerhard
+X-KDE-PluginInfo-Email=maxbox@directbox.com
+X-KDE-PluginInfo-Name=com.kanotix.kde.plasma-desktop.defaultPanel
+X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Website=http://kanotix.com/
+X-KDE-PluginInfo-Category=
+X-KDE-PluginInfo-Depends=
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/skel/.config/synaptiks/touchpad-config.json b/skel/.config/synaptiks/touchpad-config.json
new file mode 100644
index 0000000..5a72be1
--- /dev/null
+++ b/skel/.config/synaptiks/touchpad-config.json
@@ -0,0 +1,29 @@
+{
+  "circular_scrolling": false, 
+  "circular_touchpad": false, 
+  "rt_tap_action": 0, 
+  "circular_scrolling_distance": 5.73, 
+  "edge_motion_always": false, 
+  "horizontal_scrolling_distance": 100, 
+  "horizontal_two_finger_scrolling": false, 
+  "horizontal_edge_scrolling": false, 
+  "lt_tap_action": 0, 
+  "tap_and_drag_gesture": true, 
+  "f2_tap_action": 0, 
+  "corner_coasting": false, 
+  "acceleration_factor": 0.0398, 
+  "fast_taps": false, 
+  "vertical_edge_scrolling": true, 
+  "maximum_speed": 1.75, 
+  "circular_scrolling_trigger": 0, 
+  "minimum_speed": 1.0, 
+  "locked_drags": false, 
+  "vertical_two_finger_scrolling": true, 
+  "f1_tap_action": 1, 
+  "coasting_speed": 20.0, 
+  "vertical_scrolling_distance": 100, 
+  "f3_tap_action": 0, 
+  "locked_drags_timeout": 5.0, 
+  "lb_tap_action": 0, 
+  "rb_tap_action": 0
+}
\ No newline at end of file
diff --git a/skel/.config/synaptiks/touchpad-defaults.json b/skel/.config/synaptiks/touchpad-defaults.json
new file mode 100644
index 0000000..3e00b1d
--- /dev/null
+++ b/skel/.config/synaptiks/touchpad-defaults.json
@@ -0,0 +1,29 @@
+{
+  "circular_scrolling": false, 
+  "circular_touchpad": false, 
+  "rt_tap_action": 0, 
+  "circular_scrolling_distance": 5.72958, 
+  "edge_motion_always": false, 
+  "horizontal_scrolling_distance": 100, 
+  "horizontal_two_finger_scrolling": false, 
+  "horizontal_edge_scrolling": false, 
+  "lt_tap_action": 0, 
+  "tap_and_drag_gesture": true, 
+  "f2_tap_action": 0, 
+  "corner_coasting": false, 
+  "acceleration_factor": 0.03981, 
+  "fast_taps": false, 
+  "vertical_edge_scrolling": false, 
+  "maximum_speed": 1.75, 
+  "circular_scrolling_trigger": 0, 
+  "minimum_speed": 1.0, 
+  "locked_drags": false, 
+  "vertical_two_finger_scrolling": true, 
+  "f1_tap_action": 0, 
+  "coasting_speed": 20.0, 
+  "vertical_scrolling_distance": 100, 
+  "f3_tap_action": 0, 
+  "locked_drags_timeout": 5.0, 
+  "lb_tap_action": 0, 
+  "rb_tap_action": 0
+}
\ No newline at end of file
diff --git a/skel/.kde/share/apps/dolphin/dolphinui.rc b/skel/.kde/share/apps/dolphin/dolphinui.rc
new file mode 100644
index 0000000..225c377
--- /dev/null
+++ b/skel/.kde/share/apps/dolphin/dolphinui.rc
@@ -0,0 +1,232 @@
+<!DOCTYPE kpartgui SYSTEM 'kpartgui.dtd'>
+<kpartgui version="14" name="dolphin">
+ <MenuBar alreadyVisited="1">
+  <Menu name="file" alreadyVisited="1">
+   <text>&amp;File</text>
+   <Action name="create_new"/>
+   <Action name="new_window"/>
+   <Action name="new_tab"/>
+   <Action name="close_tab"/>
+   <Separator/>
+   <Action name="rename"/>
+   <Action name="move_to_trash"/>
+   <Action name="delete"/>
+   <Separator/>
+   <Action name="properties"/>
+   <Separator weakSeparator="1"/>
+   <Action name="file_quit"/>
+   <Separator weakSeparator="1"/>
+   <Action name="file_quit"/>
+   <Separator weakSeparator="1"/>
+   <Action name="file_quit"/>
+  </Menu>
+  <Menu name="edit" alreadyVisited="1">
+   <text>&amp;Edit</text>
+   <Action name="edit_undo"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_cut"/>
+   <Action name="edit_copy"/>
+   <Action name="edit_paste"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_find"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_undo"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_cut"/>
+   <Action name="edit_copy"/>
+   <Action name="edit_paste"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_find"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_undo"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_cut"/>
+   <Action name="edit_copy"/>
+   <Action name="edit_paste"/>
+   <Separator weakSeparator="1"/>
+   <Action name="edit_find"/>
+   <Separator weakSeparator="1"/>
+   <Action name="select_all"/>
+   <Action name="invert_selection"/>
+  </Menu>
+  <Menu name="view" alreadyVisited="1">
+   <text>&amp;View</text>
+   <Action name="view_zoom_in"/>
+   <Action name="view_zoom_out"/>
+   <Separator weakSeparator="1"/>
+   <Action name="view_zoom_in"/>
+   <Action name="view_zoom_out"/>
+   <Separator weakSeparator="1"/>
+   <Action name="view_zoom_in"/>
+   <Action name="view_zoom_out"/>
+   <Separator weakSeparator="1"/>
+   <Action name="view_mode"/>
+   <Action name="sort"/>
+   <Action name="additional_info"/>
+   <Action name="show_preview"/>
+   <Action name="show_in_groups"/>
+   <Action name="show_hidden_files"/>
+   <Separator/>
+   <Action name="split_view"/>
+   <Action name="reload"/>
+   <Action name="stop"/>
+   <Separator/>
+   <Action name="panels"/>
+   <Menu name="location_bar">
+    <text context="@title:menu">Location Bar</text>
+    <Action name="editable_location"/>
+    <Action name="replace_location"/>
+   </Menu>
+   <Separator/>
+   <Action name="view_properties"/>
+  </Menu>
+  <Menu name="go" alreadyVisited="1">
+   <text>&amp;Go</text>
+   <Action name="go_up"/>
+   <Action name="go_back"/>
+   <Action name="go_forward"/>
+   <Action name="go_home"/>
+   <Separator weakSeparator="1"/>
+   <Action name="go_up"/>
+   <Action name="go_back"/>
+   <Action name="go_forward"/>
+   <Action name="go_home"/>
+   <Separator weakSeparator="1"/>
+   <Action name="go_up"/>
+   <Action name="go_back"/>
+   <Action name="go_forward"/>
+   <Action name="go_home"/>
+   <Separator weakSeparator="1"/>
+   <Action name="closed_tabs"/>
+  </Menu>
+  <Separator weakSeparator="1"/>
+  <Separator weakSeparator="1"/>
+  <Menu name="tools" alreadyVisited="1">
+   <text>&amp;Tools</text>
+   <Action name="show_filter_bar"/>
+   <Action name="open_terminal"/>
+   <Action name="compare_files"/>
+   <Action name="change_remote_encoding"/>
+  </Menu>
+  <Menu name="settings" alreadyVisited="1">
+   <text>&amp;Settings</text>
+   <Action name="options_show_menubar"/>
+   <Separator weakSeparator="1"/>
+   <Action name="options_configure_keybinding"/>
+   <Action name="options_configure_toolbars"/>
+   <Action name="options_configure"/>
+   <Separator weakSeparator="1"/>
+   <Action name="options_show_menubar"/>
+   <Separator weakSeparator="1"/>
+   <Action name="options_configure_keybinding"/>
+   <Action name="options_configure_toolbars"/>
+   <Action name="options_configure"/>
+   <Separator weakSeparator="1"/>
+   <Action name="options_show_menubar"/>
+   <Merge name="StandardToolBarMenuHandler"/>
+   <Merge name="KMDIViewActions"/>
+   <Separator weakSeparator="1"/>
+   <Action name="options_configure_keybinding"/>
+   <Action name="options_configure_toolbars"/>
+   <Action name="options_configure"/>
+  </Menu>
+  <Separator weakSeparator="1"/>
+  <Menu name="help" alreadyVisited="1">
+   <text>&amp;Help</text>
+   <Action name="help_contents"/>
+   <Action name="help_whats_this"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_contents"/>
+   <Action name="help_whats_this"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_contents"/>
+   <Action name="help_whats_this"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_report_bug"/>
+   <Separator weakSeparator="1"/>
+   <Action name="switch_application_language"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_about_app"/>
+   <Action name="help_about_kde"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_report_bug"/>
+   <Separator weakSeparator="1"/>
+   <Action name="switch_application_language"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_about_app"/>
+   <Action name="help_about_kde"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_report_bug"/>
+   <Separator weakSeparator="1"/>
+   <Action name="switch_application_language"/>
+   <Separator weakSeparator="1"/>
+   <Action name="help_about_app"/>
+   <Action name="help_about_kde"/>
+  </Menu>
+ </MenuBar>
+ <ToolBar noMerge="1" name="mainToolBar" alreadyVisited="1">
+  <text context="@title:menu">Main Toolbar</text>
+  <Action name="go_back"/>
+  <Action name="go_forward"/>
+  <Separator name="separator_0"/>
+  <Action name="icons"/>
+  <Action name="compact"/>
+  <Action name="details"/>
+  <Separator name="separator_1"/>
+  <Action name="edit_find"/>
+  <Action name="show_preview"/>
+  <Action name="split_view"/>
+  <Action name="open_terminal"/>
+ </ToolBar>
+ <State name="new_file">
+  <disable>
+   <Action name="edit_undo"/>
+   <Action name="edit_redo"/>
+   <Action name="edit_cut"/>
+   <Action name="edit_copy"/>
+   <Action name="rename"/>
+   <Action name="move_to_trash"/>
+   <Action name="delete"/>
+   <Action name="invert_selection"/>
+   <Separator/>
+   <Action name="go_back"/>
+   <Action name="go_forward"/>
+  </disable>
+ </State>
+ <State name="has_selection">
+  <enable>
+   <Action name="edit_cut"/>
+   <Action name="edit_copy"/>
+   <Action name="rename"/>
+   <Action name="move_to_trash"/>
+   <Action name="delete"/>
+   <Action name="invert_selection"/>
+  </enable>
+ </State>
+ <State name="has_no_selection">
+  <disable>
+   <Action name="edit_cut"/>
+   <Action name="edit_copy"/>
+   <Action name="rename"/>
+   <Action name="move_to_trash"/>
+   <Action name="delete"/>
+   <Action name="delete_shortcut"/>
+   <Action name="invert_selection"/>
+  </disable>
+ </State>
+ <ActionProperties scheme="Default">
+  <Action priority="0" name="go_back"/>
+  <Action priority="0" name="go_forward"/>
+  <Action priority="0" name="go_up"/>
+  <Action priority="0" name="go_home"/>
+  <Action priority="0" name="stop"/>
+  <Action priority="0" name="icons"/>
+  <Action priority="0" name="compact"/>
+  <Action priority="0" name="details"/>
+  <Action priority="0" name="view_zoom_in"/>
+  <Action priority="0" name="view_zoom_out"/>
+  <Action priority="0" name="edit_cut"/>
+  <Action priority="0" name="edit_copy"/>
+  <Action priority="0" name="edit_paste"/>
+ </ActionProperties>
+</kpartgui> 
diff --git a/skel/.kde/share/config/dolphinrc b/skel/.kde/share/config/dolphinrc
new file mode 100644
index 0000000..728fb7d
--- /dev/null
+++ b/skel/.kde/share/config/dolphinrc
@@ -0,0 +1,2 @@
+[MainWindow] 
+State=AAAA/wAAAAD9AAAAAwAAAAAAAACMAAAB1vwCAAAAAvsAAAAWAGYAbwBsAGQAZQByAHMARABvAGMAawAAAAAA/////wAAAAgBAAAF+wAAABQAcABsAGEAYwBlAHMARABvAGMAawEAAAAeAAAB1gAAAFABAAAFAAAAAQAAALoAAAHW/AIAAAAC+wAAABAAaQBuAGYAbwBEAG8AYwBrAQAAAB4AAAHWAAAA8AEAAAX7AAAAFABzAGUAYQByAGMAaABEAG8AYwBrAAAAAAD/////AAAACAEAAAUAAAADAAAAAAAAAAD8AQAAAAH7AAAAGAB0AGUAcgBtAGkAbgBhAGwARABvAGMAawAAAAAA/////wAAAAgBAAAFAAABogAAAdYAAAAEAAAABAAAAAgAAAAI/AAAAAEAAAACAAAAAQAAABYAbQBhAGkAbgBUAG8AbwBsAEIAYQByAQAAAAD/////AAAAAAAAAAA=
diff --git a/skel/.kde/share/config/kmetainformationrc b/skel/.kde/share/config/kmetainformationrc
index 7f897c6..4286f71 100644
--- a/skel/.kde/share/config/kmetainformationrc
+++ b/skel/.kde/share/config/kmetainformationrc
@@ -1,26 +1,37 @@
 [Misc]
-version=2
+version=3
 
 [Show]
-asText=false
-contentSize=false
-created=false
-depth=false
-description=false
-fileExtension=false
-fileName=false
-fileSize=false
-hasTag=false
-lastModified=false
-mimeType=false
-modified=true
-name=false
-numericRating=false
-owner=true
-parentUrl=false
-permissions=true
-plainTextContent=false
-size=true
-sourceModified=false
-type=true
-url=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#comment=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#contentSize=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#depends=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#isPartOf=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#lastModified=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#mimeType=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#plainTextContent=false
+http://www.semanticdesktop.org/ontologies/2007/01/19/nie#url=false
+http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#averageBitrate=false
+http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#channels=false
+http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#fileName=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#apertureValue=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#exposureBiasValue=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#exposureTime=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#flash=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#focalLength=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#focalLengthIn35mmFilm=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#isoSpeedRatings=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#make=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#meteringMode=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#model=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#orientation=false
+http://www.semanticdesktop.org/ontologies/2007/05/10/nexif#whiteBalance=false
+http://www.semanticdesktop.org/ontologies/2007/08/15/nao#description=false
+http://www.semanticdesktop.org/ontologies/2007/08/15/nao#hasTag=false
+http://www.semanticdesktop.org/ontologies/2007/08/15/nao#lastModified=false
+http://www.semanticdesktop.org/ontologies/2007/08/15/nao#numericRating=false
+http://www.w3.org/1999/02/22-rdf-syntax-ns#type=false
+kfileitem#modified=true
+kfileitem#owner=true
+kfileitem#permissions=true
+kfileitem#size=true
+kfileitem#type=true
diff --git a/skel/.kde/share/config/kwinrc b/skel/.kde/share/config/kwinrc
index 8f1b7ce..95745b9 100644
--- a/skel/.kde/share/config/kwinrc
+++ b/skel/.kde/share/config/kwinrc
@@ -1,3 +1,11 @@
+[Desktops]
+Name_1=
+Name_2=
+Name_3=
+Name_4=
+Number=4
+Rows=2
+
 [Plugins]
 kwin4_effect_magnifierEnabled=true
 kwin4_effect_mousemarkEnabled=true
diff --git a/skel/.kde/share/config/plasma-desktop-appletsrc b/skel/.kde/share/config/plasma-desktop-appletsrc
deleted file mode 100644
index 570c35a..0000000
--- a/skel/.kde/share/config/plasma-desktop-appletsrc
+++ /dev/null
@@ -1,42 +0,0 @@
-[$Version]
-update_info=plasma_popupapplet_fix_groups.upd:PlasmaPopupAppletFixGroups1
-
-[Containments][1]
-activity=
-desktop=-1
-formfactor=0
-immutability=1
-location=0
-plugin=desktop
-screen=0
-wallpaperplugin=image
-wallpaperpluginmode=SingleImage
-zvalue=0
-
-[Containments][1][Wallpaper][image]
-wallpaper=/usr/share/wallpapers/kanotix-starrise 
-
-[Containments][1][Applets][2]
-activity=
-desktop=-1
-formfactor=0
-immutability=1
-location=0
-plugin=folderview
-screen=-1
-zvalue=0
-
-[Containments][1][Applets][2][Configuration]
-activity=
-desktop=-1
-formfactor=0
-immutability=1
-location=0
-plugin=folderview
-screen=-1
-url=desktop:/
-zvalue=0
-
-[Containments][3][Applets][4][Configuration]
-Share=false
-icon=start-here-kanotix
diff --git a/skel/.kde/share/config/powerdevilrc b/skel/.kde/share/config/powerdevilrc
new file mode 100644
index 0000000..6d63ca0
--- /dev/null
+++ b/skel/.kde/share/config/powerdevilrc
@@ -0,0 +1,6 @@
+[BatteryManagement]
+BatteryCriticalAction=1
+BatteryCriticalLevel=10
+
+[General]
+configLockScreen=false
diff --git a/skel/.kde/share/config/synaptiks.notifyrc b/skel/.kde/share/config/synaptiks.notifyrc
deleted file mode 100644
index 91def76..0000000
--- a/skel/.kde/share/config/synaptiks.notifyrc
+++ /dev/null
@@ -1,13 +0,0 @@
-[Event/touchpadError]
-Action=
-Execute=
-KTTS=
-Logfile=
-Sound=
-
-[Event/touchpadOff]
-Action=
-Execute=
-KTTS=
-Logfile=
-Sound=
diff --git a/skel/.kde/share/config/synaptiksrc b/skel/.kde/share/config/synaptiksrc
deleted file mode 100644
index aa8ffbf..0000000
--- a/skel/.kde/share/config/synaptiksrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[Scrolling]
-VerticalEdgeScrolling=true
-
-[Tapping]
-OneFingerButton=LeftMouseButton
diff --git a/skel/.kde/share/config/synaptiksrc-defaults b/skel/.kde/share/config/synaptiksrc-defaults
deleted file mode 100644
index 1bfac44..0000000
--- a/skel/.kde/share/config/synaptiksrc-defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-[Motion]
-AccelerationFactor=0.01
-MaximumSpeed=0.7
-MinimumSpeed=0.4
-
-[Scrolling]
-CircularScrollingDistance=6
-Coasting=false
-CoastingSpeed=0
-CornerCoasting=false
-HorizontalEdgeScrolling=false
-HorizontalScrollingDistance=100
-HorizontalTwoFingerScrolling=false
-VerticalEdgeScrolling=false
-VerticalScrollingDistance=100
-VerticalTwoFingerScrolling=false
-
-[Tapping]
-LockedDragsTimeout=5
-OneFingerButton=NoButton
diff --git a/skel/.kde/share/config/synaptiksrc-macbook b/skel/.kde/share/config/synaptiksrc-macbook
deleted file mode 100644
index aabec78..0000000
--- a/skel/.kde/share/config/synaptiksrc-macbook
+++ /dev/null
@@ -1,7 +0,0 @@
-[Scrolling]
-VerticalEdgeScrolling=true
-VerticalTwoFingerScrolling=true
-
-[Tapping]
-TwoFingerButton=RightMouseButton
-ThreeFingerButton=MiddleMouseButton 
diff --git a/skel/Documents/.directory b/skel/Documents/.directory
new file mode 100644
index 0000000..fe6f3da
--- /dev/null
+++ b/skel/Documents/.directory
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Icon=folder-documents
diff --git a/skel/Downloads/.directory b/skel/Downloads/.directory
new file mode 100644
index 0000000..d414f16
--- /dev/null
+++ b/skel/Downloads/.directory
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Icon=folder-downloads
diff --git a/skel/Music/.directory b/skel/Music/.directory
new file mode 100644
index 0000000..90fa43b
--- /dev/null
+++ b/skel/Music/.directory
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Icon=folder-sound
diff --git a/skel/Pictures/.directory b/skel/Pictures/.directory
new file mode 100644
index 0000000..4763c3f
--- /dev/null
+++ b/skel/Pictures/.directory
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Icon=folder-image
diff --git a/skel/Videos/.directory b/skel/Videos/.directory
new file mode 100644
index 0000000..3c68e3e
--- /dev/null
+++ b/skel/Videos/.directory
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Icon=folder-video
diff --git a/x-www-browser.desktop b/x-www-browser.desktop
new file mode 100644
index 0000000..f42529a
--- /dev/null
+++ b/x-www-browser.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=System Web Browser
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+X-GNOME-FullName=System Web Browser
+Exec=x-www-browser %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=applications-internet
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Web-Browser
+StartupNotify=true