diff --git a/config/noobs/OpenELEC.png b/config/noobs/OpenELEC.png
new file mode 100644
index 0000000000..6a448a0a20
Binary files /dev/null and b/config/noobs/OpenELEC.png differ
diff --git a/config/noobs/partitions.json b/config/noobs/partitions.json
index e91964f1fb..02c2956273 100644
--- a/config/noobs/partitions.json
+++ b/config/noobs/partitions.json
@@ -1,20 +1,20 @@
 {
   "partitions": [
     {
-      "label": "System",
-      "filesystem_type": "FAT",
-      "partition_size_nominal: "128",
-      "want_maximised": "false",
-      "uncompressed_tarball_size": 128,
-      "mkfs_options": ""
+      "label":                     "System",
+      "filesystem_type":           "FAT",
+      "partition_size_nominal":    128,
+      "want_maximised":            false,
+      "uncompressed_tarball_size": 110,
+      "mkfs_options":              ""
     },
     {
-      "label": "Storage",
-      "filesystem_type": "ext4",
-      "partition_size_nominal: "864",
-      "want_maximised": "true",
-      "uncompressed_tarball_size": 512,
-      "mkfs_options": ""
+      "label":                     "Storage",
+      "filesystem_type":           "ext4",
+      "partition_size_nominal":    864,
+      "want_maximised":            true,
+      "uncompressed_tarball_size": 10,
+      "mkfs_options":              ""
     }
-  ],
+  ]
 }
diff --git a/config/noobs/slides/A.png b/config/noobs/slides/A.png
new file mode 100644
index 0000000000..5a6cd34be6
Binary files /dev/null and b/config/noobs/slides/A.png differ
diff --git a/config/noobs/slides/B.png b/config/noobs/slides/B.png
new file mode 100644
index 0000000000..8a04088f13
Binary files /dev/null and b/config/noobs/slides/B.png differ
diff --git a/config/noobs/slides/C.png b/config/noobs/slides/C.png
new file mode 100644
index 0000000000..1732f5128b
Binary files /dev/null and b/config/noobs/slides/C.png differ
diff --git a/config/noobs/slides/D.png b/config/noobs/slides/D.png
new file mode 100644
index 0000000000..ee2ae20854
Binary files /dev/null and b/config/noobs/slides/D.png differ
diff --git a/config/noobs/slides/E.png b/config/noobs/slides/E.png
new file mode 100644
index 0000000000..3c4779e017
Binary files /dev/null and b/config/noobs/slides/E.png differ
diff --git a/config/noobs/slides_vga/A.png b/config/noobs/slides_vga/A.png
new file mode 100644
index 0000000000..3433f7c2a4
Binary files /dev/null and b/config/noobs/slides_vga/A.png differ
diff --git a/config/noobs/slides_vga/B.png b/config/noobs/slides_vga/B.png
new file mode 100644
index 0000000000..2179b9ff5c
Binary files /dev/null and b/config/noobs/slides_vga/B.png differ
diff --git a/config/noobs/slides_vga/C.png b/config/noobs/slides_vga/C.png
new file mode 100644
index 0000000000..e9dbcb1f0e
Binary files /dev/null and b/config/noobs/slides_vga/C.png differ
diff --git a/config/noobs/slides_vga/D.png b/config/noobs/slides_vga/D.png
new file mode 100644
index 0000000000..1306648ba5
Binary files /dev/null and b/config/noobs/slides_vga/D.png differ
diff --git a/config/noobs/slides_vga/E.png b/config/noobs/slides_vga/E.png
new file mode 100644
index 0000000000..e948f543b0
Binary files /dev/null and b/config/noobs/slides_vga/E.png differ
diff --git a/packages/lang/Python/build b/packages/lang/Python/build
index 44e1ee00e5..6ccdedaad0 100755
--- a/packages/lang/Python/build
+++ b/packages/lang/Python/build
@@ -89,9 +89,8 @@ INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax wsgiref"
 mkdir -p ./Lib
 cp ../Lib/*.py ./Lib
 
-for dirs in $INCLUDE_DIRS; do
-  mkdir -p ./Lib/$dirs
-  cp ../Lib/$dirs/*.py ./Lib/$dirs
+for dir in $INCLUDE_DIRS; do
+  cp -a ../Lib/$dir ./Lib/
 done
 
 python -Wi -t -B ../Lib/compileall.py ./Lib -f
diff --git a/packages/linux/meta b/packages/linux/meta
index 49abf870e7..6c9b24ed47 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -34,7 +34,7 @@ case "$LINUX" in
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
     ;;
   *)
-    PKG_VERSION="3.10.9"
+    PKG_VERSION="3.10.10"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
 esac
diff --git a/packages/linux/patches/3.10.9/linux-003-no_dev_console.patch b/packages/linux/patches/3.10.10/linux-003-no_dev_console.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-003-no_dev_console.patch
rename to packages/linux/patches/3.10.10/linux-003-no_dev_console.patch
diff --git a/packages/linux/patches/3.10.9/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.10.10/linux-010-perf_crosscompiling.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-010-perf_crosscompiling.patch
rename to packages/linux/patches/3.10.10/linux-010-perf_crosscompiling.patch
diff --git a/packages/linux/patches/3.10.9/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.10.10/linux-052-XBOX_remote_support.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-052-XBOX_remote_support.patch
rename to packages/linux/patches/3.10.10/linux-052-XBOX_remote_support.patch
diff --git a/packages/linux/patches/3.10.9/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.10.10/linux-053-spinelplus-remote-0.2.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-053-spinelplus-remote-0.2.patch
rename to packages/linux/patches/3.10.10/linux-053-spinelplus-remote-0.2.patch
diff --git a/packages/linux/patches/3.10.9/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.10.10/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch
rename to packages/linux/patches/3.10.10/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch
diff --git a/packages/linux/patches/3.10.9/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.10.10/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
rename to packages/linux/patches/3.10.10/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
diff --git a/packages/linux/patches/3.10.9/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.10.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
rename to packages/linux/patches/3.10.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
diff --git a/packages/linux/patches/3.10.9/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.10.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
rename to packages/linux/patches/3.10.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
diff --git a/packages/linux/patches/3.10.9/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.10.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
rename to packages/linux/patches/3.10.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
diff --git a/packages/linux/patches/3.10.9/linux-058.01-HID-Sony-upstream_patches.patch b/packages/linux/patches/3.10.10/linux-058.01-HID-Sony-upstream_patches.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-058.01-HID-Sony-upstream_patches.patch
rename to packages/linux/patches/3.10.10/linux-058.01-HID-Sony-upstream_patches.patch
diff --git a/packages/linux/patches/3.10.9/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch b/packages/linux/patches/3.10.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
rename to packages/linux/patches/3.10.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
diff --git a/packages/linux/patches/3.10.9/linux-058.06-hid_sony-add_SMK_link.patch b/packages/linux/patches/3.10.10/linux-058.06-hid_sony-add_SMK_link.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-058.06-hid_sony-add_SMK_link.patch
rename to packages/linux/patches/3.10.10/linux-058.06-hid_sony-add_SMK_link.patch
diff --git a/packages/linux/patches/3.10.9/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.10.10/linux-059-remove_some_xpad_pids-0.2.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-059-remove_some_xpad_pids-0.2.patch
rename to packages/linux/patches/3.10.10/linux-059-remove_some_xpad_pids-0.2.patch
diff --git a/packages/linux/patches/3.10.9/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.10.10/linux-060-add_AUGUST_DVB-T205.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-060-add_AUGUST_DVB-T205.patch
rename to packages/linux/patches/3.10.10/linux-060-add_AUGUST_DVB-T205.patch
diff --git a/packages/linux/patches/3.10.9/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.10.10/linux-203-stb0899_enable_low_symbol_rate.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-203-stb0899_enable_low_symbol_rate.patch
rename to packages/linux/patches/3.10.10/linux-203-stb0899_enable_low_symbol_rate.patch
diff --git a/packages/linux/patches/3.10.9/linux-210-dvbsky.patch b/packages/linux/patches/3.10.10/linux-210-dvbsky.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-210-dvbsky.patch
rename to packages/linux/patches/3.10.10/linux-210-dvbsky.patch
diff --git a/packages/linux/patches/3.10.9/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.10.10/linux-212-mantis_stb0899_faster_lock.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-212-mantis_stb0899_faster_lock.patch
rename to packages/linux/patches/3.10.10/linux-212-mantis_stb0899_faster_lock.patch
diff --git a/packages/linux/patches/3.10.9/linux-221-ngene-octopus.patch b/packages/linux/patches/3.10.10/linux-221-ngene-octopus.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-221-ngene-octopus.patch
rename to packages/linux/patches/3.10.10/linux-221-ngene-octopus.patch
diff --git a/packages/linux/patches/3.10.9/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.10.10/linux-222-stb0899_signal_quality.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-222-stb0899_signal_quality.patch
rename to packages/linux/patches/3.10.10/linux-222-stb0899_signal_quality.patch
diff --git a/packages/linux/patches/3.10.9/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.10.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
rename to packages/linux/patches/3.10.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
diff --git a/packages/linux/patches/3.10.9/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.10.10/linux-700-jmicron_1_0_8_5.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-700-jmicron_1_0_8_5.patch
rename to packages/linux/patches/3.10.10/linux-700-jmicron_1_0_8_5.patch
diff --git a/packages/linux/patches/3.10.9/linux-701-linksys_aes2500_brcmfmac.patch b/packages/linux/patches/3.10.10/linux-701-linksys_aes2500_brcmfmac.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-701-linksys_aes2500_brcmfmac.patch
rename to packages/linux/patches/3.10.10/linux-701-linksys_aes2500_brcmfmac.patch
diff --git a/packages/linux/patches/3.10.9/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch b/packages/linux/patches/3.10.10/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch
rename to packages/linux/patches/3.10.10/linux-702-Support-for-cheap-Ralink-3070-WiFi-plug.patch
diff --git a/packages/linux/patches/3.10.9/linux-703-macmini2012-ethernet.patch b/packages/linux/patches/3.10.10/linux-703-macmini2012-ethernet.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-703-macmini2012-ethernet.patch
rename to packages/linux/patches/3.10.10/linux-703-macmini2012-ethernet.patch
diff --git a/packages/linux/patches/3.10.9/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.10.10/linux-900-hide_tsc_error.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-900-hide_tsc_error.patch
rename to packages/linux/patches/3.10.10/linux-900-hide_tsc_error.patch
diff --git a/packages/linux/patches/3.10.9/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.10.10/linux-950-saa716x_PCIe_interface_chipset.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-950-saa716x_PCIe_interface_chipset.patch
rename to packages/linux/patches/3.10.10/linux-950-saa716x_PCIe_interface_chipset.patch
diff --git a/packages/linux/patches/3.10.9/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch b/packages/linux/patches/3.10.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch
rename to packages/linux/patches/3.10.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch
diff --git a/packages/linux/patches/3.10.9/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.10.10/linux-995-CX24120-13Z_frontend.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-995-CX24120-13Z_frontend.patch
rename to packages/linux/patches/3.10.10/linux-995-CX24120-13Z_frontend.patch
diff --git a/packages/linux/patches/3.10.9/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch b/packages/linux/patches/3.10.10/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch
similarity index 100%
rename from packages/linux/patches/3.10.9/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch
rename to packages/linux/patches/3.10.10/linux-998.01-cpufreq-revert-9d3ce4af3be0235d4cf41ea9fd774205a32e58a2.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch b/packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch
new file mode 100644
index 0000000000..7dd4bb8b2c
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-AML-XB9295c3f-03-show-all-removable-disks-mounted-under-media.patch
@@ -0,0 +1,25 @@
+From 6d64d70a46b8f238d2706017a084f30bd681f291 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sat, 31 Aug 2013 13:44:53 +0300
+Subject: [PATCH] show all removable disks  mounted under /media
+
+---
+ xbmc/storage/linux/UDevProvider.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
+index c20facc..c1044c8 100644
+--- a/xbmc/storage/linux/UDevProvider.cpp
++++ b/xbmc/storage/linux/UDevProvider.cpp
+@@ -151,7 +151,7 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable)
+     if (removable  &&
+       ((bus        && strstr(bus, "usb")) ||
+        (cdrom      && strstr(cdrom,"1"))  ||
+-       (mountpoint && strstr(mountpoint, "usb"))))
++       (mountpoint)))
+     {
+       const char *label = udev_device_get_property_value(device, "ID_FS_LABEL");
+       if (!label)
+-- 
+1.7.2.5
+
diff --git a/packages/sysutils/udevil/udev.d/95-udevil-mount.rules b/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
index 43890b320b..63a6488559 100644
--- a/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
+++ b/packages/sysutils/udevil/udev.d/95-udevil-mount.rules
@@ -1,3 +1,7 @@
+# dont run in "installer" mode
+IMPORT{cmdline}="installer"
+ENV{installer}=="1", GOTO="exit"
+
 # check for blockdevices, /dev/sd* and /dev/sr*
 SUBSYSTEM!="block", KERNEL!="sd*|sr*",GOTO="exit"
 
diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options
index 71c075f34a..ada1c67a4d 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/ATV/options b/projects/ATV/options
index 4080518154..249f655528 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 1dd72b080a..be7c35bc6d 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/Generic/options b/projects/Generic/options
index 1011e6af22..f1922e25ce 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 1d2ac19a8e..4db66486b2 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/ION/options b/projects/ION/options
index d6240a4a55..a6fa1cec8b 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/Intel/options b/projects/Intel/options
index dbf4a567a3..b7f0a9dfdd 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/RPi/options b/projects/RPi/options
index 68e0e7da6f..db9302ea22 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 2412d393d2..5e7f2321cc 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -5,7 +5,7 @@
   fi
 
 # short project description
-  DESCRIPTION="OpenELEC is the fastest, smallest and most userfriendly XBMC Mediacenter appliance distribution with official support from XBMC.org"
+  DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
diff --git a/scripts/image b/scripts/image
index e382cd55d6..7d2fa128ee 100755
--- a/scripts/image
+++ b/scripts/image
@@ -289,7 +289,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 
       cp $ROOT/README* $RELEASE_DIR
       cp $ROOT/CHANGELOG $RELEASE_DIR/release_notes.txt
-      cp -R $CONFIG/release/openelec.ico $RELEASE_DIR
 
 
       sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
@@ -332,12 +331,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
       mkdir -p $RELEASE_DIR/Storage
 
     # remove an previous created release tarball
-      rm -rf $RELEASE_DIR/System.tar.gz
-      rm -rf $RELEASE_DIR/Storage.tar.gz
+      rm -rf $RELEASE_DIR/System.tar.xz
+      rm -rf $RELEASE_DIR/Storage.tar.xz
 
     # create filesystem tarballs
-      tar czf $RELEASE_DIR/System.tar.gz -C $RELEASE_DIR/System/ .
-      tar czf $RELEASE_DIR/Storage.tar.gz -C $RELEASE_DIR/Storage/ .
+      tar cJf $RELEASE_DIR/System.tar.xz -C $RELEASE_DIR/System/ .
+      tar cJf $RELEASE_DIR/Storage.tar.xz -C $RELEASE_DIR/Storage/ .
 
     # remove an filesystem dirs
       rm -rf $RELEASE_DIR/System
@@ -352,4 +351,3 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
     # cleanup release dir
       rm -rf $RELEASE_DIR
   fi
-