Merge branch 'master' of git:openslx-ng/tm-scripts

28 files changed, 196 insertions, 76 deletions

diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
index 3eb13363..17b4ca60 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/debug.conf
@@ -1,2 +1,4 @@
 REQUIRED_BINARIES="	strace
-			ldd"
+			ldd
+			setterm
+"
diff --git a/remote/modules/german/data/etc/X11/xorg.conf.d/90-keytable.conf b/remote/modules/german/data/etc/X11/xorg.conf.d/90-keytable.conf
new file mode 100644
index 00000000..9c8a58fe
--- /dev/null
+++ b/remote/modules/german/data/etc/X11/xorg.conf.d/90-keytable.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier "LocalKeyboard"
+	MatchIsKeyboard "on"
+	Option	"XkbLayout"	"de"
+	Option	"XkbVariant"	"nodeadkeys"
+EndSection
diff --git a/remote/modules/german/data/etc/default/locale b/remote/modules/german/data/etc/default/locale
new file mode 100644
index 00000000..b20033b4
--- /dev/null
+++ b/remote/modules/german/data/etc/default/locale
@@ -0,0 +1 @@
+LANG="de_DE.UTF-8"
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index c72b73be..1b59915a 100644
--- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -6,7 +6,7 @@ StaticServers=:0
 
 [X-*-Greeter]
 UseTheme=true
-Theme=/usr/share/desktop/themes/kdm/uni
+Theme=/usr/share/desktop/themes/kdm/bwlehrpool
 UseBackground=false
 GreetString=OpenSLX Workstation (%h)
 SelectedUsers=
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/KdmGreeterTheme.desktop b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/KdmGreeterTheme.desktop
new file mode 100644
index 00000000..6ebf8249
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/KdmGreeterTheme.desktop
@@ -0,0 +1,7 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=theme.xml
+Name=bwLehrpool KDM theme
+Description=Basic bwLehrpool KDM Theme
+Author=Base by aceph <aceph@ventcore.net>, modified by MJanc, sr
+Copyright=Creative Commons
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg
new file mode 100644
index 00000000..f0d1a539
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool-white.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="149.62437"
+   height="92.827499"
+   id="svg2985"
+   xml:space="preserve"><metadata
+     id="metadata2991"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs2989"><clipPath
+       id="clipPath3001"><path
+         d="M 0,8356.66 0,0 l 4518.7,0 0,8356.66 -4518.7,0 z"
+         id="path3003" /></clipPath></defs><g
+     transform="matrix(1.25,0,0,-1.25,-71.388125,593.675)"
+     id="g2993"><g
+       id="g3763"><path
+         d="m 107.979,438.637 -27.1091,0 0,11.032 21.5941,0 0,10.688 11.032,0 0,-16.204 c 0,-3.047 -2.469,-5.516 -5.517,-5.516"
+         id="path3065"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 122.466,400.678 -10.537,0 0,25.76 c 0.127,2.954 2.557,5.284 5.513,5.284 l 59.368,0 0,-11.033 -54.08,0 -0.264,-20.011"
+         id="path3067"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 104.061,409.795 -11.109,0 -0.109,10.894 -35.7325,0 0,11.033 41.434,0 c 1.4935,0 2.9235,-0.607 3.9645,-1.681 1.038,-1.074 1.597,-2.523 1.549,-4.018 l 0.003,-16.228"
+         id="path3069"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 146.076,438.57 -20.455,0 c -3.046,0 -5.517,2.471 -5.517,5.518 l 0,30.852 11.033,0 0,-25.336 14.939,0 0,-11.034"
+         id="path3071"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></svg>
\ No newline at end of file
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool.svg b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool.svg
new file mode 100644
index 00000000..8b6a2308
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/bwLehrpool.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="564.83734"
+   height="131.315"
+   id="svg2985"
+   xml:space="preserve"><metadata
+     id="metadata2991"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs2989"><clipPath
+       id="clipPath3001"><path
+         d="M 0,8356.66 0,0 l 4518.7,0 0,8356.66 -4518.7,0 z"
+         id="path3003" /></clipPath></defs><g
+     transform="matrix(1.25,0,0,-1.25,0,1044.5825)"
+     id="g2993"><g
+       id="g3598"><path
+         d="m 71.6785,784.102 -38.1996,0 0,15.545 30.4273,0 0,15.061 15.5458,0 0,-22.834 c 0,-4.294 -3.4786,-7.772 -7.7735,-7.772"
+         id="path3009"
+         style="fill:#f9a72b;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 92.0914,730.614 -14.8469,0 0,36.3 c 0.1778,4.161 3.6028,7.444 7.7688,7.444 l 83.6537,0 0,-15.546 -76.2041,0 -0.3715,-28.198"
+         id="path3011"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 66.1566,743.461 -15.6531,0 -0.1539,15.351 -50.3496,0 0,15.546 58.384,0 c 2.1047,0 4.1203,-0.854 5.5867,-2.369 1.4629,-1.513 2.25,-3.554 2.1816,-5.661 l 0.0043,-22.867"
+         id="path3013"
+         style="fill:#f9a72b;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 125.361,784.008 -28.8239,0 c -4.2922,0 -7.7742,3.481 -7.7742,7.775 l 0,43.473 15.5481,0 0,-35.7 21.05,0 0,-15.548"
+         id="path3015"
+         style="fill:#f9a72b;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 153.667,815.973 c -7.762,0 -10.206,-7.619 -10.206,-14.159 0,-6.756 1.94,-14.16 10.206,-14.16 7.691,0 10.207,7.404 10.207,14.16 0,6.756 -2.013,14.159 -10.207,14.159 z m -10.35,-32.2 -7.043,0 c 0.143,2.157 0.359,4.313 0.359,5.749 l 0,46.144 6.828,0 0,-20.699 0.144,0 c 2.084,4.312 6.612,5.965 11.213,5.965 11.212,0 16.244,-9.344 16.244,-19.118 0,-9.273 -4.313,-19.119 -15.022,-19.119 -5.248,0 -9.991,1.797 -12.435,6.827 l -0.144,0 0.144,-0.359 -0.288,-5.39"
+         id="path3017"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 233.448,819.854 -12.722,-36.081 -7.763,0 -8.409,29.684 -0.143,0 -9.344,-29.684 -7.979,0 -11.931,36.081 7.403,0 8.697,-29.038 0.144,0 8.985,29.038 8.84,0 8.122,-28.462 0.144,0 8.984,28.462 6.972,0"
+         id="path3019"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 239.055,783.773 0,51.893 4.6,0 0,-48.012 17.178,0 0,-3.881 -21.778,0"
+         id="path3021"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 286.346,804.473 c 0,8.05 -1.294,12.865 -8.193,12.865 -6.9,0 -8.195,-4.815 -8.195,-12.865 l 16.388,0 z m -16.388,-3.45 0,-2.803 c 0,-5.032 1.367,-11.715 8.195,-11.715 5.39,0 8.049,3.449 7.977,8.337 l 4.529,0 c -0.504,-8.769 -5.247,-11.788 -12.506,-11.788 -6.253,0 -12.507,2.516 -12.507,13.512 l 0,8.914 c 0,10.493 4.386,15.308 12.507,15.308 12.506,0 12.506,-8.984 12.506,-19.765 l -20.701,0"
+         id="path3023"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 298.493,783.773 0,51.893 4.312,0 0,-20.052 0.145,0 c 2.085,3.018 4.887,5.174 8.766,5.174 8.987,0 9.921,-6.683 9.921,-11.428 l 0,-25.587 -4.313,0 0,25.372 c 0,4.241 -1.654,8.193 -6.685,8.193 -3.882,0 -7.834,-2.658 -7.834,-10.78 l 0,-22.785 -4.312,0"
+         id="path3025"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 335.002,815.183 0.145,0 c 1.797,3.449 5.606,5.605 9.99,5.605 l 0,-4.383 c -6.109,0.502 -10.135,-3.163 -10.135,-9.273 l 0,-23.359 -4.312,0 0,36.297 4.312,0 0,-4.887"
+         id="path3027"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 354.842,798.723 c 0,-8.266 3.739,-12.218 7.691,-12.218 5.965,0 6.971,3.952 7.331,4.815 0.719,1.797 0.863,8.338 0.863,10.638 0,7.187 0,15.38 -7.689,15.38 -3.307,0 -8.196,-3.162 -8.196,-12.146 l 0,-6.469 z m -0.143,16.963 0.143,0.072 c 2.3,3.521 5.895,5.03 8.768,5.03 11.356,0 11.43,-9.918 11.43,-14.662 l 0,-8.122 c 0,-9.416 -3.236,-14.95 -12.507,-14.95 -2.66,0 -5.318,1.294 -7.547,4.744 l -0.144,0.073 0,-17.826 -4.312,0 0,50.025 4.169,0 0,-4.384"
+         id="path3029"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 401.2,791.32 c 0.718,1.797 0.863,8.338 0.863,10.638 0,10.708 -1.079,15.38 -8.195,15.38 -7.116,0 -8.195,-4.672 -8.195,-15.38 0,-2.3 0.145,-8.841 0.864,-10.638 0.359,-0.863 1.366,-4.815 7.331,-4.815 5.965,0 6.972,3.952 7.332,4.815 z m -19.839,6.684 0,8.625 c 0,4.6 0.071,14.159 12.507,14.159 12.435,0 12.507,-9.559 12.507,-14.159 l 0,-8.625 c 0,-9.416 -3.235,-14.95 -12.507,-14.95 -9.271,0 -12.507,5.534 -12.507,14.95"
+         id="path3031"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 433.113,791.32 c 0.718,1.797 0.862,8.338 0.862,10.638 0,10.708 -1.079,15.38 -8.194,15.38 -7.116,0 -8.195,-4.672 -8.195,-15.38 0,-2.3 0.145,-8.841 0.863,-10.638 0.359,-0.863 1.366,-4.815 7.332,-4.815 5.965,0 6.972,3.952 7.332,4.815 z m -19.839,6.684 0,8.625 c 0,4.6 0.071,14.159 12.507,14.159 12.434,0 12.506,-9.559 12.506,-14.159 l 0,-8.625 c 0,-9.416 -3.235,-14.95 -12.506,-14.95 -9.273,0 -12.507,5.534 -12.507,14.95"
+         id="path3033"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /><path
+         d="m 447.557,783.773 4.31289,0 0,51.893 -4.31289,0 0,-51.893 z"
+         id="path3035"
+         style="fill:#888687;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></svg>
\ No newline at end of file
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/enter.png
index b646e851..b646e851 100644
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/enter.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/enter_inactive.png
index e12cfb8e..e12cfb8e 100644
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/enter_inactive.png
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/enter_inactive.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png
new file mode 100644
index 00000000..4857b941
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png
new file mode 100644
index 00000000..28f0251f
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/system_inactive.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
index 3b7acf4e..8b05a8d5 100644
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/theme.xml
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE greeter SYSTEM "greeter.dtd">
 <!--
-KDM-Uni-Theme
+KDM-OpenSLX-Theme
 -->
 <greeter id="theme">
     <style font="Sans 11" window-text-color="#f0f0f0" base-color="#f0f0f0" text-color="#000000"/>
 
     <!-- background -->
-	<item type="pixmap" id="background" background="true">
-		<normal file="color.png"/>
+	<item type="rect" id="background" background="true">
+		<normal color="#e3e4e9" alpha="1.0"/>
 		<pos x="0" y="0" width="100%" height="100%"/>
 	</item>
 
     <!-- top / welcome, clock and big logo -->
 	<item type="rect" id="top" background="true">
 		<normal color="#000000" alpha="0.0"/>
-		<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
+		<pos anchor="n" x="50%" y="0" width="100%" height="45%"/>
 		<box orientation="vertical" homogeneous="true">
 
         		<item type="pixmap" background="true">
-        			<normal file="welcome-time-shadowed.png"/>
-        			<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
+        			<normal file="top-bar.png"/>
+        			<pos anchor="n" x="50%" y="0" width="80%" height="50"/>
 	        		<box orientation="horizontal" homogeneous="true">
-                			<!-- Welcome on ... -->
+                        <!-- Welcome on ... -->
 	        			<item type="label" background="true">
-	        				<pos anchor="w" x="10%" y="30%"/>
+	        				<pos anchor="w" x="12%" y="11"/>
 	        				<normal color="#f0f0f0" font="Sans 11"/>
 	        				<stock type="welcome-label"/>
 	        			</item>
-	        			<!-- clock -->
+	                    <!-- clock -->
 	        			<item type="label" id="clock">
-	        				<pos anchor="e" x="90%" y="30%"/>
+	        				<pos anchor="e" x="88%" y="11"/>
 	        				<normal color="#f0f0f0" font="Sans 11"/>
 	        				<text>%c</text>
 	        			</item>
@@ -39,11 +39,11 @@ KDM-Uni-Theme
 
         		<item type="rect" id="logo">
         			<normal color="#000000" alpha="0.0"/>
-        			<pos anchor="c" x="50%" y="10%" width="100%" height="100%"/>
+        			<pos anchor="s" x="50%" y="50%" width="100%" height="100%"/>
         			<box orientation="vertical" homogeneous="true">
-        				<item type="pixmap">
-        					<normal file="uni-logo.png"/>
-        					<pos anchor="c" x="50%" y="50%"/>
+        				<item type="pixmap" background="true">
+        					<normal file="bwLehrpool.svg" scalemode="fit"/>
+        					<pos anchor="c" x="50%" y="50%" height="100%" width="100%"/>
         				</item>
         			</box>
 	        	</item>
@@ -52,8 +52,8 @@ KDM-Uni-Theme
 	</item>
 
     <!-- main part / login, session, menu, ... -->
-	<item type="pixmap" id="main-runner" background="true">
-		<normal file="main-runner.png"/>
+	<item type="rect" id="main-runner" background="true">
+		<normal color="#757575" alpha="1.0"/>
 		<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
 		<box orientation="horizontal" homogeneous="true">
 
@@ -69,15 +69,15 @@ KDM-Uni-Theme
 						<box orientation="horizontal">
 
                             <!-- small logo -->
-							<item type="pixmap" background="true">
-								<normal file="rz-logo.png"/>
-								<pos anchor="w" x="30" y="50%"/>
+							<item type="pixmap">
+								<normal file="bwLehrpool-white.svg" scalemode="fit"/>
+								<pos anchor="w" x="20" y="50%" width="80" height="100%"/>
 							</item>
 
                             <!-- login -->
 							<item type="rect">
 								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="w" x="70" y="50%" width="box" height="box"/>
+								<pos anchor="w" x="40" y="50%" width="box" height="box"/>
 								<box orientation="horizontal" spacing="10">
 
 									<item type="rect">
@@ -99,7 +99,7 @@ KDM-Uni-Theme
 										</box>
 									</item>
 
-                                    <item type="rect">
+									<item type="rect">
 										<normal color="#000000" alpha="0.0"/>
 										<pos anchor="nw" x="0" y="0" width="box" height="box"/>
 										<box homogeneous="true" spacing="10">
@@ -112,13 +112,13 @@ KDM-Uni-Theme
 												<pos anchor="w" x="0" y="50%" height="20" width="200"/>
 											</item>
 										</box>
-                                    </item>
- 
-                                    <item type="pixmap" button="true" id="login_button">
-                                        <pos anchor="sw" x="0" y="-0" height="20" width="20"/>
-                                        <normal file="enter_inactive.png"/>
-                                        <prelight file="enter.png"/>
-                                    </item>
+									</item>
+
+									<item type="pixmap" button="true" id="login_button">
+										<pos anchor="sw" x="0" y="-0" height="20" width="20"/>
+										<normal file="enter_inactive.png"/>
+										<prelight file="enter.png"/>
+									</item>
 
 								</box>
 							</item>
@@ -130,7 +130,7 @@ KDM-Uni-Theme
 					<item type="rect">
 						<normal color="#000000" alpha="0.0"/>
 						<pos anchor="c" x="50%" y="50%" width="90%" height="100%"/>
-                                                <box orientation="vertical">
+                        <box orientation="vertical">
 
                             <!-- Login-Error -->
 							<item type="rect">
@@ -145,13 +145,9 @@ KDM-Uni-Theme
 								</box>
 							</item>
 
-							<item type="pixmap">
-								<normal file="environment.png"/>
-								<pos anchor="c" x="50%" y="50%"/>
-							</item>
  
-                            <!-- capslock-warning -->
-                            <item type="rect" id="caps-lock-warning">
+                                <!-- capslock-warning -->
+                                <item type="rect" id="caps-lock-warning">
 								<normal color="#000000" alpha="0.4"/>
 								<pos anchor="s" x="50%" y="-10" width="100%" height="30"/>
 								<box>
@@ -169,37 +165,14 @@ KDM-Uni-Theme
                     <!-- right part / sessions, menu -->
 					<item type="rect">
 						<normal color="#000000" alpha="0.0"/>
-						<pos anchor="e" x="100%" y="50%" width="100%" height="100%"/>
+						<pos anchor="e" x="100%" y="50%" width="100%" height="50%"/>
 						<box orientation="vertical" homogeneous="true" spacing="10">
 
-							<!-- session-button -->
-							<item type="rect" id="session_button" button="true">
-								<normal color="#000000" alpha="0.0"/>
-								<pos anchor="se" x="-50" y="100%" 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"/>
-										<stock type="session"/>
-									</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="-50" y="0" width="box" height="box"/>
+								<pos anchor="e" x="90%" y="50%" width="box" height="box"/>
 								<box orientation="horizontal">
 									<item type="label">
 										<normal color="#bbbbbb" font="Sans 11"/>
@@ -227,6 +200,15 @@ KDM-Uni-Theme
 			</item>
                       
         </box>
+		<!-- Icon/Logo of Uni -->
+		<item type="pixmap" id="branding_logo" button="false">
+			<normal file="/etc/branding.svg" scalemode="fit"/>
+			<pos anchor="sw" x="1%" y="99%" width="13%" height="13%"/>
+		</item>
+		<!-- Icon/Logo of Base Distro -->
+		<item type="pixmap" id="distro_logo" button="false">
+			<normal file="/etc/distro.png" scalemode="fit"/>
+			<pos anchor="se" x="99%" y="99%" width="13%" height="13%"/>
+		</item>
 	</item>
-
 </greeter>
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png
new file mode 100644
index 00000000..fb63c5cc
--- /dev/null
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
deleted file mode 100644
index 36242be4..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/KdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[KdmGreeterTheme]
-Encoding=UTF-8
-Greeter=theme.xml
-Name=Uni KDM theme
-Description=Uni 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/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
deleted file mode 100644
index c2e998e5..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/color.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
deleted file mode 100644
index b9682822..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/environment.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
deleted file mode 100644
index fde2787d..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/main-runner.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
deleted file mode 100644
index d48b2b63..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/rz-logo.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
deleted file mode 100644
index 00d05f29..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
deleted file mode 100644
index 86bbe642..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/sessions_inactive.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
deleted file mode 100644
index f7b9e71f..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
deleted file mode 100644
index c3e1719b..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/system_inactive.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
deleted file mode 100644
index 45cef30e..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/uni-logo.png
+++ /dev/null
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
deleted file mode 100644
index f9f34c5c..00000000
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/uni/welcome-time-shadowed.png
+++ /dev/null
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build
index f3ce1448..0cd6aaad 100644
--- a/remote/modules/openbox/openbox.build
+++ b/remote/modules/openbox/openbox.build
@@ -21,10 +21,16 @@ post_copy() {
 	# pango-querymodules-64, not pango-querymodules.
 	which pango-querymodules 2>/dev/null 1>&2
 	ERR=$?
-	if [[ "$ERR" -ne 0 ]]; then
-		PANGO_QUERYMODULES_ARCH=pango-querymodules-64
-	else
+	if [[ "$ERR" -eq 0 ]]; then
 		PANGO_QUERYMODULES_ARCH=pango-querymodules
+	else
+		which pango-querymodules-64 2>/dev/null 1>&2
+		ERR=$?
+		if [[ "$ERR" -eq 0 ]]; then
+			PANGO_QUERYMODULES_ARCH=pango-querymodules-64
+		else
+			perror "Could not find either pango-querymodules or pango-querymodules-64!"
+		fi
 	fi
 	$PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules"
 }
diff --git a/remote/modules/vmplayer/data/etc/a.out b/remote/modules/vmplayer/data/etc/a.out
deleted file mode 100644
index e69de29b..00000000
--- a/remote/modules/vmplayer/data/etc/a.out
+++ /dev/null
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index 9f7d69e7..4041f4bd 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -1,3 +1,4 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
 REQUIRED_CONTENT_PACKAGES="
 			xorg-x11
 			xorg-x11-server
@@ -27,6 +28,10 @@ REQUIRED_CONTENT_PACKAGES="
 			libxcb-glx0
 			kdm-branding-openSUSE
 			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
 "
 REQUIRED_LIBRARIES="
 	libI810XvMC
@@ -50,7 +55,7 @@ REQUIRED_BINARIES="	Xorg
 			vmmouse_detect"
 REQUIRED_DIRECTORIES="
 	/usr/lib/udev
-	/usr/lib/xorg
+	/usr/$LIB64/xorg
 	/usr/bin
 	/usr/share/X11
 	/usr/share/fonts
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 4e16996b..d3cddcd9 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -66,7 +66,7 @@ post_copy() {
 	mkdir -p "${TARGET_BUILD_DIR}"/var/log/openslx
 
 	# copy devices from running system
-	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \
+	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,urandom,zero} \
 		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
 
 	# set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin
@@ -115,6 +115,23 @@ post_copy() {
 	else
 		pinfo "Not copying firmware from system, as '${TARGET_BUILD_DIR}/lib/firmware' already exists."
 	fi	
+
+	# Try to fetch distro logo
+	if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
+		local DIST=$(lsb_release -a | grep ^Distributor)
+		DIST="${DIST#*:}"
+		pinfo "Distribution is $DIST"
+		if [ -n "$DIST" ]; then
+			wget -O "$TARGET_BUILD_DIR/etc/distro.png" "http://132.230.8.113/distro_logo.php?distro=$DIST"
+			if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then
+				rm -f "$TARGET_BUILD_DIR/etc/distro.png"
+				pwarning "Could not download distro-logo"
+			fi
+		else
+			pwarning "Could not determine distribution"
+		fi
+	fi
+
 	copy_kernel
 }