From 26f2a2855f43cf5d8516b110149247af7b1b3fb7 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 2 Jun 2008 23:52:06 +0000
Subject: * reorganized the themes-folders of the desktop-plugin as discussed
 with Michael   recently: now it's kdm/<theme> and gdm/<theme> instead of
 <theme>/kdm and   <theme>/gdm, as that makes handling of GDM less cumbersome
 * renamed actual theme description files to theme.xml instead of being  
 named like the theme (in this case: openslx.xml) Tested with GDM and KDM on
 SUSE-10.2

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1838 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm  |  10 +-
 os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm  |   2 +-
 .../plugins/desktop/OpenSLX/OSPlugin/desktop.pm    |  42 +++--
 .../themes/gdm/openslx/GdmGreeterTheme.desktop     |   8 +
 .../plugins/desktop/themes/gdm/openslx/color.png   | Bin 0 -> 177 bytes
 .../desktop/themes/gdm/openslx/environment.png     | Bin 0 -> 4296 bytes
 .../desktop/themes/gdm/openslx/main-runner.png     | Bin 0 -> 143 bytes
 .../themes/gdm/openslx/openslx-logo-main.png       | Bin 0 -> 82050 bytes
 .../desktop/themes/gdm/openslx/openslx-logo.png    | Bin 0 -> 9113 bytes
 .../desktop/themes/gdm/openslx/sessions.png        | Bin 0 -> 4245 bytes
 .../themes/gdm/openslx/sessions_inactive.png       | Bin 0 -> 4066 bytes
 .../plugins/desktop/themes/gdm/openslx/system.png  | Bin 0 -> 4257 bytes
 .../desktop/themes/gdm/openslx/system_inactive.png | Bin 0 -> 4091 bytes
 .../plugins/desktop/themes/gdm/openslx/theme.xml   | 205 +++++++++++++++++++++
 .../themes/gdm/openslx/welcome-time-shadowed.png   | Bin 0 -> 1580 bytes
 .../plugins/desktop/themes/kdm/openslx/color.png   | Bin 0 -> 177 bytes
 .../plugins/desktop/themes/kdm/openslx/enter.png   | Bin 0 -> 4260 bytes
 .../desktop/themes/kdm/openslx/enter_inactive.png  | Bin 0 -> 4072 bytes
 .../desktop/themes/kdm/openslx/environment.png     | Bin 0 -> 5076 bytes
 .../desktop/themes/kdm/openslx/main-runner.png     | Bin 0 -> 143 bytes
 .../themes/kdm/openslx/openslx-logo-main.png       | Bin 0 -> 82050 bytes
 .../desktop/themes/kdm/openslx/openslx-logo.png    | Bin 0 -> 9113 bytes
 .../desktop/themes/kdm/openslx/sessions.png        | Bin 0 -> 4245 bytes
 .../themes/kdm/openslx/sessions_inactive.png       | Bin 0 -> 4066 bytes
 .../plugins/desktop/themes/kdm/openslx/system.png  | Bin 0 -> 4257 bytes
 .../desktop/themes/kdm/openslx/system_inactive.png | Bin 0 -> 4091 bytes
 .../plugins/desktop/themes/kdm/openslx/theme.xml   | 200 ++++++++++++++++++++
 .../themes/kdm/openslx/welcome-time-shadowed.png   | Bin 0 -> 1580 bytes
 .../plugins/desktop/themes/openslx/color.png       | Bin 177 -> 0 bytes
 .../openslx/gdm/openslx/GdmGreeterTheme.desktop    |   8 -
 .../desktop/themes/openslx/gdm/openslx/color.png   |   1 -
 .../themes/openslx/gdm/openslx/environment.png     | Bin 4296 -> 0 bytes
 .../themes/openslx/gdm/openslx/main-runner.png     |   1 -
 .../openslx/gdm/openslx/openslx-logo-main.png      |   1 -
 .../themes/openslx/gdm/openslx/openslx-logo.png    |   1 -
 .../desktop/themes/openslx/gdm/openslx/openslx.xml | 205 ---------------------
 .../themes/openslx/gdm/openslx/sessions.png        |   1 -
 .../openslx/gdm/openslx/sessions_inactive.png      |   1 -
 .../desktop/themes/openslx/gdm/openslx/system.png  |   1 -
 .../themes/openslx/gdm/openslx/system_inactive.png |   1 -
 .../openslx/gdm/openslx/welcome-time-shadowed.png  |   1 -
 .../themes/openslx/kdm/GdmGreeterTheme.desktop     |   8 -
 .../plugins/desktop/themes/openslx/kdm/color.png   |   1 -
 .../plugins/desktop/themes/openslx/kdm/enter.png   | Bin 4260 -> 0 bytes
 .../desktop/themes/openslx/kdm/enter_inactive.png  | Bin 4072 -> 0 bytes
 .../desktop/themes/openslx/kdm/environment.png     | Bin 5076 -> 0 bytes
 .../desktop/themes/openslx/kdm/main-runner.png     |   1 -
 .../themes/openslx/kdm/openslx-logo-main.png       |   1 -
 .../desktop/themes/openslx/kdm/openslx-logo.png    |   1 -
 .../plugins/desktop/themes/openslx/kdm/openslx.xml | 200 --------------------
 .../desktop/themes/openslx/kdm/sessions.png        |   1 -
 .../themes/openslx/kdm/sessions_inactive.png       |   1 -
 .../plugins/desktop/themes/openslx/kdm/system.png  |   1 -
 .../desktop/themes/openslx/kdm/system_inactive.png |   1 -
 .../themes/openslx/kdm/welcome-time-shadowed.png   |   1 -
 .../plugins/desktop/themes/openslx/main-runner.png | Bin 143 -> 0 bytes
 .../desktop/themes/openslx/openslx-logo-main.png   | Bin 82050 -> 0 bytes
 .../desktop/themes/openslx/openslx-logo.png        | Bin 9113 -> 0 bytes
 .../plugins/desktop/themes/openslx/sessions.png    | Bin 4245 -> 0 bytes
 .../desktop/themes/openslx/sessions_inactive.png   | Bin 4066 -> 0 bytes
 .../plugins/desktop/themes/openslx/system.png      | Bin 4257 -> 0 bytes
 .../desktop/themes/openslx/system_inactive.png     | Bin 4091 -> 0 bytes
 .../themes/openslx/welcome-time-shadowed.png       | Bin 1580 -> 0 bytes
 63 files changed, 448 insertions(+), 458 deletions(-)
 create mode 100755 os-plugins/plugins/desktop/themes/gdm/openslx/GdmGreeterTheme.desktop
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/color.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/environment.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/main-runner.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo-main.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/sessions.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/sessions_inactive.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/system.png
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/system_inactive.png
 create mode 100755 os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
 create mode 100644 os-plugins/plugins/desktop/themes/gdm/openslx/welcome-time-shadowed.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/color.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/enter.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/enter_inactive.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/environment.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/system.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
 create mode 100644 os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/color.png
 delete mode 100755 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png
 delete mode 100755 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/color.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/kdm/enter.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/kdm/environment.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/kdm/openslx.xml
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/system.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png
 delete mode 120000 os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/main-runner.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/openslx-logo.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/sessions.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/system.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/system_inactive.png
 delete mode 100644 os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png

diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
index 2777dc13..dbd12416 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm
@@ -152,9 +152,9 @@ sub setupGDMScript
         # activate theme only if the corresponding xml file is found
         # (otherwise fall back to default theme of vendor-OS)
         if [ -n "\$desktop_theme" ]; then
-          thdir=/opt/openslx/plugin-repo/desktop/themes/\$desktop_theme/gdm
+          thdir=/opt/openslx/plugin-repo/desktop/themes/gdm
           theme=\$desktop_theme
-          if [ -e /mnt\$thdir/\$theme/\$theme.xml ]; then
+          if [ -e /mnt\$thdir/\$theme/theme.xml ]; then
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalThemeDir=\$thdir," \\
               /mnt$configFile
             sed -i "s,\\[greeter\\],[greeter]\\nGraphicalTheme=\$theme," \\
@@ -298,10 +298,10 @@ sub setupKDMScript
         # activate theme only if the corresponding xml file is found
         # (otherwise fall back to default theme of vendor-OS)
         if [ -n "\$desktop_theme" ]; then
-          thdir=/opt/openslx/plugin-repo/desktop/themes/\$desktop_theme/kdm
           theme=\$desktop_theme
-          if [ -e /mnt\$thdir/\$theme.xml ]; then
-            sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thdir," \\
+          thfile=/opt/openslx/plugin-repo/desktop/themes/kdm/\$theme/theme.xml
+          if [ -e /mnt\$thfile ]; then
+            sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nTheme=\$thfile," \\
               /mnt$configFile
             sed -i "s,\\[X-\\*-Greeter\\],[X-*-Greeter]\\nUseTheme=true," \\
               /mnt$configFile
diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
index 08633fcd..0e2095c6 100644
--- a/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Suse.pm
@@ -65,7 +65,7 @@ sub setupKDMScript
 
     # SUSE reads /var/adm/kdm/kdmrc.sysconfig, so we link that to
     # our config file
-    my $pathInfo   = $self->GDMPathInfo();
+    my $pathInfo   = $self->KDMPathInfo();
     my $configFile = $pathInfo->{config};
     mkpath("/etc/opt/kdm");
     system("ln -sfn /etc/opt/kdm/kdmrc /var/adm/kdm/kdmrc.sysconfig");
diff --git a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
index 9a251a86..5c146016 100644
--- a/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
+++ b/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm
@@ -33,8 +33,12 @@ sub new
         name => 'desktop',
     };
 
-    my $localThemesDir = "$openslxConfig{'config-path'}/plugins/desktop/themes";
-    mkpath($localThemesDir) unless -e $localThemesDir;
+    my $localGDMThemesDir 
+        = "$openslxConfig{'config-path'}/plugins/desktop/themes/gdm";
+    mkpath($localGDMThemesDir) unless -e $localGDMThemesDir;
+    my $localKDMThemesDir 
+        = "$openslxConfig{'config-path'}/plugins/desktop/themes/kdm";
+    mkpath($localKDMThemesDir) unless -e $localKDMThemesDir;
 
     return bless $self, $class;
 }
@@ -432,6 +436,8 @@ sub _fillUnsetStage1Attrs
     }
     if (!defined $self->{'supported_themes'}) {
         $self->{'supported_themes'} = join ",", $self->_getAvailableThemes();
+        $self->{attrs}->{'desktop::supported_themes'} 
+            = $self->{'supported_themes'};
     }
 
     return 1;
@@ -608,15 +614,21 @@ sub _setupSupportedThemes
     for my $theme (@supportedThemes) {
         THEME_DIR:
         foreach my $themeBaseDir (@themeBaseDirs) {
-            my $themeDir = "$themeBaseDir/$theme";
-            next THEME_DIR if !-d $themeDir;
+            my $gdmThemeDir = "$themeBaseDir/gdm/$theme";
+            my $kdmThemeDir = "$themeBaseDir/kdm/$theme";
+            next THEME_DIR if !-d $gdmThemeDir && !-d $kdmThemeDir;
+                # any of both dirs is enough
 
             # copy theme into plugin-repo folder
-            my $themeTargetPath = "$self->{pluginRepositoryPath}/themes";
-            mkpath($themeTargetPath);
             vlog(1, "installing theme '$theme'...");
-            slxsystem("cp -a $themeDir $themeTargetPath/$theme") == 0
-                or die _tr('unable to copy theme %s (%s)', $theme, $!);
+            my $gdmThemeTargetPath = "$self->{pluginRepositoryPath}/themes/gdm";
+            mkpath($gdmThemeTargetPath);
+            slxsystem("cp -a $gdmThemeDir $gdmThemeTargetPath/$theme") == 0
+                or die _tr('unable to copy GDM-theme %s (%s)', $theme, $!);
+            my $kdmThemeTargetPath = "$self->{pluginRepositoryPath}/themes/kdm";
+            mkpath($kdmThemeTargetPath);
+            slxsystem("cp -a $kdmThemeDir $kdmThemeTargetPath/$theme") == 0
+                or die _tr('unable to copy KDM-theme %s (%s)', $theme, $!);
             next THEME;
         }
         warn _tr('theme "%s" not found - skipped!', $theme);
@@ -629,7 +641,7 @@ sub _getAvailableThemes
 {
     my $self = shift;
 
-    my @availableThemes;
+    my %availableThemes;
 
     # return all themes found in any of these two folders
     my @themeBaseDirs = (
@@ -637,13 +649,17 @@ sub _getAvailableThemes
         "$self->{openslxBasePath}/lib/plugins/desktop/themes",
     );
     for my $themeBaseDir (@themeBaseDirs) {
-        push @availableThemes, 
-            map { basename $_ } grep { -d $_ } glob("$themeBaseDir/*");
+        my @foundGDMThemes 
+            = map { basename $_ } grep { -d $_ } glob("$themeBaseDir/gdm/*");
+        @availableThemes{@foundGDMThemes} = ();
+        my @foundKDMThemes 
+            = map { basename $_ } grep { -d $_ } glob("$themeBaseDir/kdm/*");
+        @availableThemes{@foundKDMThemes} = ();
     }
 
-    vlog(1, _tr("available themes: %s", join ",", @availableThemes));
+    vlog(1, _tr("available themes: %s", join ",", keys %availableThemes));
 
-    return @availableThemes;
+    return keys %availableThemes;
 }
 
 1;
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/gdm/openslx/GdmGreeterTheme.desktop
new file mode 100755
index 00000000..08e5efce
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/GdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=OpenSLX GDM theme
+Description=GDM Port of Daemonic KDM theme for FreeBSD
+Author=MJanc / KDM by aceph <aceph@ventcore.net>
+Copyright=Creative Commons
+Screenshot=screenshot.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/color.png b/os-plugins/plugins/desktop/themes/gdm/openslx/color.png
new file mode 100644
index 00000000..7a0feb03
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/color.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/environment.png b/os-plugins/plugins/desktop/themes/gdm/openslx/environment.png
new file mode 100644
index 00000000..7ad6783a
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/environment.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/gdm/openslx/main-runner.png
new file mode 100644
index 00000000..5b3cf656
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/main-runner.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo-main.png
new file mode 100644
index 00000000..f98e6517
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo-main.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo.png
new file mode 100644
index 00000000..8cfaaf94
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/openslx-logo.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/sessions.png b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions.png
new file mode 100644
index 00000000..00d05f29
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions_inactive.png
new file mode 100644
index 00000000..86bbe642
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/sessions_inactive.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/system.png b/os-plugins/plugins/desktop/themes/gdm/openslx/system.png
new file mode 100644
index 00000000..f7b9e71f
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/system.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/gdm/openslx/system_inactive.png
new file mode 100644
index 00000000..c3e1719b
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/system_inactive.png differ
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
new file mode 100755
index 00000000..2a1708c3
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/gdm/openslx/theme.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+	<item type="pixmap">
+		<normal file="color.png"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+		<box orientation="vertical" homogeneous="true">
+			
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="n" x="50%" y="0%" width="100%" height="80%"/>
+				<box orientation="vertical" homogeneous="true">
+				
+					<item type="pixmap">
+						<normal file="welcome-time-shadowed.png"/>
+						<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+						<box orientation="horizontal" homogeneous="true">
+						
+							<!-- Wellcome on ... -->
+							<item type="label">
+								<pos anchor="w" x="10%" y="30%"/>
+								<normal color="#f0f0f0" font="Sans 11"/>
+								<stock type="welcome-label"/>
+							</item>
+						
+							<!-- clock -->
+							<item type="label" id="clock">
+								<pos anchor="e" x="90%" y="30%"/>
+								<normal color="#f0f0f0" font="Sans 11"/>
+								<text>%c</text>
+							</item>
+						
+						</box>
+					</item>
+				
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="c" x="50%" y="10%" width="100%" height="160%"/>
+						<box orientation="vertical" homogeneous="true">
+							<item type="pixmap">
+								<normal file="openslx-logo-main.png"/>
+								<pos anchor="c" x="50%" y="50%" height="box"/>
+							</item>
+						</box>
+					</item>
+					
+				</box>
+			</item>
+			
+			<item type="pixmap">
+				<normal file="main-runner.png"/>
+				<pos anchor="c" x="50%" y="0%" width="100%" height="160"/>
+				<box orientation="horizontal" homogeneous="true">
+					
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="w" x="0%" y="50%" width="100%" height="100%"/>
+						<box orientation="horizontal" homogeneous="true">
+					
+							<item type="pixmap">
+								<normal file="openslx-logo.png"/>
+								<pos anchor="c" x="70" y="50%"/>
+							</item>
+							
+							<item type="rect">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="c" x="50" y="50%" width="100%" height="100%"/>
+								<box orientation="vertical" homogeneous="true">
+								
+									<!-- username-label -->
+									<item type="label" id="pam-prompt">
+										<pos anchor="sw" x="5" y="80%"/>
+										<normal color="#f0f0f0" font="Sans 11"/>
+										<stock type="username-label"/>
+									</item>
+									
+									
+									<!-- username-entry -->
+									<item type="entry" id="user-pw-entry">
+										<normal color="#0f0f0f" font="Sans 11"/>
+										<pos anchor="nw" y="-10%" height="22" width="160"/>
+									</item>
+								
+								</box>
+							</item>
+						
+						</box>
+					</item>
+					
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="100%"/>
+						<box orientation="vertical" homogeneous="true">
+							
+							<item type="rect" id="caps-lock-warning">
+								<normal color="#000000" alpha="0.4"/>
+								<pos anchor="c" x="50%" y="50%" width="100%" height="30"/>
+								<box orientation="vertical" homogeneous="true">
+									
+									<item type="label">
+										<normal color="#ff8b00" font="Sans 11"/>
+										<pos anchor="c" x="50%" y="50%"/>
+										<stock type="caps-lock-warning"/>
+									</item>
+								
+								</box>
+							</item>
+							
+							<item type="pixmap">
+								<normal file="environment.png"/>
+								<pos anchor="c" x="50%" y="50%"/>
+							</item>
+							
+							<item type="rect">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="c" x="50%" y="50%" width="100%" height="40"/>
+								<box orientation="vertical" homogeneous="true">
+									<item type="label" id="pam-error">
+										<normal color="#ff8b00" font="Sans 11"/>
+										<pos anchor="c" x="50%" y="50%"/>
+										<text/>
+									</item>
+								</box>
+							</item>
+							
+						</box>
+					</item>
+					
+					
+					
+					<item type="rect">
+						<normal color="#000000" alpha="0.0"/>
+						<pos anchor="e" x="100%" y="50%" width="100%" height="100%"/>
+						<box orientation="vertical" homogeneous="true">
+						
+							<!-- session-button -->
+							<item type="rect" id="session_button" button="true">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="se" x="80%" y="95%" width="box" height="box"/>
+								<box orientation="horizontal">
+								
+									<item type="label">
+										<normal color="#bbbbbb" font="Sans 11"/>
+										<prelight color="#f0f0f0" font="Sans 11"/>
+										<active color="#ff8b00" font="Sans 11"/>
+										<pos anchor="e" x="100%" y="-24"/>
+										<text>Session</text>
+										<text xml:lang="en">Session</text>
+										<text xml:lang="de">Sitzung</text>
+									</item>
+									
+									<item type="rect" id="session_button" button="true">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="c" x="50%" y="50%" width="10"/>
+									</item>
+									
+									<item type="pixmap" id="session_button" button="true">
+										<normal file="sessions_inactive.png"/>
+										<prelight file="sessions.png"/>
+										<pos anchor="se" x="100%" y="100%"/>
+									</item>
+								
+								</box>
+							</item>
+							
+							<!-- menu-button -->
+							<item type="rect" id="system_button" button="true">
+								<normal color="#000000" alpha="0.0"/>
+								<pos anchor="ne" x="80%" y="5%" width="box" height="box"/>
+								<box orientation="horizontal">
+								
+									<item type="label">
+										<normal color="#bbbbbb" font="Sans 11"/>
+										<prelight color="#f0f0f0" font="Sans 11"/>
+										<active color="#ff8b00" font="Sans 11"/>
+										<pos anchor="e" x="100%" y="24"/>
+										<text>System Menu</text>
+										<text xml:lang="en">System Menu</text>
+										<text xml:lang="de">System Menü</text>
+									</item>
+									
+									<item type="rect" id="session_button" button="true">
+										<normal color="#000000" alpha="0.0"/>
+										<pos anchor="c" x="50%" y="50%" width="10"/>
+									</item>
+									
+									<item type="pixmap" id="system_button" button="true">
+										<normal file="system_inactive.png"/>
+										<prelight file="system.png"/>
+										<pos anchor="ne" x="100%" y="0%"/>
+									</item>
+								
+								</box>
+							</item>
+							
+						</box>
+					</item>
+
+				</box>
+			</item>
+			
+		</box>
+	</item>
+
+</greeter>
diff --git a/os-plugins/plugins/desktop/themes/gdm/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/gdm/openslx/welcome-time-shadowed.png
new file mode 100644
index 00000000..79e872c3
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/gdm/openslx/welcome-time-shadowed.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/color.png b/os-plugins/plugins/desktop/themes/kdm/openslx/color.png
new file mode 100644
index 00000000..7a0feb03
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/color.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/enter.png b/os-plugins/plugins/desktop/themes/kdm/openslx/enter.png
new file mode 100644
index 00000000..b646e851
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/enter.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/enter_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx/enter_inactive.png
new file mode 100644
index 00000000..e12cfb8e
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/enter_inactive.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/environment.png b/os-plugins/plugins/desktop/themes/kdm/openslx/environment.png
new file mode 100644
index 00000000..b9682822
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/environment.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png
new file mode 100644
index 00000000..5b3cf656
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/main-runner.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png
new file mode 100644
index 00000000..f98e6517
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo-main.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png
new file mode 100644
index 00000000..8cfaaf94
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/openslx-logo.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png
new file mode 100644
index 00000000..00d05f29
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png
new file mode 100644
index 00000000..86bbe642
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/sessions_inactive.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/system.png b/os-plugins/plugins/desktop/themes/kdm/openslx/system.png
new file mode 100644
index 00000000..f7b9e71f
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/system.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png
new file mode 100644
index 00000000..c3e1719b
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/system_inactive.png differ
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
new file mode 100644
index 00000000..437f988f
--- /dev/null
+++ b/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+	<!-- main pic, login pic -->
+	<item type="pixmap">
+		<normal file="color.png"/>
+		<pos x="0" y="0" width="100%" height="100%"/>
+		<item type="rect">
+			<normal color="#000000" alpha="0.0"/>
+			<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
+			
+			<item type="pixmap">
+				<normal file="welcome-time-shadowed.png"/>
+				<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+				
+				<!-- Wellcome on ... -->
+				<item type="label">
+					<pos anchor="w" x="5%" y="33%"/>
+					<normal color="#f0f0f0" font="Sans 12"/>
+					<stock type="welcome-label"/>
+				</item>
+				
+				<!-- clock -->
+				<item type="label" id="clock">
+					<normal color="#f0f0f0" font="Sans 12"/>
+					<pos anchor="e" x="95%" y="33%"/>
+					<text>%c</text>
+				</item>
+				
+			</item>
+			
+			<item type="pixmap">
+				<normal file="openslx-logo-main.png"/>
+				<pos anchor="n" x="50%" y="20%" height="70%"/>
+			</item>
+			
+		</item>
+		
+		<item type="pixmap">
+			<normal file="main-runner.png"/>
+			<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
+			
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="w" x="0" y="50%" width="35%" height="100%"/>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="w" x="0" y="50%" width="120" height="100%"/>
+					<item type="pixmap">
+						<normal file="openslx-logo.png"/>
+						<pos anchor="e" x="100%" y="50%"/>
+					</item>
+				</item>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+                                        <pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
+					
+					<!-- username-label -->
+					<item type="label">
+						<pos anchor="e" x="-5" y="40%"/>
+						<normal color="#f0f0f0" font="Sans 11"/>
+						<stock type="username-label"/>
+					</item>
+					
+					<!-- password-label -->
+					<item type="label">
+						<pos anchor="e" x="-5" y="60%"/>
+						<normal color="#f0f0f0" font="Sans 11"/>
+						<stock type="password-label"/>
+					</item>
+					
+				</item>
+				
+				<item type="rect">
+					<normal color="#000000" alpha="0.0"/>
+                                        <pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
+					
+					<!-- username-entry -->
+					<item type="entry" id="user-entry">
+						<pos anchor="w" x="0" y="40%" height="22" width="114"/>
+					</item>
+					
+					<!-- password-entry -->
+					<item type="entry" id="pw-entry">
+						<pos anchor="w" x="0" y="60%" height="22" width="114"/>
+					</item>
+					
+					<item type="pixmap" button="true" id="login_button">
+						<pos anchor="e" x="100%" y="60%" height="22" width="22"/>
+						<normal file="enter_inactive.png"/>
+						<prelight file="enter.png"/>
+					</item>
+					
+				</item>
+				
+			</item>
+			
+			<item type="rect">
+				<normal color="#ff0000" alpha="0.0"/>
+				<pos anchor="c" x="50%" y="50%" width="30%" height="160"/>
+				
+				<!-- capslock-warning -->
+				<item type="pixmap" id="caps-lock-warning">
+					<normal file="error.png"/>
+					<pos anchor="c" x="50%" y="22" width="100%" height="70"/>
+					<item type="rect" id="caps-lock-warning">
+						<normal color="#000000" alpha="0.4"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
+						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
+							<item type="label">
+								<normal color="#ff8b00" font="Sans 11"/>
+								<pos x="50%" anchor="n"/>
+								<stock type="caps-lock-warning"/>
+							</item>
+						</box>
+					</item>
+				</item>
+				
+				<item type="pixmap">
+					<normal file="environment.png"/>
+					<pos anchor="c" x="50%" y="50%" width="186" height="100"/>
+				</item>
+				
+				<!-- Login-Error -->
+				<item type="pixmap" id="pam-error">
+					<normal file="error.png"/>
+					<pos anchor="c" x="50%" y="-22" width="100%" height="70"/>
+					<item type="rect">
+						<normal color="#000000" alpha="0.4"/>
+						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
+						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
+							<item type="label">
+								<normal color="#ff8b00" font="Sans 11"/>
+								<pos anchor="n" x="50%"/>
+								<text>Login failed!</text>
+								<text xml:lang="en">Login failed!</text>
+								<text xml:lang="de">Login fehlgeschlagen!</text>
+							</item>
+						</box>
+					</item>
+				</item>
+				
+			</item>
+			
+			<!-- icons and text on the left -->
+			<item type="rect">
+				<normal color="#000000" alpha="0.0"/>
+				<pos anchor="e" x="100%" y="50%" width="35%" height="100%"/>
+				
+				<!-- session-button -->
+				<item type="rect" id="session_button" button="true">
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="se" x="80%" y="50%" width="160" height="50%"/>
+					
+					<item type="pixmap" id="session_button" button="true">
+						<normal file="sessions_inactive.png"/>
+						<prelight file="sessions.png"/>
+						<pos anchor="se" x="94%" y="-8" width="48" height="48"/>
+					</item>
+					
+					<item type="label">
+						<normal color="#bbbbbb" font="Sans 11"/>
+						<prelight color="#f0f0f0" font="Sans 11"/>
+						<active color="#ff8b00" font="Sans 11"/>
+						<pos anchor="e" x="-70" y="-32"/>
+						<text>Session</text>
+						<text xml:lang="en">Session</text>
+						<text xml:lang="de">Sitzung</text>
+					</item>
+					
+				</item>
+				
+				<!-- menu-button -->
+				<item type="rect" id="system_button" button="true">
+					<show modes="console" type="system"/>
+					<normal color="#000000" alpha="0.0"/>
+					<pos anchor="ne" x="80%" y="50%" width="160" height="50%"/>
+					<item type="pixmap" id="system_button" button="true">
+						<normal file="system_inactive.png"/>
+						<prelight file="system.png"/>
+						<pos anchor="ne" x="94%" y="8" width="48" height="48"/>
+					</item>
+					<item type="label">
+						<normal color="#bbbbbb" font="Sans 11"/>
+						<prelight color="#f0f0f0" font="Sans 11"/>
+						<active color="#ff8b00" font="Sans 11"/>
+						<pos anchor="e" x="-70" y="32"/>
+						<text>System Menu</text>
+						<text xml:lang="en">System Menu</text>
+						<text xml:lang="de">System Menü</text>
+					</item>
+				</item>
+				
+			</item>
+			
+		</item>
+	</item>
+</greeter>
diff --git a/os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png
new file mode 100644
index 00000000..79e872c3
Binary files /dev/null and b/os-plugins/plugins/desktop/themes/kdm/openslx/welcome-time-shadowed.png differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/color.png b/os-plugins/plugins/desktop/themes/openslx/color.png
deleted file mode 100644
index 7a0feb03..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/color.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop
deleted file mode 100755
index cb2fb30c..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/GdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[GdmGreeterTheme]
-Encoding=UTF-8
-Greeter=openslx.xml
-Name=OpenSLX GDM theme
-Description=GDM Port of Daemonic KDM theme for FreeBSD
-Author=MJanc / KDM by aceph <aceph@ventcore.net>
-Copyright=Creative Commons
-Screenshot=screenshot.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
deleted file mode 120000
index 1057c17f..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/color.png
+++ /dev/null
@@ -1 +0,0 @@
-../../color.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png
deleted file mode 100644
index 7ad6783a..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/environment.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png
deleted file mode 120000
index 0fa7562b..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/main-runner.png
+++ /dev/null
@@ -1 +0,0 @@
-../../main-runner.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png
deleted file mode 120000
index 3a924e43..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo-main.png
+++ /dev/null
@@ -1 +0,0 @@
-../../openslx-logo-main.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png
deleted file mode 120000
index 4827aeeb..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx-logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../../openslx-logo.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml
deleted file mode 100755
index 2a1708c3..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/openslx.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
-	<item type="pixmap">
-		<normal file="color.png"/>
-		<pos x="0" y="0" width="100%" height="100%"/>
-		<box orientation="vertical" homogeneous="true">
-			
-			<item type="rect">
-				<normal color="#000000" alpha="0.0"/>
-				<pos anchor="n" x="50%" y="0%" width="100%" height="80%"/>
-				<box orientation="vertical" homogeneous="true">
-				
-					<item type="pixmap">
-						<normal file="welcome-time-shadowed.png"/>
-						<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
-						<box orientation="horizontal" homogeneous="true">
-						
-							<!-- Wellcome on ... -->
-							<item type="label">
-								<pos anchor="w" x="10%" y="30%"/>
-								<normal color="#f0f0f0" font="Sans 11"/>
-								<stock type="welcome-label"/>
-							</item>
-						
-							<!-- clock -->
-							<item type="label" id="clock">
-								<pos anchor="e" x="90%" y="30%"/>
-								<normal color="#f0f0f0" font="Sans 11"/>
-								<text>%c</text>
-							</item>
-						
-						</box>
-					</item>
-				
-					<item type="rect">
-						<normal color="#000000" alpha="0.0"/>
-						<pos anchor="c" x="50%" y="10%" width="100%" height="160%"/>
-						<box orientation="vertical" homogeneous="true">
-							<item type="pixmap">
-								<normal file="openslx-logo-main.png"/>
-								<pos anchor="c" x="50%" y="50%" height="box"/>
-							</item>
-						</box>
-					</item>
-					
-				</box>
-			</item>
-			
-			<item type="pixmap">
-				<normal file="main-runner.png"/>
-				<pos anchor="c" x="50%" y="0%" width="100%" height="160"/>
-				<box orientation="horizontal" homogeneous="true">
-					
-					<item type="rect">
-						<normal color="#000000" alpha="0.0"/>
-						<pos anchor="w" x="0%" y="50%" width="100%" height="100%"/>
-						<box orientation="horizontal" homogeneous="true">
-					
-							<item type="pixmap">
-								<normal file="openslx-logo.png"/>
-								<pos anchor="c" x="70" y="50%"/>
-							</item>
-							
-							<item type="rect">
-								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="c" x="50" y="50%" width="100%" height="100%"/>
-								<box orientation="vertical" homogeneous="true">
-								
-									<!-- username-label -->
-									<item type="label" id="pam-prompt">
-										<pos anchor="sw" x="5" y="80%"/>
-										<normal color="#f0f0f0" font="Sans 11"/>
-										<stock type="username-label"/>
-									</item>
-									
-									
-									<!-- username-entry -->
-									<item type="entry" id="user-pw-entry">
-										<normal color="#0f0f0f" font="Sans 11"/>
-										<pos anchor="nw" y="-10%" height="22" width="160"/>
-									</item>
-								
-								</box>
-							</item>
-						
-						</box>
-					</item>
-					
-					<item type="rect">
-						<normal color="#000000" alpha="0.0"/>
-						<pos anchor="c" x="50%" y="50%" width="100%" height="100%"/>
-						<box orientation="vertical" homogeneous="true">
-							
-							<item type="rect" id="caps-lock-warning">
-								<normal color="#000000" alpha="0.4"/>
-								<pos anchor="c" x="50%" y="50%" width="100%" height="30"/>
-								<box orientation="vertical" homogeneous="true">
-									
-									<item type="label">
-										<normal color="#ff8b00" font="Sans 11"/>
-										<pos anchor="c" x="50%" y="50%"/>
-										<stock type="caps-lock-warning"/>
-									</item>
-								
-								</box>
-							</item>
-							
-							<item type="pixmap">
-								<normal file="environment.png"/>
-								<pos anchor="c" x="50%" y="50%"/>
-							</item>
-							
-							<item type="rect">
-								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="c" x="50%" y="50%" width="100%" height="40"/>
-								<box orientation="vertical" homogeneous="true">
-									<item type="label" id="pam-error">
-										<normal color="#ff8b00" font="Sans 11"/>
-										<pos anchor="c" x="50%" y="50%"/>
-										<text/>
-									</item>
-								</box>
-							</item>
-							
-						</box>
-					</item>
-					
-					
-					
-					<item type="rect">
-						<normal color="#000000" alpha="0.0"/>
-						<pos anchor="e" x="100%" y="50%" width="100%" height="100%"/>
-						<box orientation="vertical" homogeneous="true">
-						
-							<!-- session-button -->
-							<item type="rect" id="session_button" button="true">
-								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="se" x="80%" y="95%" width="box" height="box"/>
-								<box orientation="horizontal">
-								
-									<item type="label">
-										<normal color="#bbbbbb" font="Sans 11"/>
-										<prelight color="#f0f0f0" font="Sans 11"/>
-										<active color="#ff8b00" font="Sans 11"/>
-										<pos anchor="e" x="100%" y="-24"/>
-										<text>Session</text>
-										<text xml:lang="en">Session</text>
-										<text xml:lang="de">Sitzung</text>
-									</item>
-									
-									<item type="rect" id="session_button" button="true">
-										<normal color="#000000" alpha="0.0"/>
-										<pos anchor="c" x="50%" y="50%" width="10"/>
-									</item>
-									
-									<item type="pixmap" id="session_button" button="true">
-										<normal file="sessions_inactive.png"/>
-										<prelight file="sessions.png"/>
-										<pos anchor="se" x="100%" y="100%"/>
-									</item>
-								
-								</box>
-							</item>
-							
-							<!-- menu-button -->
-							<item type="rect" id="system_button" button="true">
-								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="ne" x="80%" y="5%" width="box" height="box"/>
-								<box orientation="horizontal">
-								
-									<item type="label">
-										<normal color="#bbbbbb" font="Sans 11"/>
-										<prelight color="#f0f0f0" font="Sans 11"/>
-										<active color="#ff8b00" font="Sans 11"/>
-										<pos anchor="e" x="100%" y="24"/>
-										<text>System Menu</text>
-										<text xml:lang="en">System Menu</text>
-										<text xml:lang="de">System Menü</text>
-									</item>
-									
-									<item type="rect" id="session_button" button="true">
-										<normal color="#000000" alpha="0.0"/>
-										<pos anchor="c" x="50%" y="50%" width="10"/>
-									</item>
-									
-									<item type="pixmap" id="system_button" button="true">
-										<normal file="system_inactive.png"/>
-										<prelight file="system.png"/>
-										<pos anchor="ne" x="100%" y="0%"/>
-									</item>
-								
-								</box>
-							</item>
-							
-						</box>
-					</item>
-
-				</box>
-			</item>
-			
-		</box>
-	</item>
-
-</greeter>
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
deleted file mode 120000
index 77757de8..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions.png
+++ /dev/null
@@ -1 +0,0 @@
-../../sessions.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png
deleted file mode 120000
index 24f13608..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/sessions_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../../sessions_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png
deleted file mode 120000
index 89c4bca4..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system.png
+++ /dev/null
@@ -1 +0,0 @@
-../../system.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png
deleted file mode 120000
index 03f8e2c4..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/system_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../../system_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png
deleted file mode 120000
index e2f45853..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/gdm/openslx/welcome-time-shadowed.png
+++ /dev/null
@@ -1 +0,0 @@
-../../welcome-time-shadowed.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop b/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop
deleted file mode 100644
index 5c174195..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/GdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[GdmGreeterTheme]
-Encoding=UTF-8
-Greeter=openslx.xml
-Name=OpenSLX KDM theme
-Description=OpenSLX Theme based on Daemonic KDM theme for FreeBSD
-Author=aceph <aceph@ventcore.net> and modified by MJanc
-Copyright=Creative Commons
-Screenshot=screenshot.png
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/color.png b/os-plugins/plugins/desktop/themes/openslx/kdm/color.png
deleted file mode 120000
index f722f460..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/color.png
+++ /dev/null
@@ -1 +0,0 @@
-../color.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png b/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png
deleted file mode 100644
index b646e851..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/kdm/enter.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png b/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png
deleted file mode 100644
index e12cfb8e..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/kdm/enter_inactive.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png b/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png
deleted file mode 100644
index b9682822..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/kdm/environment.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
deleted file mode 120000
index d4e8561a..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/main-runner.png
+++ /dev/null
@@ -1 +0,0 @@
-../main-runner.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png
deleted file mode 120000
index b97fd167..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo-main.png
+++ /dev/null
@@ -1 +0,0 @@
-../openslx-logo-main.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png
deleted file mode 120000
index 2be492e2..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx-logo.png
+++ /dev/null
@@ -1 +0,0 @@
-../openslx-logo.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx.xml b/os-plugins/plugins/desktop/themes/openslx/kdm/openslx.xml
deleted file mode 100644
index 437f988f..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/openslx.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
-	<!-- main pic, login pic -->
-	<item type="pixmap">
-		<normal file="color.png"/>
-		<pos x="0" y="0" width="100%" height="100%"/>
-		<item type="rect">
-			<normal color="#000000" alpha="0.0"/>
-			<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
-			
-			<item type="pixmap">
-				<normal file="welcome-time-shadowed.png"/>
-				<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
-				
-				<!-- Wellcome on ... -->
-				<item type="label">
-					<pos anchor="w" x="5%" y="33%"/>
-					<normal color="#f0f0f0" font="Sans 12"/>
-					<stock type="welcome-label"/>
-				</item>
-				
-				<!-- clock -->
-				<item type="label" id="clock">
-					<normal color="#f0f0f0" font="Sans 12"/>
-					<pos anchor="e" x="95%" y="33%"/>
-					<text>%c</text>
-				</item>
-				
-			</item>
-			
-			<item type="pixmap">
-				<normal file="openslx-logo-main.png"/>
-				<pos anchor="n" x="50%" y="20%" height="70%"/>
-			</item>
-			
-		</item>
-		
-		<item type="pixmap">
-			<normal file="main-runner.png"/>
-			<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
-			
-			<item type="rect">
-				<normal color="#000000" alpha="0.0"/>
-				<pos anchor="w" x="0" y="50%" width="35%" height="100%"/>
-				
-				<item type="rect">
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="w" x="0" y="50%" width="120" height="100%"/>
-					<item type="pixmap">
-						<normal file="openslx-logo.png"/>
-						<pos anchor="e" x="100%" y="50%"/>
-					</item>
-				</item>
-				
-				<item type="rect">
-					<normal color="#000000" alpha="0.0"/>
-                                        <pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
-					
-					<!-- username-label -->
-					<item type="label">
-						<pos anchor="e" x="-5" y="40%"/>
-						<normal color="#f0f0f0" font="Sans 11"/>
-						<stock type="username-label"/>
-					</item>
-					
-					<!-- password-label -->
-					<item type="label">
-						<pos anchor="e" x="-5" y="60%"/>
-						<normal color="#f0f0f0" font="Sans 11"/>
-						<stock type="password-label"/>
-					</item>
-					
-				</item>
-				
-				<item type="rect">
-					<normal color="#000000" alpha="0.0"/>
-                                        <pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
-					
-					<!-- username-entry -->
-					<item type="entry" id="user-entry">
-						<pos anchor="w" x="0" y="40%" height="22" width="114"/>
-					</item>
-					
-					<!-- password-entry -->
-					<item type="entry" id="pw-entry">
-						<pos anchor="w" x="0" y="60%" height="22" width="114"/>
-					</item>
-					
-					<item type="pixmap" button="true" id="login_button">
-						<pos anchor="e" x="100%" y="60%" height="22" width="22"/>
-						<normal file="enter_inactive.png"/>
-						<prelight file="enter.png"/>
-					</item>
-					
-				</item>
-				
-			</item>
-			
-			<item type="rect">
-				<normal color="#ff0000" alpha="0.0"/>
-				<pos anchor="c" x="50%" y="50%" width="30%" height="160"/>
-				
-				<!-- capslock-warning -->
-				<item type="pixmap" id="caps-lock-warning">
-					<normal file="error.png"/>
-					<pos anchor="c" x="50%" y="22" width="100%" height="70"/>
-					<item type="rect" id="caps-lock-warning">
-						<normal color="#000000" alpha="0.4"/>
-						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
-						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
-							<item type="label">
-								<normal color="#ff8b00" font="Sans 11"/>
-								<pos x="50%" anchor="n"/>
-								<stock type="caps-lock-warning"/>
-							</item>
-						</box>
-					</item>
-				</item>
-				
-				<item type="pixmap">
-					<normal file="environment.png"/>
-					<pos anchor="c" x="50%" y="50%" width="186" height="100"/>
-				</item>
-				
-				<!-- Login-Error -->
-				<item type="pixmap" id="pam-error">
-					<normal file="error.png"/>
-					<pos anchor="c" x="50%" y="-22" width="100%" height="70"/>
-					<item type="rect">
-						<normal color="#000000" alpha="0.4"/>
-						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
-						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
-							<item type="label">
-								<normal color="#ff8b00" font="Sans 11"/>
-								<pos anchor="n" x="50%"/>
-								<text>Login failed!</text>
-								<text xml:lang="en">Login failed!</text>
-								<text xml:lang="de">Login fehlgeschlagen!</text>
-							</item>
-						</box>
-					</item>
-				</item>
-				
-			</item>
-			
-			<!-- icons and text on the left -->
-			<item type="rect">
-				<normal color="#000000" alpha="0.0"/>
-				<pos anchor="e" x="100%" y="50%" width="35%" height="100%"/>
-				
-				<!-- session-button -->
-				<item type="rect" id="session_button" button="true">
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="se" x="80%" y="50%" width="160" height="50%"/>
-					
-					<item type="pixmap" id="session_button" button="true">
-						<normal file="sessions_inactive.png"/>
-						<prelight file="sessions.png"/>
-						<pos anchor="se" x="94%" y="-8" width="48" height="48"/>
-					</item>
-					
-					<item type="label">
-						<normal color="#bbbbbb" font="Sans 11"/>
-						<prelight color="#f0f0f0" font="Sans 11"/>
-						<active color="#ff8b00" font="Sans 11"/>
-						<pos anchor="e" x="-70" y="-32"/>
-						<text>Session</text>
-						<text xml:lang="en">Session</text>
-						<text xml:lang="de">Sitzung</text>
-					</item>
-					
-				</item>
-				
-				<!-- menu-button -->
-				<item type="rect" id="system_button" button="true">
-					<show modes="console" type="system"/>
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="ne" x="80%" y="50%" width="160" height="50%"/>
-					<item type="pixmap" id="system_button" button="true">
-						<normal file="system_inactive.png"/>
-						<prelight file="system.png"/>
-						<pos anchor="ne" x="94%" y="8" width="48" height="48"/>
-					</item>
-					<item type="label">
-						<normal color="#bbbbbb" font="Sans 11"/>
-						<prelight color="#f0f0f0" font="Sans 11"/>
-						<active color="#ff8b00" font="Sans 11"/>
-						<pos anchor="e" x="-70" y="32"/>
-						<text>System Menu</text>
-						<text xml:lang="en">System Menu</text>
-						<text xml:lang="de">System Menü</text>
-					</item>
-				</item>
-				
-			</item>
-			
-		</item>
-	</item>
-</greeter>
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png b/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png
deleted file mode 120000
index cec27dfa..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions.png
+++ /dev/null
@@ -1 +0,0 @@
-../sessions.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png b/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png
deleted file mode 120000
index 70eabd7c..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/sessions_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../sessions_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/system.png b/os-plugins/plugins/desktop/themes/openslx/kdm/system.png
deleted file mode 120000
index ad8ab6ee..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/system.png
+++ /dev/null
@@ -1 +0,0 @@
-../system.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png b/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png
deleted file mode 120000
index 0184c19d..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/system_inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-../system_inactive.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png
deleted file mode 120000
index 87596c2c..00000000
--- a/os-plugins/plugins/desktop/themes/openslx/kdm/welcome-time-shadowed.png
+++ /dev/null
@@ -1 +0,0 @@
-../welcome-time-shadowed.png
\ No newline at end of file
diff --git a/os-plugins/plugins/desktop/themes/openslx/main-runner.png b/os-plugins/plugins/desktop/themes/openslx/main-runner.png
deleted file mode 100644
index 5b3cf656..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/main-runner.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png b/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png
deleted file mode 100644
index f98e6517..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/openslx-logo-main.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png b/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png
deleted file mode 100644
index 8cfaaf94..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/openslx-logo.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/sessions.png b/os-plugins/plugins/desktop/themes/openslx/sessions.png
deleted file mode 100644
index 00d05f29..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/sessions.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png b/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png
deleted file mode 100644
index 86bbe642..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/sessions_inactive.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/system.png b/os-plugins/plugins/desktop/themes/openslx/system.png
deleted file mode 100644
index f7b9e71f..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/system.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/system_inactive.png b/os-plugins/plugins/desktop/themes/openslx/system_inactive.png
deleted file mode 100644
index c3e1719b..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/system_inactive.png and /dev/null differ
diff --git a/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png b/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png
deleted file mode 100644
index 79e872c3..00000000
Binary files a/os-plugins/plugins/desktop/themes/openslx/welcome-time-shadowed.png and /dev/null differ
-- 
cgit v1.2.3-55-g7522