diff --git a/archive-imagefiles/lcd4linux/etc/lcd4linux.conf b/archive-imagefiles/lcd4linux/etc/lcd4linux.conf
index a0193de2..d7cc7f7e 100644
--- a/archive-imagefiles/lcd4linux/etc/lcd4linux.conf
+++ b/archive-imagefiles/lcd4linux/etc/lcd4linux.conf
@@ -55,25 +55,25 @@ Display Pearl_d-box2 {
 	backlight	file::readline('/tmp/lcd/brightness', 1)
 }
 
-Display Pearl_standby {
+Display Pearl_xcam {
 	driver		'DPF'
 	port		'usb0'
-	font		'16x30'
+	font		'6x9'
 	size		'320x240'
 	basecolor	'000000'
-	foreground	'ffffff'
-	background	'00000000'
-	backlight	file::readline('/tmp/lcd/brightness_standby', 1)
+	foreground	'e0e0e0'
+	backlight	file::readline('/tmp/lcd/brightness', 1)
 }
 
-Display Pearl_doscam {
+Display Pearl_standby {
 	driver		'DPF'
 	port		'usb0'
-	font		'6x9'
+	font		'16x30'
 	size		'320x240'
 	basecolor	'000000'
-	foreground	'f5f5f5'
-	backlight	file::readline('/tmp/lcd/brightness', 1)
+	foreground	'ffffff'
+	background	'00000000'
+	backlight	file::readline('/tmp/lcd/brightness_standby', 1)
 }
 
 # --- general widgets (partly postfixed with _layout) ----------------------- #
@@ -363,6 +363,18 @@ Widget Pearl_DOSCAM {
 	class		'Image'
 	file		ICONS . 'background/' . file::readline('/tmp/lcd/layout', 1) . '.png'
 	update		0
+	reload		1
+}
+
+Widget RES320x240 {
+	class		'Truetype'
+	font		file::readline('/tmp/lcd/font', 1)
+	fcolor		'585858'
+	width		120
+	height		20
+	align		'R'
+	expression	file::readline('/usr/share/lcd/icons/spf.txt', 11)
+	update		0
 }
 
 # --- the clocks for standby-mode ------------------------------------------- #
@@ -427,36 +439,30 @@ Widget Pearl_MIN_A {
 
 # --- the weather ----------------------------------------------------------- #
 
-Widget EXEC_WEATHER-SCRIPT {
-	class		'Text'
-	expression	exec('/share/lcd/scripts/weather', 900000) # 15 minutes
-	width		0
-}
-
 Widget ICON_WEATHER {
 	class		'Image'
-	file		file::exist(FWEATHER) == 0 ? ICONS . 'weather/weather_off.png' : ICONS . 'weather/weather_on.png'
+	file		file::exist(FWEATHER) == 0 ? ICONS . 'mode/weather_off.png' : ICONS . 'mode/weather_on.png'
 	update		10000
 	reload		1
 }
 
 Widget WEATHERICON_CURRENT {
 	class		'image'
-	file		file::exist(FWEATHER) == 0 ? ICONS . 'weather/0000.png' : ICONS . 'weather/' . file::readline('/tmp/lcd/weathericons', 1)
+	file		file::exist(FWEATHER) == 0 ? ICONS . 'blank.png' : file::readline('/tmp/lcd/weather_icon', 1)
 	update		10000
 	reload		1
 }
 
 Widget WEATHERICON_LATER {
 	class		'image'
-	file		file::exist(FWEATHER) == 0 ? ICONS . 'weather/0000.png' : ICONS . 'weather/' . file::readline('/tmp/lcd/weathericons', strftime('%H', time()) < 16 ? 2 : 3)
+	file		file::exist(FWEATHER) == 0 ? ICONS . 'blank.png' : file::readline('/tmp/lcd/weather_icon', strftime('%H', time()) < 16 ? 2 : 3)
 	update		10000
 	reload		1
 }
 
 Widget TEMPERATURE_CURRENT {
 	class		'Text'
-	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/temperatures', 1)
+	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', 1)
 	align		'L'
 	width		3
 	update		10000
@@ -464,282 +470,257 @@ Widget TEMPERATURE_CURRENT {
 
 Widget TEMPERATURE_LATER {
 	class		'Text'
-	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/temperatures', strftime('%H', time()) < 16 ? 2 : 3)
+	expression	file::exist(FWEATHER) == 0 ? '' : file::readline('/tmp/lcd/weather_temp', strftime('%H', time()) < 16 ? 2 : 3)
 	align		'R'
 	width		3
 	update		10000
 }
 
-# Doscam --------------------------------------------------------------------------- #
+# --- OS/N/DOScam ----------------------------------------------------------- #
 
-Widget DOSCamLINE01 {
+Widget XCAMLINE01 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 1)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 1) : 'Noob! :)'
 	update		10000
-    foreground	'b0b0b0'
+	foreground	'f5f5f5'
 }
 
-Widget DOSCamLINE02 {
+Widget XCAMLINE02 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 2)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 2) : 'Noob! :)'
 	update		10000
-    foreground	'b0b0b0'
+	foreground	'f5f5f5'
 }
 
-Widget DOSCamLINE03 {
+Widget XCAMLINE03 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 3)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 3) : 'Noob! :)'
 	update		10000
-    foreground	'b0b0b0'
+	foreground	'f5f5f5'
 }
 
-Widget DOSCamLINE04 {
+Widget XCAMLINE04 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 4)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 4) : 'Noob! :)'
 	update		10000
-    foreground	'b0b0b0'
+	foreground	'f5f5f5'
 }
 
-Widget DOSCamLINE05 {
+Widget XCAMLINE05 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 5)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 5) : 'Noob! :)'
 	update		10000
-    foreground	'b0b0b0'
+	foreground	'f5f5f5'
 }
 
-Widget DOSCamLINE06 {
+Widget XCAMLINE06 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 6)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 6) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE07 {
+Widget XCAMLINE07 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 7)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 7) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE08 {
+Widget XCAMLINE08 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 8)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 8) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE09 {
+Widget XCAMLINE09 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 9)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 9) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE10 {
+Widget XCAMLINE10 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 10)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 10) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE11 {
+Widget XCAMLINE11 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 11
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 11) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE12 {
+Widget XCAMLINE12 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 12)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 12) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE13 {
+Widget XCAMLINE13 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 13)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 13) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE14 {
+Widget XCAMLINE14 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 14)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 14) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE15 {
+Widget XCAMLINE15 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 15)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 15) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE16 {
+Widget XCAMLINE16 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 16)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 16) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE17 {
+Widget XCAMLINE17 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 17)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 17) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE18 {
+Widget XCAMLINE18 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 18)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 18) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE19 {
+Widget XCAMLINE19 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 19)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 19) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE20 {
+Widget XCAMLINE20 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 20)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 20) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE21 {
+Widget XCAMLINE21 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 21)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 21) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE22 {
+Widget XCAMLINE22 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 22)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 22) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE23 {
+Widget XCAMLINE23 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 23)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 23) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE24 {
+Widget XCAMLINE24 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 24)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 24) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE25 {
+Widget XCAMLINE25 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 25)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 25) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE26 {
+Widget XCAMLINE26 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 26)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 26) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE27 {
+Widget XCAMLINE27 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 27)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 27) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE28 {
+Widget XCAMLINE28 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 28)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 28) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE29 {
+Widget XCAMLINE29 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 29)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 29) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
-Widget DOSCamLINE30 {
+Widget XCAMLINE30 {
 	class		'Text'
 	width		53
 	align		'L'
-	expression	file::readline('/tmp/.doscam/doscam.lcd', 30)
+	expression	file::exist('/var/etc/.lcd-xcam') == 1 ? file::readline(file::readline('/var/etc/.lcd-xcam', 1), 30) : 'Noob! :)'
 	update		10000
-    foreground	'787878'
 }
 
 # --------------------------------------------------------------------------- #
@@ -754,16 +735,13 @@ Layout Pearl_standard {
 			col02	'Pearl_TIME'
 		}
 	}
-
 	layer 1 {
 		x008.y073	'Pearl_ICON_ECM'
 		x008.y217	'Pearl_ICON_TIMER'
 		x008.y258	'Pearl_ICON_REC'
 		x008.y289	'Pearl_ICON_TS'
-
 		x021.y001	'Pearl_LOGO'
 	}
-
 	layer 2 {
 		x001.y001	'Pearl_BACKGROUND'
 	}
@@ -779,16 +757,13 @@ Layout Pearl_radio {
 			col02	'Pearl_TIME'
 		}
 	}
-
 	layer 1 {
 		x008.y073	'Pearl_ICON_ECM'
 		x008.y217	'Pearl_ICON_TIMER'
 		x008.y258	'Pearl_ICON_REC'
 		x008.y289	'Pearl_ICON_TS'
-
 		x021.y001	'Pearl_LOGO'
 	}
-
 	layer 2 {
 		x001.y001	'Pearl_BACKGROUND'
 	}
@@ -800,16 +775,13 @@ Layout Pearl_large {
 		row04.col01	'Pearl_EVENT_large'
 		row05.col02	'Pearl_PROGRESS_large'
 	}
-
 	layer 1 {
 		x008.y073	'Pearl_ICON_ECM'
 		x008.y217	'Pearl_ICON_TIMER'
 		x008.y258	'Pearl_ICON_REC'
 		x008.y289	'Pearl_ICON_TS'
-
 		x044.y001	'Pearl_LOGO'
 	}
-
 	layer 2 {
 		x001.y001	'Pearl_BACKGROUND'
 	}
@@ -830,16 +802,13 @@ Layout Pearl_small {
 			col27	'Pearl_TIME'
 		}
 	}
-
 	layer 1 {
 		x008.y073	'Pearl_ICON_ECM'
 		x008.y217	'Pearl_ICON_TIMER'
 		x008.y258	'Pearl_ICON_REC'
 		x008.y289	'Pearl_ICON_TS'
-
 		x021.y001	'Pearl_LOGO'
 	}
-
 	layer 2 {
 		x001.y001	'Pearl_BACKGROUND'
 	}
@@ -855,88 +824,78 @@ Layout Pearl_d-box2 {
 			col15	'Pearl_TIME_d-box2'
 		}
 	}
-
 	layer 1 {
 		x045.y073	'Pearl_ICON_ECM_d-box2'
 		x045.y217	'Pearl_ICON_TIMER_d-box2'
 		x045.y258	'Pearl_ICON_REC_d-box2'
 		x045.y289	'Pearl_ICON_TS_d-box2'
-
 		x060.y001	'Pearl_LOGO'
 	}
-
 	layer 2 {
 		x001.y001	'Pearl_BACKGROUND'
 	}
 }
 
+Layout Pearl_xcam {
+	layer 0 {
+		row01.col01	'XCAMLINE02'
+		row02.col01	'XCAMLINE03'
+		row03.col01	'XCAMLINE06'
+		row04.col01	'XCAMLINE07'
+		row05.col01	'XCAMLINE08'
+		row06.col01	'XCAMLINE09'
+		row07.col01	'XCAMLINE10'
+		row08.col01	'XCAMLINE11'
+		row09.col01	'XCAMLINE12'
+		row10.col01	'XCAMLINE13'
+		row11.col01	'XCAMLINE14'
+		row12.col01	'XCAMLINE15'
+		row13.col01	'XCAMLINE16'
+		row14.col01	'XCAMLINE17'
+		row15.col01	'XCAMLINE18'
+		row16.col01	'XCAMLINE19'
+		row17.col01	'XCAMLINE20'
+		row18.col01	'XCAMLINE21'
+		row19.col01	'XCAMLINE22'
+		row20.col01	'XCAMLINE23'
+		row21.col01	'XCAMLINE24'
+		row22.col01	'XCAMLINE25'
+		row23.col01	'XCAMLINE26'
+		row24.col01	'XCAMLINE27'
+		row25.col01	'XCAMLINE28'
+	}
+	layer 1 {
+		x001.y001	'Pearl_DOSCAM'
+	}
+}
+
 Layout Pearl_standby {
 	layer 0 {
 		x020.y085	'Pearl_MIN_A'
-
 		X034.Y025	'Pearl_HOUR1_'
 		X034.Y085	'Pearl_HOUR_1'
 		X034.Y145	'Pearl_DP'
 		X034.Y175	'Pearl_MIN1_'
 		X034.Y235	'Pearl_MIN_1'
-
-		row01.col1	'EXEC_WEATHER-SCRIPT'
 		x225.y132	'ICON_WEATHER'
 		X168.Y017	'WEATHERICON_CURRENT'
 		X168.Y241	'WEATHERICON_LATER'
 		row07.col07	'TEMPERATURE_CURRENT'
 		row07.col12	'TEMPERATURE_LATER'
 	}
-
 	layer 1 {
 		x020.y085	'Pearl_HOUR_A'
-
 		x008.y073	'Pearl_ICON_ECM'
 		x008.y217	'Pearl_ICON_TIMER'
 		x008.y258	'Pearl_ICON_REC'
 		x008.y289	'Pearl_ICON_TS'
 	}
-
 	layer 2 {
 		x020.y000	'Pearl_DIAL_A'
-
 		x001.y001	'Pearl_BACKGROUND'
 	}
 }
 
-Layout Pearl_doscam {
-	layer 0 {
-		row01.col01	'DOSCamLINE02'
-		row02.col01	'DOSCamLINE03'
-		row03.col01	'DOSCamLINE06'
-		row04.col01	'DOSCamLINE07'
-		row05.col01	'DOSCamLINE08'
-		row06.col01	'DOSCamLINE09'
-		row07.col01	'DOSCamLINE10'
-		row08.col01	'DOSCamLINE11'
-		row09.col01	'DOSCamLINE12'
-		row10.col01	'DOSCamLINE13'
-		row11.col01	'DOSCamLINE14'
-		row12.col01	'DOSCamLINE15'
-		row13.col01	'DOSCamLINE16'
-		row14.col01	'DOSCamLINE17'
-		row15.col01	'DOSCamLINE18'
-		row16.col01	'DOSCamLINE19'
-		row17.col01	'DOSCamLINE20'
-		row18.col01	'DOSCamLINE21'
-		row19.col01	'DOSCamLINE22'
-		row20.col01	'DOSCamLINE23'
-		row21.col01	'DOSCamLINE24'
-		row22.col01	'DOSCamLINE25'
-		row23.col01	'DOSCamLINE26'
-		row24.col01	'DOSCamLINE27'
-		row25.col01	'DOSCamLINE28'
-	}
-	layer 1 {
-		x001.y001	'Pearl_DOSCAM'
-	}
-}
-
 # --- Samsung SPF-Auto --------------------------------------------- #
 
 Display Samsung800x600_standard {
@@ -951,71 +910,71 @@ Display Samsung800x600_standard {
 	orientation	1
 }
 
-Display Samsung800x600_doscam {
+Display Samsung800x480_standard {
    	driver		'SamsungSPF'
 	model		'SPF-Auto'
    	port		'usb0'
-	font		'15x24'
-   	size		'800x600'
+	font		'20x40'
+   	size		'800x480'
 	basecolor	'dddddd'
 	foreground	'ffffff'
 	background	'00000000'
 	orientation	1
 }
 
-Display Samsung800x480_standard {
+Display Samsung1024x600_standard {
    	driver		'SamsungSPF'
 	model		'SPF-Auto'
    	port		'usb0'
 	font		'20x40'
-   	size		'800x480'
+   	size		'1024x600'
 	basecolor	'dddddd'
 	foreground	'ffffff'
 	background	'00000000'
 	orientation	1
 }
 
-Display Samsung800x480_doscam {
-   	driver		'SamsungSPF'
+Display Samsung800x600_radio {
+	driver		'SamsungSPF'
 	model		'SPF-Auto'
-   	port		'usb0'
-	font		'15x19'
-   	size		'800x480'
+	port		'usb0'
+	font		'20x40'
+	size		'800x600'
 	basecolor	'dddddd'
 	foreground	'ffffff'
 	background	'00000000'
 	orientation	1
 }
 
-Display Samsung1024x600_standard {
-   	driver		'SamsungSPF'
+Display Samsung800x480_radio {
+	driver		'SamsungSPF'
 	model		'SPF-Auto'
-   	port		'usb0'
+	port		'usb0'
 	font		'20x40'
-   	size		'1024x600'
+	size		'800x480'
 	basecolor	'dddddd'
 	foreground	'ffffff'
 	background	'00000000'
 	orientation	1
 }
 
-Display Samsung1024x600_doscam {
-   	driver		'SamsungSPF'
+Display Samsung1024x600_radio {
+	driver		'SamsungSPF'
 	model		'SPF-Auto'
-   	port		'usb0'
-	font		'19x24'
-   	size		'1024x600'
+	port		'usb0'
+	font		'20x40'
+	size		'1024x600'
 	basecolor	'dddddd'
 	foreground	'ffffff'
 	background	'00000000'
 	orientation	1
 }
 
-Display Samsung800x600_radio {
+Display Samsung800x600_xcam {
 	driver		'SamsungSPF'
 	model		'SPF-Auto'
 	port		'usb0'
-	font		'20x40'
+	font		'15x24'
 	size		'800x600'
 	basecolor	'dddddd'
 	foreground	'ffffff'
@@ -1023,11 +982,11 @@ Display Samsung800x600_radio {
 	orientation	1
 }
 
-Display Samsung800x480_radio {
+Display Samsung800x480_xcam {
 	driver		'SamsungSPF'
 	model		'SPF-Auto'
 	port		'usb0'
-	font		'20x40'
+	font		'15x19'
 	size		'800x480'
 	basecolor	'dddddd'
 	foreground	'ffffff'
@@ -1035,11 +994,11 @@ Display Samsung800x480_radio {
 	orientation	1
 }
 
-Display Samsung1024x600_radio {
+Display Samsung1024x600_xcam {
 	driver		'SamsungSPF'
 	model		'SPF-Auto'
 	port		'usb0'
-	font		'20x40'
+	font		'19x24'
 	size		'1024x600'
 	basecolor	'dddddd'
 	foreground	'ffffff'
@@ -1047,6 +1006,7 @@ Display Samsung1024x600_radio {
 	orientation	1
 }
 
+
 Display Samsung800x600_standby {
 	driver		'SamsungSPF'
 	model		'SPF-Auto'
@@ -1085,34 +1045,6 @@ Display Samsung1024x600_standby {
 
 # 800x600 ----------------------------------------------------#
 
-Widget S_STB {
-	class		'Image'
-	file		ICONS . 'background/800x600/' . file::readline('/tmp/lcd/layout', 1) . '.png'
-	update		0
-	reload		1
-}
-
-Widget S_BG {
-	class		'Image'
-	file		ICONS . 'background/800x600/' . file::readline('/tmp/lcd/layout', 1) . '.png'
-	update		0
-	reload		1
-}
-
-Widget S_BG1 {
-	class		'Image'
-	file		ICONS . 'background/800x600/' . file::readline('/tmp/lcd/brightness', 1) . '.png'
-	update		3000
-	reload		1
-}
-
-Widget S_STB1 {
-	class		'Image'
-	file		ICONS . 'background/800x600/' . file::readline('/tmp/lcd/brightness_standby', 1) . '.png'
-	update		5000
-	reload		1
-}
-
 Widget S800x600_STB {
 	class		'Image'
 	file		ICONS . 'background/800x600/' . file::readline('/tmp/lcd/layout', 1) . '.png'
@@ -1238,7 +1170,7 @@ Widget S_TUNER {
 	file		SYSICONS . 'tuner_' . file::readline('/tmp/lcd/tuner', 1) .'.png'
 	update		4000
 	reload		1
-	inverted	0
+	align		'R'
 	scale		200
 }
 
@@ -1275,7 +1207,9 @@ Widget S_LOGO {
 	file        file::readline('/tmp/lcd/logo', 1)
 	update		3000
 	reload		1
-	center		400
+	center		108
+	width		780
+	height		108
 	scale		270
 }
 
@@ -1284,7 +1218,9 @@ Widget S_LOGO1 {
 	file		file::readline('/tmp/lcd/logo', 1)
 	update		3000
 	reload		1
-	center		512
+	center		108
+	width		1004
+	height		108
 	scale		270
 }
 
@@ -1297,7 +1233,7 @@ Widget S_TTF-CHANNEL {
 	reload		1
 	width		780
 	height		70
-	center		400
+	align		'C'
 }
 
 Widget S_TTF-CHANNEL1 {
@@ -1307,9 +1243,9 @@ Widget S_TTF-CHANNEL1 {
 	fcolor		'58585800'
 	update		3000
 	reload		1
-	width		950
+	width		1004
 	height		90
-	center		512
+	align		'C'
 }
 
 Widget S_START {
@@ -1340,7 +1276,7 @@ Widget S_END {
 
 Widget S_TTF-EPG-NOW {
 	class		'Truetype'
-	expression	file::readline('/tmp/lcd/event', 1)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : file::readline('/tmp/lcd/event', 1)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'fd6d1300'
 	update		3000
@@ -1354,7 +1290,7 @@ Widget S_TTF-EPG-NOW {
 
 Widget S_TTF-EPG-NOW1 {
 	class		'Truetype'
-	expression	file::readline('/tmp/lcd/event', 1)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? file::readline('/tmp/lcd/menu', 1) : file::readline('/tmp/lcd/event', 1)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'58585800'
 	update		3000
@@ -1366,7 +1302,7 @@ Widget S_TTF-EPG-NOW1 {
 
 Widget S_TTF-EPG-NEXT {
 	class		'Truetype'
-	expression	file::readline('/tmp/lcd/event', 2)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/event', 2)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'58585800'
 	update		3000
@@ -1380,7 +1316,7 @@ Widget S_TTF-EPG-NEXT {
 
 Widget S_TTF-EPG-NEXT1 {
 	class		'Truetype'
-	expression	file::readline('/tmp/lcd/event', 2)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/event', 2)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'58585800'
 	update		3000
@@ -1392,7 +1328,7 @@ Widget S_TTF-EPG-NEXT1 {
 
 Widget S_DURATION {
 	class		'Truetype'
-	expression	file::readline('/tmp/lcd/duration', 1)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 1)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'fd6d1300'
 	update		3000
@@ -1406,7 +1342,7 @@ Widget S_DURATION {
 
 Widget S_DURATION1 {
 	class		'Truetype'
-	expression	file::readline('/tmp/lcd/duration', 1)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/duration', 1)
 	font		file::readline('/tmp/lcd/font', 1)
 	fcolor		'fd6d1300'
 	update		3000
@@ -1418,7 +1354,7 @@ Widget S_DURATION1 {
 
 Widget S_EPGBAR {
 	class		'Bar'
-	expression	file::readline('/tmp/lcd/progress', 1)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/progress', 1)
 	min		0
 	max		100
 	length      36
@@ -1429,7 +1365,7 @@ Widget S_EPGBAR {
 
 Widget S_EPGBAR2 {
 	class		'Bar'
-	expression	file::readline('/tmp/lcd/progress', 1)
+	expression	file::exist('/tmp/lcd/menu') == 1 ? '' : file::readline('/tmp/lcd/progress', 1)
 	min		0
 	max		100
 	length		46
@@ -1495,11 +1431,11 @@ Widget RES1024x600 {
 	update		0
 }
 
-# --- the digital clock schwarz----------------------------------------------------- #
+# --- the digital clock ----------------------------------------------------- #
 
 Widget S_HOUR1_ {
 	class		'image'
-	file		ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
+	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		70
@@ -1507,7 +1443,7 @@ Widget S_HOUR1_ {
 
 Widget S_HOUR_1 {
 	class		'image'
-	file		ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%H', time()), 1) . '.png'
+	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		70
@@ -1515,14 +1451,14 @@ Widget S_HOUR_1 {
 
 Widget S_DP {
 	class		'Image'
-	file		ICONS . 'clock/digital_schwarz_129px/dp.png'
+	file		ICONS . 'clock/digital_weiss_129px/dp.png'
 	update		0
 	scale		70
 }
 
 Widget S_MIN1_ {
 	class		'image'
-	file		ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
+	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		70
@@ -1530,7 +1466,7 @@ Widget S_MIN1_ {
 
 Widget S_MIN_1 {
 	class		'image'
-	file		ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%M', time()), 1) . '.png'
+	file		ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		70
@@ -1538,7 +1474,7 @@ Widget S_MIN_1 {
 
 Widget S_STANDBY_HOUR1_ {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1546,7 +1482,7 @@ Widget S_STANDBY_HOUR1_ {
 
 Widget S_STANDBY_HOUR_1 {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%H', time()), 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%H', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1554,14 +1490,14 @@ Widget S_STANDBY_HOUR_1 {
 
 Widget S_STANDBY_DP {
 	class		'Image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_schwarz_129px/dp.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/dp.png'
 	update		0
 	scale		130
 }
 
 Widget S_STANDBY_MIN1_ {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 0, 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
@@ -1569,13 +1505,12 @@ Widget S_STANDBY_MIN1_ {
 
 Widget S_STANDBY_MIN_1 {
 	class		'image'
-	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_schwarz_129px/' . substr(strftime('%M', time()), 1) . '.png'
+	file		file::exist(FCLOCK) == 1 ? ICONS . 'blank.png' : ICONS . 'clock/digital_weiss_129px/' . substr(strftime('%M', time()), 1) . '.png'
 	update		10000
 	reload		1
 	scale		130
 }
 
-
 # --- Tag Datum ----------------------------------------------------- #
 
 Widget TAGDATUM-TTF {
@@ -1608,370 +1543,376 @@ expression	(strftime('%u', time()) == 1 ? 'Montag' : (strftime('%u', time()) ==
 
 Layout Samsung800x600_standard {
 	Layer 0 {
-		X1.Y1 'S800x600_BG1'
+		X1.Y1		'S800x600_BG1'
 	}
 	Layer 1 {
-		X17.Y220 'S_TIMER'
-		X17.Y360 'S_REC'
-		X17.Y470 'S_TS'
-		X17.Y560 'S_ECM'
-		X70.Y10  'S_LOGO'
-		X260.Y20  'S_START'
-		X260.Y165  'S_TTF-EPG-NOW'
-		X320.Y165  'S_TTF-EPG-NEXT'
-		X320.Y20   'S_END'
-		X480.Y125 'S_HOUR1_'
-		X480.Y190 'S_HOUR_1'
-		X480.Y254 'S_DP'
-		X480.Y286 'S_MIN1_'
-		X480.Y351 'S_MIN_1'
-		X520.Y610 'S_DURATION'
-		X580.Y5 'HST'
-		X580.Y700 'RES800x600'
+		X17.Y220	'S_TIMER'
+		X17.Y360	'S_REC'
+		X17.Y470	'S_TS'
+		X17.Y560	'S_ECM'
+		X70.Y10		'S_LOGO'
+		X260.Y20	'S_START'
+		X260.Y165	'S_TTF-EPG-NOW'
+		X320.Y165	'S_TTF-EPG-NEXT'
+		X320.Y20	'S_END'
+		X480.Y125	'S_HOUR1_'
+		X480.Y190	'S_HOUR_1'
+		X480.Y254	'S_DP'
+		X480.Y286	'S_MIN1_'
+		X480.Y351	'S_MIN_1'
+		X520.Y610	'S_DURATION'
+		X580.Y5		'HST'
+		X580.Y700	'RES800x600'
 	}
 	Layer 2 {
-		X70.Y10  'S_TTF-CHANNEL'
-		Row11.Col03 'S_EPGBAR'
+		X70.Y10		'S_TTF-CHANNEL'
+		Row11.Col03	'S_EPGBAR'
 	}
 	Layer 3 {
-		X1.Y1 'S800x600_BG'
+		X1.Y1		'S800x600_BG'
 	}
 }
 
 Layout Samsung800x480_standard {
 	Layer 0 {
-		X1.Y1 'S800x480_BG1'
+		X1.Y1		'S800x480_BG1'
 	}
 	Layer 1 {
-		X10.Y220 'S_TIMER'
-		X10.Y360 'S_REC'
-		X10.Y470 'S_TS'
-		X10.Y560 'S_ECM'
-		X40.Y10  'S_LOGO'
-		X205.Y20  'S_START'
-		X205.Y165 'S_TTF-EPG-NOW'
-		X260.Y165  'S_TTF-EPG-NEXT'
-		X260.Y20   'S_END'
-		X380.Y125 'S_HOUR1_'
-		X380.Y190 'S_HOUR_1'
-		X380.Y255 'S_DP'
-		X380.Y288 'S_MIN1_'
-		X380.Y353 'S_MIN_1'
-		X410.Y630 'S_DURATION'
-		X460.Y5 'HST'
-		X460.Y700 'RES800x480'
+		X10.Y220	'S_TIMER'
+		X10.Y360	'S_REC'
+		X10.Y470	'S_TS'
+		X10.Y560	'S_ECM'
+		X40.Y10		'S_LOGO'
+		X205.Y20	'S_START'
+		X205.Y165	'S_TTF-EPG-NOW'
+		X260.Y165	'S_TTF-EPG-NEXT'
+		X260.Y20	'S_END'
+		X380.Y125	'S_HOUR1_'
+		X380.Y190	'S_HOUR_1'
+		X380.Y255	'S_DP'
+		X380.Y288	'S_MIN1_'
+		X380.Y353	'S_MIN_1'
+		X410.Y630	'S_DURATION'
+		X460.Y5		'HST'
+		X460.Y700	'RES800x480'
 	}
 	Layer 2 {
-		X60.Y10   'S_TTF-CHANNEL'
-		Row09.Col03 'S_EPGBAR'
+		X60.Y10		'S_TTF-CHANNEL'
+		Row09.Col03	'S_EPGBAR'
 	}
 	Layer 3 {
-		X1.Y1 'S800x480_BG'
+		X1.Y1		'S800x480_BG'
 	}
 }
 
 Layout Samsung1024x600_standard {
 	Layer 0 {
-		X1.Y1 'S1024x600_BG1'
+		X1.Y1		'S1024x600_BG1'
 	}
 	Layer 1 {
-		X13.Y220 'S_TIMER'
-		X13.Y360 'S_REC'
-		X13.Y470 'S_TS'
-		X13.Y560 'S_ECM'
-		X60.Y10  'S_LOGO1'
-		X260.Y20   'S_START'
-		X260.Y190  'S_TTF-EPG-NOW1'
-		X320.Y190  'S_TTF-EPG-NEXT1'
-		X320.Y20   'S_END'
-		X480.Y130 'S_HOUR1_'
-		X480.Y195 'S_HOUR_1'
-		X480.Y260 'S_DP'
-		X480.Y293 'S_MIN1_'
-		X480.Y358 'S_MIN_1'
-		X520.Y830 'S_DURATION'
-		X580.Y5 'HST'
-		X580.Y924 'RES1024x600'
+		X13.Y220	'S_TIMER'
+		X13.Y360	'S_REC'
+		X13.Y470	'S_TS'
+		X13.Y560	'S_ECM'
+		X60.Y10		'S_LOGO1'
+		X260.Y20	'S_START'
+		X260.Y190	'S_TTF-EPG-NOW1'
+		X320.Y190	'S_TTF-EPG-NEXT1'
+		X320.Y20	'S_END'
+		X480.Y130	'S_HOUR1_'
+		X480.Y195	'S_HOUR_1'
+		X480.Y260	'S_DP'
+		X480.Y293	'S_MIN1_'
+		X480.Y358	'S_MIN_1'
+		X520.Y830	'S_DURATION'
+		X580.Y5		'HST'
+		X580.Y924	'RES1024x600'
 	}
 	Layer 2 {
-		X60.Y10   'S_TTF-CHANNEL1'
-		Row11.Col03 'S_EPGBAR2'
+		X60.Y10		'S_TTF-CHANNEL1'
+		Row11.Col03	'S_EPGBAR2'
 	}
 	Layer 3 {
-		X1.Y1 'S1024x600_BG'
+		X1.Y1		'S1024x600_BG'
 	}
 }
 
-Layout Samsung800x600_doscam {
+Layout Samsung800x600_radio {
 	Layer 0 {
-		X1.Y1 'S800x600_BG1'
+		X1.Y1		'S800x600_BG1'
 	}
-	layer 1 {
-		row01.col01	'DOSCamLINE02'
-		row02.col01	'DOSCamLINE03'
-		row03.col01	'DOSCamLINE06'
-		row04.col01	'DOSCamLINE07'
-		row05.col01	'DOSCamLINE08'
-		row06.col01	'DOSCamLINE09'
-		row07.col01	'DOSCamLINE10'
-		row08.col01	'DOSCamLINE11'
-		row09.col01	'DOSCamLINE12'
-		row10.col01	'DOSCamLINE13'
-		row11.col01	'DOSCamLINE14'
-		row12.col01	'DOSCamLINE15'
-		row13.col01	'DOSCamLINE16'
-		row14.col01	'DOSCamLINE17'
-		row15.col01	'DOSCamLINE18'
-		row16.col01	'DOSCamLINE19'
-		row17.col01	'DOSCamLINE20'
-		row18.col01	'DOSCamLINE21'
-		row19.col01	'DOSCamLINE22'
-		row20.col01	'DOSCamLINE23'
-		row21.col01	'DOSCamLINE24'
-		row22.col01	'DOSCamLINE25'
-		row23.col01	'DOSCamLINE26'
-		row24.col01	'DOSCamLINE27'
-		row25.col01	'DOSCamLINE28'
+	Layer 1 {
+		X17.Y220	'S_TIMER'
+		X17.Y360	'S_REC'
+		X17.Y470	'S_TS'
+		X17.Y560	'S_ECM'
+		X70.Y10		'S_LOGO'
+		X260.Y20	'S_START'
+		X260.Y165	'S_TTF-EPG-NOW'
+		X320.Y165	'S_TTF-EPG-NEXT'
+		X320.Y20	'S_END'
+		X480.Y125	'S_HOUR1_'
+		X480.Y190	'S_HOUR_1'
+		X480.Y254	'S_DP'
+		X480.Y286	'S_MIN1_'
+		X480.Y351	'S_MIN_1'
+		X520.Y610	'S_DURATION'
+		X580.Y5		'HST'
+		X580.Y700	'RES800x600'
 	}
 	Layer 2 {
-		X1.Y1 'S800x600_DOSCAM'
+		X70.Y10		'S_TTF-CHANNEL'
+		Row11.Col03	'S_EPGBAR'
+	}
+	Layer 3 {
+		X1.Y1		'S800x600_BG'
 	}
 }
 
-Layout Samsung800x480_doscam {
+Layout Samsung800x480_radio {
 	Layer 0 {
-		X1.Y1 'S800x480_BG1'
+		X1.Y1		'S800x480_BG1'
 	}
-	layer 1 {
-		row01.col01	'DOSCamLINE02'
-		row02.col01	'DOSCamLINE03'
-		row03.col01	'DOSCamLINE06'
-		row04.col01	'DOSCamLINE07'
-		row05.col01	'DOSCamLINE08'
-		row06.col01	'DOSCamLINE09'
-		row07.col01	'DOSCamLINE10'
-		row08.col01	'DOSCamLINE11'
-		row09.col01	'DOSCamLINE12'
-		row10.col01	'DOSCamLINE13'
-		row11.col01	'DOSCamLINE14'
-		row12.col01	'DOSCamLINE15'
-		row13.col01	'DOSCamLINE16'
-		row14.col01	'DOSCamLINE17'
-		row15.col01	'DOSCamLINE18'
-		row16.col01	'DOSCamLINE19'
-		row17.col01	'DOSCamLINE20'
-		row18.col01	'DOSCamLINE21'
-		row19.col01	'DOSCamLINE22'
-		row20.col01	'DOSCamLINE23'
-		row21.col01	'DOSCamLINE24'
-		row22.col01	'DOSCamLINE25'
-		row23.col01	'DOSCamLINE26'
-		row24.col01	'DOSCamLINE27'
-		row25.col01	'DOSCamLINE28'
+	Layer 1 {
+		X10.Y220	'S_TIMER'
+		X10.Y360	'S_REC'
+		X10.Y470	'S_TS'
+		X10.Y560	'S_ECM'
+		X40.Y10		'S_LOGO'
+		X205.Y20	'S_START'
+		X205.Y165	'S_TTF-EPG-NOW'
+		X260.Y165	'S_TTF-EPG-NEXT'
+		X260.Y20	'S_END'
+		X380.Y125	'S_HOUR1_'
+		X380.Y190	'S_HOUR_1'
+		X380.Y255	'S_DP'
+		X380.Y288	'S_MIN1_'
+		X380.Y353	'S_MIN_1'
+		X410.Y630	'S_DURATION'
+		X460.Y5		'HST'
+		X460.Y700	'RES800x480'
 	}
 	Layer 2 {
-		X1.Y1 'S800x480_DOSCAM'
+		X60.Y10		'S_TTF-CHANNEL'
+		Row09.Col03	'S_EPGBAR'
+	}
+	Layer 3 {
+		X1.Y1		'S800x480_BG'
 	}
 }
 
-Layout Samsung1024x600_doscam {
+Layout Samsung1024x600_radio {
 	Layer 0 {
-		X1.Y1 'S1024x600_BG1'
+		X1.Y1		'S1024x600_BG1'
 	}
-	layer 1 {
-		row01.col01	'DOSCamLINE02'
-		row02.col01	'DOSCamLINE03'
-		row03.col01	'DOSCamLINE06'
-		row04.col01	'DOSCamLINE07'
-		row05.col01	'DOSCamLINE08'
-		row06.col01	'DOSCamLINE09'
-		row07.col01	'DOSCamLINE10'
-		row08.col01	'DOSCamLINE11'
-		row09.col01	'DOSCamLINE12'
-		row10.col01	'DOSCamLINE13'
-		row11.col01	'DOSCamLINE14'
-		row12.col01	'DOSCamLINE15'
-		row13.col01	'DOSCamLINE16'
-		row14.col01	'DOSCamLINE17'
-		row15.col01	'DOSCamLINE18'
-		row16.col01	'DOSCamLINE19'
-		row17.col01	'DOSCamLINE20'
-		row18.col01	'DOSCamLINE21'
-		row19.col01	'DOSCamLINE22'
-		row20.col01	'DOSCamLINE23'
-		row21.col01	'DOSCamLINE24'
-		row22.col01	'DOSCamLINE25'
-		row23.col01	'DOSCamLINE26'
-		row24.col01	'DOSCamLINE27'
-		row25.col01	'DOSCamLINE28'
+	Layer 1 {
+		X13.Y220	'S_TIMER'
+		X13.Y360	'S_REC'
+		X13.Y470	'S_TS'
+		X13.Y560	'S_ECM'
+		X60.Y10		'S_LOGO1'
+		X260.Y20	'S_START'
+		X260.Y190	'S_TTF-EPG-NOW1'
+		X320.Y190	'S_TTF-EPG-NEXT1'
+		X320.Y20	'S_END'
+		X480.Y130	'S_HOUR1_'
+		X480.Y195	'S_HOUR_1'
+		X480.Y260	'S_DP'
+		X480.Y293	'S_MIN1_'
+		X480.Y358	'S_MIN_1'
+		X520.Y830	'S_DURATION'
+		X580.Y5		'HST'
+		X580.Y924	'RES1024x600'
 	}
 	Layer 2 {
-		X1.Y1 'S1024x600_DOSCAM'
+		X60.Y10		'S_TTF-CHANNEL1'
+		Row11.Col03	'S_EPGBAR2'
+	}
+	Layer 3 {
+		X1.Y1		'S1024x600_BG'
 	}
 }
 
-Layout Samsung800x600_radio {
+Layout Samsung800x600_xcam {
 	Layer 0 {
-		X1.Y1 'S800x600_BG1'
-	}
-	Layer 1 {
-		X17.Y220 'S_TIMER'
-		X17.Y360 'S_REC'
-		X17.Y470 'S_TS'
-		X17.Y560 'S_ECM'
-		X70.Y10  'S_LOGO'
-		X260.Y20  'S_START'
-		X260.Y165  'S_TTF-EPG-NOW'
-		X320.Y165  'S_TTF-EPG-NEXT'
-		X320.Y20   'S_END'
-		X480.Y125 'S_HOUR1_'
-		X480.Y190 'S_HOUR_1'
-		X480.Y254 'S_DP'
-		X480.Y286 'S_MIN1_'
-		X480.Y351 'S_MIN_1'
-		X520.Y610 'S_DURATION'
-		X580.Y5 'HST'
-		X580.Y700 'RES800x600'
+		X1.Y1		'S800x600_BG1'
 	}
-	Layer 2 {
-		X70.Y10  'S_TTF-CHANNEL'
-		Row11.Col03 'S_EPGBAR'
+	layer 1 {
+		row01.col01	'XCAMLINE02'
+		row02.col01	'XCAMLINE03'
+		row03.col01	'XCAMLINE06'
+		row04.col01	'XCAMLINE07'
+		row05.col01	'XCAMLINE08'
+		row06.col01	'XCAMLINE09'
+		row07.col01	'XCAMLINE10'
+		row08.col01	'XCAMLINE11'
+		row09.col01	'XCAMLINE12'
+		row10.col01	'XCAMLINE13'
+		row11.col01	'XCAMLINE14'
+		row12.col01	'XCAMLINE15'
+		row13.col01	'XCAMLINE16'
+		row14.col01	'XCAMLINE17'
+		row15.col01	'XCAMLINE18'
+		row16.col01	'XCAMLINE19'
+		row17.col01	'XCAMLINE20'
+		row18.col01	'XCAMLINE21'
+		row19.col01	'XCAMLINE22'
+		row20.col01	'XCAMLINE23'
+		row21.col01	'XCAMLINE24'
+		row22.col01	'XCAMLINE25'
+		row23.col01	'XCAMLINE26'
+		row24.col01	'XCAMLINE27'
+		row25.col01	'XCAMLINE28'
+		X580.Y5		'HST'
+		X580.Y700	'RES800x600'
 	}
-	Layer 3 {
-		X1.Y1 'S800x600_BG'
+	layer 2 {
+		x001.y001	'S800x600_DOSCAM'
 	}
 }
 
-Layout Samsung800x480_radio {
+Layout Samsung800x480_xcam {
 	Layer 0 {
-		X1.Y1 'S800x480_BG1'
-	}
-	Layer 1 {
-		X10.Y220 'S_TIMER'
-		X10.Y360 'S_REC'
-		X10.Y470 'S_TS'
-		X10.Y560 'S_ECM'
-		X40.Y10  'S_LOGO'
-		X205.Y20  'S_START'
-		X205.Y165 'S_TTF-EPG-NOW'
-		X260.Y165  'S_TTF-EPG-NEXT'
-		X260.Y20   'S_END'
-		X380.Y125 'S_HOUR1_'
-		X380.Y190 'S_HOUR_1'
-		X380.Y255 'S_DP'
-		X380.Y288 'S_MIN1_'
-		X380.Y353 'S_MIN_1'
-		X410.Y630 'S_DURATION'
-		X460.Y5 'HST'
-		X460.Y700 'RES800x480'
+		X1.Y1		'S800x480_BG1'
 	}
-	Layer 2 {
-		X60.Y10   'S_TTF-CHANNEL'
-		Row09.Col03 'S_EPGBAR'
+	layer 1 {
+		row01.col01	'XCAMLINE02'
+		row02.col01	'XCAMLINE03'
+		row03.col01	'XCAMLINE06'
+		row04.col01	'XCAMLINE07'
+		row05.col01	'XCAMLINE08'
+		row06.col01	'XCAMLINE09'
+		row07.col01	'XCAMLINE10'
+		row08.col01	'XCAMLINE11'
+		row09.col01	'XCAMLINE12'
+		row10.col01	'XCAMLINE13'
+		row11.col01	'XCAMLINE14'
+		row12.col01	'XCAMLINE15'
+		row13.col01	'XCAMLINE16'
+		row14.col01	'XCAMLINE17'
+		row15.col01	'XCAMLINE18'
+		row16.col01	'XCAMLINE19'
+		row17.col01	'XCAMLINE20'
+		row18.col01	'XCAMLINE21'
+		row19.col01	'XCAMLINE22'
+		row20.col01	'XCAMLINE23'
+		row21.col01	'XCAMLINE24'
+		row22.col01	'XCAMLINE25'
+		row23.col01	'XCAMLINE26'
+		row24.col01	'XCAMLINE27'
+		row25.col01	'XCAMLINE28'
+		X460.Y5		'HST'
+		X460.Y700	'RES800x480'
 	}
-	Layer 3 {
-		X1.Y1 'S800x480_BG'
+	layer 2 {
+		x001.y001	'S800x480_DOSCAM'
 	}
 }
 
-Layout Samsung1024x600_radio {
+Layout Samsung1024x600_xcam {
 	Layer 0 {
-		X1.Y1 'S1024x600_BG1'
+		X1.Y1		'S1024x600_BG1'
 	}
-	Layer 1 {
-		X13.Y220 'S_TIMER'
-		X13.Y360 'S_REC'
-		X13.Y470 'S_TS'
-		X13.Y560 'S_ECM'
-		X60.Y10  'S_LOGO1'
-		X260.Y20   'S_START'
-		X260.Y190  'S_TTF-EPG-NOW1'
-		X320.Y190  'S_TTF-EPG-NEXT1'
-		X320.Y20   'S_END'
-		X480.Y130 'S_HOUR1_'
-		X480.Y195 'S_HOUR_1'
-		X480.Y260 'S_DP'
-		X480.Y293 'S_MIN1_'
-		X480.Y358 'S_MIN_1'
-		X520.Y830 'S_DURATION'
-		X580.Y5 'HST'
-		X580.Y924 'RES1024x600'
-	}
-	Layer 2 {
-		X60.Y10   'S_TTF-CHANNEL1'
-		Row11.Col03 'S_EPGBAR2'
+	layer 1 {
+		row01.col01	'XCAMLINE02'
+		row02.col01	'XCAMLINE03'
+		row03.col01	'XCAMLINE06'
+		row04.col01	'XCAMLINE07'
+		row05.col01	'XCAMLINE08'
+		row06.col01	'XCAMLINE09'
+		row07.col01	'XCAMLINE10'
+		row08.col01	'XCAMLINE11'
+		row09.col01	'XCAMLINE12'
+		row10.col01	'XCAMLINE13'
+		row11.col01	'XCAMLINE14'
+		row12.col01	'XCAMLINE15'
+		row13.col01	'XCAMLINE16'
+		row14.col01	'XCAMLINE17'
+		row15.col01	'XCAMLINE18'
+		row16.col01	'XCAMLINE19'
+		row17.col01	'XCAMLINE20'
+		row18.col01	'XCAMLINE21'
+		row19.col01	'XCAMLINE22'
+		row20.col01	'XCAMLINE23'
+		row21.col01	'XCAMLINE24'
+		row22.col01	'XCAMLINE25'
+		row23.col01	'XCAMLINE26'
+		row24.col01	'XCAMLINE27'
+		row25.col01	'XCAMLINE28'
+		X580.Y5		'HST'
+		X580.Y924	'RES1024x600'
 	}
-	Layer 3 {
-		X1.Y1 'S1024x600_BG'
+	layer 2 {
+		x001.y001	'S1024x600_DOSCAM'
 	}
 }
 
 Layout Samsung800x600_standby {
 	Layer 0 {
-		X1.Y1 'S800x600_STB1'
+		X1.Y1		'S800x600_STB1'
 	}
 	layer 1 {
-		X17.Y220 'S_TIMER'
-		X17.Y360 'S_REC'
-		X17.Y470 'S_TS'
-		X17.Y560 'S_ECM'
-		X70.Y0 'TAGDATUM-TTF'
-		X160.Y123 'S_STANDBY_HOUR1_'
-		X160.Y244 'S_STANDBY_HOUR_1'
-		X160.Y365 'S_STANDBY_DP'
-		X160.Y427 'S_STANDBY_MIN1_'
-		X160.Y548 'S_STANDBY_MIN_1'
-		X580.Y5 'HST_STB'
-		X580.Y700 'RES800x600'
+		X17.Y220	 'S_TIMER'
+		X17.Y360	 'S_REC'
+		X17.Y470	 'S_TS'
+		X17.Y560	 'S_ECM'
+		X70.Y0		 'TAGDATUM-TTF'
+		X160.Y123	 'S_STANDBY_HOUR1_'
+		X160.Y244	 'S_STANDBY_HOUR_1'
+		X160.Y365	 'S_STANDBY_DP'
+		X160.Y427	 'S_STANDBY_MIN1_'
+		X160.Y548	 'S_STANDBY_MIN_1'
+		X580.Y5		 'HST_STB'
+		X580.Y700	 'RES800x600'
 	}
 	layer 2 {
-		X1.Y1 'S800x600_STB'
+		X1.Y1		 'S800x600_STB'
 	}
 }
 
 Layout Samsung800x480_standby {
 	Layer 0 {
-		X1.Y1 'S800x480_STB1'
+		X1.Y1		'S800x480_STB1'
 	}
 	layer 1 {
-		X10.Y220 'S_TIMER'
-		X10.Y360 'S_REC'
-		X10.Y470 'S_TS'
-		X10.Y560 'S_ECM'
-		X70.Y0 'TAGDATUM-TTF'
-		X160.Y123 'S_STANDBY_HOUR1_'
-		X160.Y244 'S_STANDBY_HOUR_1'
-		X160.Y365 'S_STANDBY_DP'
-		X160.Y427 'S_STANDBY_MIN1_'
-		X160.Y548 'S_STANDBY_MIN_1'
-		X460.Y5 'HST_STB'
-		X460.Y700 'RES800x480'
+		X10.Y220	'S_TIMER'
+		X10.Y360	'S_REC'
+		X10.Y470	'S_TS'
+		X10.Y560	'S_ECM'
+		X70.Y0		'TAGDATUM-TTF'
+		X160.Y123	'S_STANDBY_HOUR1_'
+		X160.Y244	'S_STANDBY_HOUR_1'
+		X160.Y365	'S_STANDBY_DP'
+		X160.Y427	'S_STANDBY_MIN1_'
+		X160.Y548	'S_STANDBY_MIN_1'
+		X460.Y5		'HST_STB'
+		X460.Y700	'RES800x480'
 	}
 	layer 2 {
-		X1.Y1 'S800x480_STB'
+		X1.Y1		'S800x480_STB'
 	}
 }
 
 Layout Samsung1024x600_standby {
 	layer 0 {
-		X1.Y1 'S1024x600_STB1'
+		X1.Y1		'S1024x600_STB1'
 	}
 	layer 1 {
-		X10.Y230 'S_TIMER'
-		X10.Y370 'S_REC'
-		X10.Y480 'S_TS'
-		X10.Y570 'S_ECM'
-		X70.Y12 'TAGDATUM-TTF1'
-		X160.Y230 'S_STANDBY_HOUR1_'
-		X160.Y354 'S_STANDBY_HOUR_1'
-		X160.Y475 'S_STANDBY_DP'
-		X160.Y538 'S_STANDBY_MIN1_'
-		X160.Y661 'S_STANDBY_MIN_1'
-		X580.Y5 'HST_STB'
-		X580.Y924 'RES1024x600'
+		X10.Y230	'S_TIMER'
+		X10.Y370	'S_REC'
+		X10.Y480	'S_TS'
+		X10.Y570	'S_ECM'
+		X70.Y12		'TAGDATUM-TTF1'
+		X160.Y230	'S_STANDBY_HOUR1_'
+		X160.Y354	'S_STANDBY_HOUR_1'
+		X160.Y475	'S_STANDBY_DP'
+		X160.Y538	'S_STANDBY_MIN1_'
+		X160.Y661	'S_STANDBY_MIN_1'
+		X580.Y5		'HST_STB'
+		X580.Y924	'RES1024x600'
 	}
 	layer 2 {
-		X1.Y1 'S1024x600_STB'
+		X1.Y1		'S1024x600_STB'
 	}
 }
 
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/weather_off.png b/archive-imagefiles/lcd4linux/share/lcd/icons/mode/weather_off.png
similarity index 100%
rename from archive-imagefiles/lcd4linux/share/lcd/icons/weather/weather_off.png
rename to archive-imagefiles/lcd4linux/share/lcd/icons/mode/weather_off.png
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/weather_on.png b/archive-imagefiles/lcd4linux/share/lcd/icons/mode/weather_on.png
similarity index 100%
rename from archive-imagefiles/lcd4linux/share/lcd/icons/weather/weather_on.png
rename to archive-imagefiles/lcd4linux/share/lcd/icons/mode/weather_on.png
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0000.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0000.png
deleted file mode 100644
index 0c160648..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0000.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0001.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0001.png
deleted file mode 100644
index 53018099..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0001.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0002.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0002.png
deleted file mode 100644
index 21c43e65..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0002.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0003.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0003.png
deleted file mode 100644
index 7ee69a15..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0003.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0004.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0004.png
deleted file mode 100644
index f8334d5d..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0004.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0006.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0006.png
deleted file mode 100644
index b5ecb314..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0006.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0007.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0007.png
deleted file mode 100644
index d88d8525..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0007.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0008.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0008.png
deleted file mode 100644
index be55a0ba..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0008.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0009.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0009.png
deleted file mode 100644
index 19b51eef..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0009.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0010.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0010.png
deleted file mode 100644
index 352d1807..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0010.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0011.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0011.png
deleted file mode 100644
index e265af6f..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0011.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0012.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0012.png
deleted file mode 100644
index 6f87db4d..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0012.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0013.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0013.png
deleted file mode 100644
index c154ab8b..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0013.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0016.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0016.png
deleted file mode 100644
index 4a7e4265..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0016.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0017.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0017.png
deleted file mode 100644
index a661009c..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0017.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0018.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0018.png
deleted file mode 100644
index f388f6d4..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0018.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0019.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0019.png
deleted file mode 100644
index 0fa80ab2..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0019.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0020.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0020.png
deleted file mode 100644
index aba301d0..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0020.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0021.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0021.png
deleted file mode 100644
index 5c253614..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0021.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0024.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0024.png
deleted file mode 100644
index 70634c0d..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0024.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0025.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0025.png
deleted file mode 100644
index 48ce5163..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0025.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0026.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0026.png
deleted file mode 100644
index c97e6bd1..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0026.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0027.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0027.png
deleted file mode 100644
index b6b32af5..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0027.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0028.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0028.png
deleted file mode 100644
index f722060b..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0028.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0029.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0029.png
deleted file mode 100644
index e36ae3d3..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0029.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0032.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0032.png
deleted file mode 100644
index 0dfa2eb0..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0032.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0033.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0033.png
deleted file mode 100644
index d85bf7bd..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0033.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0034.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0034.png
deleted file mode 100644
index 8b036424..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0034.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0035.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0035.png
deleted file mode 100644
index a5aa6abf..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0035.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0036.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0036.png
deleted file mode 100644
index 0d12a1e8..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0036.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0037.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0037.png
deleted file mode 100644
index a18d70ba..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0037.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0040.png b/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0040.png
deleted file mode 100644
index f55663a0..00000000
Binary files a/archive-imagefiles/lcd4linux/share/lcd/icons/weather/0040.png and /dev/null differ
diff --git a/archive-imagefiles/lcd4linux/share/lcd/scripts/weather b/archive-imagefiles/lcd4linux/share/lcd/scripts/weather
deleted file mode 100755
index 7f2b2075..00000000
--- a/archive-imagefiles/lcd4linux/share/lcd/scripts/weather
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-eXit() {
-	echo .
-	exit $1
-} 
-
-test -e /var/etc/.lcd-weather || eXit 1
-
-DATA_DIR=/tmp/lcd
-DATA_XML=/tmp/weather.xml
-
-if [ -e /var/tuxbox/config/tuxwetter/tuxwetter.conf ]; then
-	DATA_LOC=$(grep -m1 "Stadt=" /var/tuxbox/config/tuxwetter/tuxwetter.conf | cut -d= -f2 | cut -d, -f2,3)
-fi
-test -z $DATA_LOC && eXit 1
-
-if [ -e /var/tuxbox/config/tuxwetter/tuxwetter.mcfg ]; then
-	#MCFG_KEY=$(grep "^LicenseKey=" /var/tuxbox/config/tuxwetter/tuxwetter.mcfg | cut -d= -f2)
-	MCFG_KEY="32z7znf5z7bwm2nednkyevb7"
-fi
-test -z $MCFG_KEY && eXit 1
-
-test -d $DATA_DIR || mkdir -p $DATA_DIR
-
-wget -q -O $DATA_XML "http://api.worldweatheronline.com/free/v1/weather.ashx?q=${DATA_LOC}&format=xml&num_of_days=2&key=${MCFG_KEY}"
-
-if [ -e $DATA_XML ]; then
-
-	query=$(sed -n 's/.*<query>\(.*\)<\/query>.*/\1\n/p' $DATA_XML)
-
-	temp=$(sed -n 's/.*<temp_C>\(.*\)<\/temp_C>.*/\1\n/p'	$DATA_XML)
-
-	tempmax=$(sed -e 's/<\/tempMaxC>/<\/tempMaxC>\n/g' $DATA_XML | \
-			sed -n 's/.*<tempMaxC>\(.*\)<\/tempMaxC>.*/\1/p')
-
-	iconurls=$(sed -e 's/<\/weatherIconUrl>/<\/weatherIconUrl>\n/g' $DATA_XML | \
-			sed -n 's/.*<weatherIconUrl>\(.*\)<\/weatherIconUrl>.*/\1/p' | \
-			sed -e 's/<!\[CDATA\[//g' -e 's/\]\]>//g')
-
-	echo "$query"	 > $DATA_DIR/location
-	echo "$temp"	 > $DATA_DIR/temperatures
-	echo "$tempmax"	>> $DATA_DIR/temperatures
-
-	rm -f $DATA_DIR/weathericons
-	for url in $iconurls; do
-		icon=${url##*/}
-		echo ${icon:8:4}.png >> $DATA_DIR/weathericons
-	done
-
-	#TODO: fix lan/lon-entrys in $DATA_DIR/location
-	#http://maps.google.com/maps/geo?output=xml&oe=utf8&ll=(LAT),(LON)&key=asdad&hl=de
-
-	rm -f $DATA_XML
-fi
-
-eXit 0