diff --git a/config/options b/config/options
index 8684e99c95..581ddcae31 100644
--- a/config/options
+++ b/config/options
@@ -1,6 +1,14 @@
 # set default language for buildsystem
   export LC_ALL=C
 
+# determines DISTRO, if not forced by user
+# default is OpenELEC
+if [ -z "$DISTRO" ]; then
+  DISTRO="OpenELEC"
+else
+  DISTRO="$DISTRO"
+fi
+
 # determines PROJECT, if not forced by user
 # default is Generic
 if [ -z "$PROJECT" ]; then
@@ -18,6 +26,7 @@ else
 fi
 
 ROOT=`pwd`
+DISTRO_DIR="$ROOT/distributions"
 PROJECT_DIR="$ROOT/projects"
 LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
 
@@ -25,8 +34,13 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
   . config/version
 
 # read distro versioning if available
- if [ -f "$PROJECT_DIR/version.$DISTRO" ]; then
-   . $PROJECT_DIR/version.$DISTRO
+ if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
+   . $DISTRO_DIR/$DISTRO/version
+ fi
+
+# read distro options if available
+ if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
+   . $DISTRO_DIR/$DISTRO/options
  fi
 
 # read project options if available
@@ -34,11 +48,6 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
    . $PROJECT_DIR/$PROJECT/options
  fi
 
-# read distro options if available
- if [ -f "$PROJECT_DIR/options.$DISTRO" ]; then
-   . $PROJECT_DIR/options.$DISTRO
- fi
-
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options
new file mode 100644
index 0000000000..c9f8f43e49
--- /dev/null
+++ b/distributions/OpenELEC/options
@@ -0,0 +1,244 @@
+# Name of the Distro to build (full name, without special characters)
+  DISTRONAME="OpenELEC"
+
+# short project description
+  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
+
+# Welcome Message for e.g. SSH Server (up to 5 Lines)
+  GREETING0="##############################################"
+  GREETING1="# OpenELEC - The living room PC for everyone #"
+  GREETING2="# ...... visit http://www.openelec.tv ...... #"
+  GREETING3="##############################################"
+  GREETING4=""
+
+# Root password to integrate in the target system
+  ROOT_PASSWORD="openelec"
+
+# Mediacenter to use (kodi / no)
+  MEDIACENTER="kodi"
+
+# Skins to install (Confluence)
+# Space separated list is supported,
+# e.g. SKINS="Confluence"
+  SKINS="Confluence"
+
+# Default Skin (Confluence)
+  SKIN_DEFAULT="Confluence"
+
+# install extra subtitle Fonts for KODI (yes / no)
+  KODI_EXTRA_FONTS="yes"
+
+# build and install 'RSXS' Screensaver (yes / no)
+  KODI_SCR_RSXS="no"
+
+# build and install 'ProjectM' Visualization (yes / no)
+  KODI_VIS_PROJECTM="yes"
+
+# build and install 'GOOM' Visualization (yes / no)
+  KODI_VIS_GOOM="yes"
+
+# build and install 'Waveform' Visualization (yes / no)
+  KODI_VIS_WAVEFORM="yes"
+
+# build and install 'Spectrum' Visualization (yes / no)
+  KODI_VIS_SPECTRUM="yes"
+
+# build and install 'FishBMC' Visualization (yes / no)
+  # does not work on RPi
+  KODI_VIS_FISHBMC="yes"
+
+# build and install PulseAudio support (yes / no)
+  PULSEAUDIO_SUPPORT="no"
+
+# build and install espeak support (yes / no)
+  ESPEAK_SUPPORT="yes"
+
+# build and install with non-free support
+# (RAR compression support in KODI) (yes / no)
+  KODI_NONFREE_SUPPORT="yes"
+
+# build and install with BluRay support (yes / no)
+  KODI_BLURAY_SUPPORT="yes"
+
+# build and install with BD+ support
+# (BD+ decryption support in KODI) (yes / no)
+  BLURAY_BDPLUS_SUPPORT="yes"
+
+# build and install with AACS support
+# (BD decryption support in KODI) (yes / no)
+  BLURAY_AACS_SUPPORT="yes"
+
+# build and install with DVDCSS support
+# (DVD decryption support in KODI) (yes / no)
+  KODI_DVDCSS_SUPPORT="yes"
+
+# additional drivers to install:
+# for a list of additinoal drivers see packages/linux-drivers
+# Space separated list is supported,
+# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
+  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
+
+# build and install bluetooth support (yes / no)
+  BLUETOOTH_SUPPORT="yes"
+
+# build and install with KODI webfrontend (yes / no)
+  KODI_WEBSERVER_SUPPORT="yes"
+
+# build and install Avahi (Zeroconf) daemon (yes / no)
+  AVAHI_DAEMON="yes"
+
+# build with UPnP support (yes / no)
+  KODI_UPNP_SUPPORT="yes"
+
+# build with MySQL support (yes / no)
+  KODI_MYSQL_SUPPORT="yes"
+
+# build xbmc with sshlib support (yes / no)
+  KODI_SSHLIB_SUPPORT="yes"
+
+# build xbmc with optical drive support (yes / no)
+  KODI_OPTICAL_SUPPORT="yes"
+
+# KODI Audio encoders for usage with optical drive support
+# Space separated list is supported,
+# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
+  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+
+# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
+  KODI_AIRPLAY_SUPPORT="yes"
+
+# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
+  KODI_AIRTUNES_SUPPORT="yes"
+
+# build with libnfs support (mounting nfs shares with KODI) (yes / no)
+  KODI_NFS_SUPPORT="yes"
+
+# build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
+  KODI_AFP_SUPPORT="no"
+
+# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
+  KODI_SAMBA_SUPPORT="yes"
+
+# build with NFS support (mounting nfs shares via the OS) (yes / no)
+  NFS_SUPPORT="yes"
+
+# build with Samba Client support (mounting samba shares via the OS) (yes / no)
+  SAMBA_SUPPORT="yes"
+
+# build and install Samba Server (yes / no)
+  SAMBA_SERVER="yes"
+
+# build and install SFTP Server (yes / no)
+  SFTP_SERVER="yes"
+
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
+# build and install diskmounter support (udevil)
+# this service provide auto mounting support for external drives in the
+# mediacenter also automount internally drives at boottime via udev (yes / no)
+  UDEVIL="yes"
+
+# build and install exFAT fuse support (yes / no)
+  EXFAT="yes"
+
+# build and install NTFS-3G fuse support (yes / no)
+  NTFS3G="yes"
+
+# build and install hfs filesystem utilities (yes / no)
+  HFSTOOLS="yes"
+
+# Windowmanager to use (ratpoison / fluxbox / none)
+  WINDOWMANAGER="fluxbox"
+
+# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
+# Space separated list is supported,
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
+  if [ "$TARGET_ARCH" = "i386" ]; then
+    # TODO: create Legacy build with OpenELEC-4.2
+    # install legacy drivers to i386 ARCH
+    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
+  elif [ "$TARGET_ARCH" = "x86_64" ]; then
+    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
+  fi
+
+# build and install remote support (yes / no)
+  REMOTE_SUPPORT="yes"
+
+# build and install ATV IR remote support (yes / no)
+  ATVCLIENT_SUPPORT="yes"
+
+# build and install IRServer IR/LCD support (yes / no)
+  IRSERVER_SUPPORT="yes"
+
+# build and install Joystick support (yes / no)
+  JOYSTICK_SUPPORT="yes"
+
+# build and install CEC adapter support (yes / no)
+  CEC_SUPPORT="yes"
+
+# build and install iSCSI support - iscsistart (yes / no)
+  ISCSI_SUPPORT="yes"
+
+# LCD driver to Use - Possible drivers are ( Comma seperated:
+# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
+# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
+# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
+# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
+# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
+# picolcd,pyramid,sed1330,sed1520,serialPOS,
+# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
+# 'all' compiles all drivers;
+# 'all,!xxx,!yyy' de-selects previously selected drivers
+# "none" for disable LCD support
+  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
+
+# Support for partitioning and formating disks in initramfs (yes / no)
+# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
+  INITRAMFS_PARTED_SUPPORT="no"
+
+# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
+# Space separated list is supported,
+# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
+
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swap support enabled per default (yes / no)
+  SWAP_ENABLED_DEFAULT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in MB
+  SWAPFILESIZE="256"
+
+# build with installer (yes / no)
+  INSTALLER_SUPPORT="yes"
+
+# Testpackages for development (yes / no)
+  TESTING="no"
+
+# OEM packages for OEM's (yes / no)
+  OEM_SUPPORT="no"
+
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
+# cron support (yes / no)
+  CRON_SUPPORT="yes"
+
+# Perf support in development builds (yes / no)
+  PERF_SUPPORT="yes"
+
+# Distribution Specific source location
+  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
+  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+
+# Addon Server Url
+  ADDON_SERVER_URL="http://addons.openelec.tv"
+
+# set the addon dirs
+  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
+  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
diff --git a/projects/Generic/options b/projects/Generic/options
index 3b97a9dedc..3e04005482 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -1,364 +1,98 @@
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
+################################################################################
+# setup system defaults
+################################################################################
 
-# short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
+  # The TARGET_CPU variable controls which processor should be targeted for
+  # generated code.
+    case $TARGET_ARCH in
+      i386)
+        # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+        #               athlon-fx athlon-mp athlon-xp athlon-4
+        #               athlon-tbird athlon k6-3 k6-2 k6 geode
+        # (Intel CPUs)  atom core2 nocona prescott pentium4[m] pentium3[m]
+        #               pentium-m pentium2 pentiumpro pentium-mmx pentium
+        #               i686 i586 i486 i386
+        # (VIA CPUs)    c3 c3-2
+        #
+        TARGET_CPU="i686"
+        ;;
 
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREETING0="##############################################"
-  GREETING1="# OpenELEC - The living room PC for everyone #"
-  GREETING2="# ...... visit http://www.openelec.tv ...... #"
-  GREETING3="##############################################"
-  GREETING4=""
+      x86_64)
+        # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+        #               athlon-fx amdfam10 barcelona
+        # (Intel CPUs)  atom core2 nocona
+        #
+        TARGET_CPU="x86-64"
+        ;;
+    esac
 
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
+  # Bootloader to use (syslinux / u-boot)
+    BOOTLOADER="syslinux"
 
-# The TARGET_CPU variable controls which processor should be targeted for
-# generated code.
-  case $TARGET_ARCH in
-    i386)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx athlon-mp athlon-xp athlon-4
-      #               athlon-tbird athlon k6-3 k6-2 k6 geode
-      # (Intel CPUs)  atom core2 nocona prescott pentium4[m] pentium3[m]
-      #               pentium-m pentium2 pentiumpro pentium-mmx pentium
-      #               i686 i586 i486 i386
-      # (VIA CPUs)    c3 c3-2
-      #
-      TARGET_CPU="i686"
-      ;;
+  # u-boot version to use (default)
+    UBOOT_VERSION="default"
 
-    x86_64)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx amdfam10 barcelona
-      # (Intel CPUs)  atom core2 nocona
-      #
-      TARGET_CPU="x86-64"
-      ;;
+  # Configuration for u-boot
+    UBOOT_CONFIG=""
 
-    arm)
-      # TARGET_CPU:
-      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
-      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
-      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
-      # arm720t arm740t strongarm strongarm110 strongarm1100
-      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
-      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
-      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
-      # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
-      # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
-      # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
-      #
-      TARGET_CPU="cortex-a9"
+  # Target Configfile for u-boot
+    UBOOT_CONFIGFILE=""
 
-      # TARGET_FLOAT:
-      # Specifies which floating-point ABI to use. Permissible values are:
-      # soft softfp hard
-      TARGET_FLOAT="softfp"
+  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
+    KERNEL_UBOOT_TARGET=""
 
-      # TARGET_FPU:
-      # This specifies what floating point hardware (or hardware emulation) is
-      # available on the target. Permissible names are:
-      # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
-      # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
-      # neon-vfpv4.
-      TARGET_FPU="neon"
-      ;;
-  esac
+  # Kernel extra targets to build
+    KERNEL_UBOOT_EXTRA_TARGET=""
 
-# Build optimizations (size/normal)
-  OPTIMIZATIONS="size"
+  # Additional kernel make parameters (for example to specify the u-boot loadaddress)
+    KERNEL_MAKE_EXTRACMD=""
 
-# Project CFLAGS
-  PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse"
+  # Kernel to use. values can be:
+  # default:  default mainline kernel
+    LINUX="default"
 
-# LTO (Link Time Optimization) support
-  LTO_SUPPORT="yes"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="yes"
+################################################################################
+# setup build defaults
+################################################################################
 
-# Bootloader to use (syslinux / u-boot)
-  BOOTLOADER="syslinux"
+  # Build optimizations (size/normal)
+    OPTIMIZATIONS="size"
 
-# u-boot version to use (default)
-  UBOOT_VERSION="default"
+  # Project CFLAGS
+    PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse"
 
-# Configuration for u-boot
-  UBOOT_CONFIG=""
+  # LTO (Link Time Optimization) support
+    LTO_SUPPORT="yes"
 
-# Target Configfile for u-boot
-  UBOOT_CONFIGFILE=""
+  # GOLD (Google Linker) support
+    GOLD_SUPPORT="yes"
 
-# Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-  KERNEL_UBOOT_TARGET=""
+  # SquashFS compression method (gzip / lzo / xz)
+    SQUASHFS_COMPRESSION="gzip"
 
-# Kernel extra targets to build
-  KERNEL_UBOOT_EXTRA_TARGET=""
 
-# Additional kernel make parameters (for example to specify the u-boot loadaddress)
-  KERNEL_MAKE_EXTRACMD=""
+################################################################################
+# setup project defaults
+################################################################################
 
-# GCC to use. values can be:
-# default:  default mainline gcc
-  GCC_VERSION="default"
+  # build and install ALSA Audio support (yes / no)
+    ALSA_SUPPORT="yes"
 
-# Kernel to use. values can be:
-# default:  default mainline kernel
-  LINUX="default"
+  # OpenGL(X) implementation to use (no / Mesa)
+    OPENGL="Mesa"
 
-# use linux-next (latest rc) instead latest released version
-  LINUX_NEXT="no"
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="no"
 
-# SquashFS compression method (gzip / lzo / xz)
-  SQUASHFS_COMPRESSION="gzip"
+  # include uvesafb support (yes / no)
+    UVESAFB_SUPPORT="yes"
 
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
+  # Displayserver to use (x11 / no)
+    DISPLAYSERVER="x11"
 
-# Skins to install (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
+  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+    KODIPLAYER_DRIVER="default"
 
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
-
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
-
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="yes"
-
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="yes"
-
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="yes"
-
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
-
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
-
-# build and install 'FishBMC' Visualization (yes / no)
-  KODI_VIS_FISHBMC="yes"
-
-# build and install ALSA Audio support (yes / no)
-  ALSA_SUPPORT="yes"
-
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
-
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
-
-# build and install with non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
-
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
-
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
-
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
-
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
-
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
-
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
-
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
-
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
-
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
-
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
-
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
-
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
-
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
-
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
-
-# build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
-  KODI_AFP_SUPPORT="no"
-
-# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
-
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
-
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
-
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
-
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
-
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
-
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
-
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# OpenGL(X) implementation to use (no / Mesa)
-  OPENGL="Mesa"
-
-# OpenGL-ES implementation to use (no)
-  OPENGLES="no"
-
-# Windowmanager to use (ratpoison / fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
-# include uvesafb support (yes / no)
-  UVESAFB_SUPPORT="yes"
-
-# Displayserver to use (x11 / no)
-  DISPLAYSERVER="x11"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
-  if [ "$TARGET_ARCH" = "i386" ]; then
-    # TODO: create Legacy build with OpenELEC-4.2
-    # install legacy drivers to i386 ARCH
-    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
-  elif [ "$TARGET_ARCH" = "x86_64" ]; then
-    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
-  fi
-
-# KODI Player implementation to use (default / bcm2835-driver)
-  KODIPLAYER_DRIVER="default"
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="yes"
-
-# build and install IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
-
-# Modules to install in initramfs for early boot
-  INITRAMFS_MODULES=""
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
-# Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+  # Modules to install in initramfs for early boot
+    INITRAMFS_MODULES=""
diff --git a/projects/RPi/options b/projects/RPi/options
index dd2719e19f..d9329a5e75 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -1,359 +1,144 @@
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
-
-# short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
-
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREETING0="##############################################"
-  GREETING1="# OpenELEC - The living room PC for everyone #"
-  GREETING2="# ...... visit http://www.openelec.tv ...... #"
-  GREETING3="##############################################"
-  GREETING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
-
-# The TARGET_CPU variable controls which processor should be targeted for
-# generated code.
-  case $TARGET_ARCH in
-    i386)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx athlon-mp athlon-xp athlon-4
-      #               athlon-tbird athlon k6-3 k6-2 k6 geode
-      # (Intel CPUs)  atom core2 nocona prescott pentium4[m] pentium3[m]
-      #               pentium-m pentium2 pentiumpro pentium-mmx pentium
-      #               i686 i586 i486 i386
-      # (VIA CPUs)    c3 c3-2
-      #
-      TARGET_CPU="atom"
-      ;;
-
-    x86_64)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx amdfam10 barcelona
-      # (Intel CPUs)  atom core2 nocona
-      #
-      TARGET_CPU="atom"
-      ;;
-
-    arm)
-      # TARGET_CPU:
-      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
-      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
-      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
-      # arm720t arm740t strongarm strongarm110 strongarm1100
-      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
-      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
-      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
-      # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
-      # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
-      # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
-      #
-      TARGET_CPU="arm1176jzf-s"
-
-      # TARGET_FLOAT:
-      # Specifies which floating-point ABI to use. Permissible values are:
-      # soft softfp hard
-      TARGET_FLOAT="hard"
-
-      # TARGET_FPU:
-      # This specifies what floating point hardware (or hardware emulation) is
-      # available on the target. Permissible names are:
-      # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
-      # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
-      # neon-vfpv4.
-      TARGET_FPU="vfp"
-      ;;
-  esac
-
-# Build optimizations (size/normal)
-  OPTIMIZATIONS="size"
-
-# Project CFLAGS
-  PROJECT_CFLAGS=""
-
-# LTO (Link Time Optimization) support
-  LTO_SUPPORT="yes"
-
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="yes"
-
-# Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
-  BOOTLOADER="bcm2835-bootloader"
-
-# u-boot version to use (default)
-  UBOOT_VERSION="default"
-
-# Configuration for u-boot
-  UBOOT_CONFIG=""
-
-# Target Configfile for u-boot
-  UBOOT_CONFIGFILE=""
-
-# Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-  KERNEL_UBOOT_TARGET=""
-
-# Kernel extra targets to build
-  KERNEL_UBOOT_EXTRA_TARGET=""
-
-# Additional kernel make parameters (for example to specify the u-boot loadaddress)
-  KERNEL_MAKE_EXTRACMD=""
-
-# GCC to use. values can be:
-# default:  default mainline gcc
-  GCC_VERSION="4.7"
-
-# Kernel to use. values can be:
-# default:  default mainline kernel
-  LINUX="default"
-
-# use linux-next (latest rc) instead latest released version
-  LINUX_NEXT="no"
+################################################################################
+# setup system defaults
+################################################################################
 
-# SquashFS compression method (gzip / lzo / xz)
-  SQUASHFS_COMPRESSION="lzo"
+  # The TARGET_CPU variable controls which processor should be targeted for
+  # generated code.
+    case $TARGET_ARCH in
+      arm)
+        # TARGET_CPU:
+        # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+        # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+        # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+        # arm720t arm740t strongarm strongarm110 strongarm1100
+        # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+        # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+        # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+        # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
+        # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
+        # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+        TARGET_CPU="arm1176jzf-s"
 
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
+        # TARGET_FLOAT:
+        # Specifies which floating-point ABI to use. Permissible values are:
+        # soft softfp hard
+        TARGET_FLOAT="hard"
 
-# Skins to install (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
+        # TARGET_FPU:
+        # This specifies what floating point hardware (or hardware emulation) is
+        # available on the target. Permissible names are:
+        # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
+        # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
+        # neon-vfpv4.
+        TARGET_FPU="vfp"
+        ;;
+    esac
 
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
+  # Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
+    BOOTLOADER="bcm2835-bootloader"
 
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
+  # u-boot version to use (default)
+    UBOOT_VERSION="default"
 
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="no"
+  # Configuration for u-boot
+    UBOOT_CONFIG=""
 
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="no"
+  # Target Configfile for u-boot
+    UBOOT_CONFIGFILE=""
 
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="no"
+  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
+    KERNEL_UBOOT_TARGET=""
 
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
+  # Kernel extra targets to build
+    KERNEL_UBOOT_EXTRA_TARGET=""
 
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
+  # Additional kernel make parameters (for example to specify the u-boot loadaddress)
+    KERNEL_MAKE_EXTRACMD=""
 
-# build and install 'FishBMC' Visualization (yes / no)
-  # does not work on RPi
-  KODI_VIS_FISHBMC="no"
+  # Kernel to use. values can be:
+  # default:  default mainline kernel
+    LINUX="default"
 
-# build and install ALSA Audio support (yes / no)
-  ALSA_SUPPORT="yes"
 
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
+################################################################################
+# setup build defaults
+################################################################################
 
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
+  # Build optimizations (size/normal)
+    OPTIMIZATIONS="size"
 
-# build and install with non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
+  # Project CFLAGS
+    PROJECT_CFLAGS=""
 
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
+  # LTO (Link Time Optimization) support
+    LTO_SUPPORT="yes"
 
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
+  # GOLD (Google Linker) support
+    GOLD_SUPPORT="yes"
 
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
+  # SquashFS compression method (gzip / lzo / xz)
+    SQUASHFS_COMPRESSION="lzo"
 
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
 
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
+################################################################################
+# setup project defaults
+################################################################################
 
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
+  # build and install ALSA Audio support (yes / no)
+    ALSA_SUPPORT="yes"
 
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
+  # OpenGL(X) implementation to use (no / Mesa)
+    OPENGL="no"
 
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="bcm2835-driver"
 
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
+  # include uvesafb support (yes / no)
+    UVESAFB_SUPPORT="no"
 
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
+  # Displayserver to use (x11 / no)
+    DISPLAYSERVER="no"
 
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
+  # Windowmanager to use (ratpoison / fluxbox / none)
+    WINDOWMANAGER="none"
 
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
+  # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
+  # Space separated list is supported,
+  # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
+    GRAPHIC_DRIVERS=""
 
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+    KODIPLAYER_DRIVER="bcm2835-driver"
 
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
+  # Modules to install in initramfs for early boot
+    INITRAMFS_MODULES=""
 
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
+  # build and install ATV IR remote support (yes / no)
+    ATVCLIENT_SUPPORT="no"
 
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
+  # build and install IRServer IR/LCD support (yes / no)
+    IRSERVER_SUPPORT="no"
 
-# build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
-  KODI_AFP_SUPPORT="no"
+  # build with swap support (yes / no)
+    SWAP_SUPPORT="yes"
 
-# build with Samba Client (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
+  # swap support enabled per default (yes / no)
+    SWAP_ENABLED_DEFAULT="no"
 
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
+  # swapfile size if SWAP_SUPPORT=yes in MB
+    SWAPFILESIZE="128"
 
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
+  # build with installer (yes / no)
+    INSTALLER_SUPPORT="no"
 
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
+  # build and install 'RSXS' Screensaver (yes / no)
+    KODI_SCR_RSXS="no"
 
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
+  # build and install 'ProjectM' Visualization (yes / no)
+    KODI_VIS_PROJECTM="no"
 
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
+  # build and install 'GOOM' Visualization (yes / no)
+    KODI_VIS_GOOM="no"
 
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
-
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
-
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# OpenGL(X) implementation to use (no / Mesa)
-  OPENGL="no"
-
-# OpenGL-ES implementation to use (no / bcm2835-driver)
-  OPENGLES="bcm2835-driver"
-
-# Windowmanager to use (ratpoison / fluxbox / none)
-  WINDOWMANAGER="none"
-
-# include uvesafb support (yes / no)
-  UVESAFB_SUPPORT="no"
-
-# Displayserver to use (x11 / no)
-  DISPLAYSERVER="no"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-  GRAPHIC_DRIVERS=""
-
-# KODI Player implementation to use (default / bcm2835-driver)
-  KODIPLAYER_DRIVER="bcm2835-driver"
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="no"
-
-# build and install IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="no"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
-
-# Modules to install in initramfs for early boot
-  INITRAMFS_MODULES=""
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
-# Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="yes"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="128"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="no"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+  # build and install 'FishBMC' Visualization (yes / no)
+    KODI_VIS_FISHBMC="no"
diff --git a/projects/imx6/options b/projects/imx6/options
index 49f4b90dd9..20b77601b3 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -1,360 +1,145 @@
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
-
-# short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
-
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREETING0="##############################################"
-  GREETING1="# OpenELEC - The living room PC for everyone #"
-  GREETING2="# ...... visit http://www.openelec.tv ...... #"
-  GREETING3="##############################################"
-  GREETING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
-
-# The TARGET_CPU variable controls which processor should be targeted for
-# generated code.
-  case $TARGET_ARCH in
-    i386)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx athlon-mp athlon-xp athlon-4
-      #               athlon-tbird athlon k6-3 k6-2 k6 geode
-      # (Intel CPUs)  atom core2 nocona prescott pentium4[m] pentium3[m]
-      #               pentium-m pentium2 pentiumpro pentium-mmx pentium
-      #               i686 i586 i486 i386
-      # (VIA CPUs)    c3 c3-2
-      #
-      TARGET_CPU="atom"
-      ;;
-
-    x86_64)
-      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-      #               athlon-fx amdfam10 barcelona
-      # (Intel CPUs)  atom core2 nocona
-      #
-      TARGET_CPU="atom"
-      ;;
-
-    arm)
-      # TARGET_CPU:
-      # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
-      # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
-      # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
-      # arm720t arm740t strongarm strongarm110 strongarm1100
-      # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
-      # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
-      # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
-      # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
-      # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
-      # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
-      #
-      TARGET_CPU="cortex-a9"
-
-      # TARGET_FLOAT:
-      # Specifies which floating-point ABI to use. Permissible values are:
-      # soft softfp hard
-      TARGET_FLOAT="hard"
-
-      # TARGET_FPU:
-      # This specifies what floating point hardware (or hardware emulation) is
-      # available on the target. Permissible names are:
-      # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
-      # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
-      # neon-vfpv4.
-      TARGET_FPU="neon"
-      ;;
-  esac
-
-# Build optimizations (size/normal)
-  OPTIMIZATIONS="size"
-
-# Project CFLAGS
-  PROJECT_CFLAGS=""
-
-# LTO (Link Time Optimization) support
-  LTO_SUPPORT="yes"
-
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="yes"
-
-# Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
-  BOOTLOADER="u-boot"
-
-# u-boot version to use (default)
-  UBOOT_VERSION="imx6-cuboxi"
-
-# Configuration for u-boot
-  UBOOT_CONFIG="mx6_cubox-i_config"
-
-# Target Configfile for u-boot
-  UBOOT_CONFIGFILE=""
-
-# Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
-  KERNEL_UBOOT_TARGET="zImage"
-
-# Kernel extra targets to build
-  KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb imx6dl-cubox-i.dtb"
-  KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-hummingboard.dtb imx6dl-hummingboard.dtb"
-
-# Additional kernel make parameters (for example to specify the u-boot loadaddress)
-  KERNEL_MAKE_EXTRACMD=""
-
-# GCC to use. values can be:
-# default:  default mainline gcc
-  GCC_VERSION="4.7"
-
-# Kernel to use. values can be:
-# default:  default mainline kernel
-  LINUX="imx6"
-
-# use linux-next (latest rc) instead latest released version
-  LINUX_NEXT="no"
-
-# SquashFS compression method (gzip / lzo / xz)
-  SQUASHFS_COMPRESSION="gzip"
-
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
+################################################################################
+# setup system defaults
+################################################################################
 
-# Skins to install (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
+  # The TARGET_CPU variable controls which processor should be targeted for
+  # generated code.
+    case $TARGET_ARCH in
+      arm)
+        # TARGET_CPU:
+        # arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+        # arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
+        # arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
+        # arm720t arm740t strongarm strongarm110 strongarm1100
+        # strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
+        # arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
+        # arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
+        # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
+        # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
+        # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+        TARGET_CPU="cortex-a9"
 
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
+        # TARGET_FLOAT:
+        # Specifies which floating-point ABI to use. Permissible values are:
+        # soft softfp hard
+        TARGET_FLOAT="hard"
 
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
+        # TARGET_FPU:
+        # This specifies what floating point hardware (or hardware emulation) is
+        # available on the target. Permissible names are:
+        # fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
+        # vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
+        # neon-vfpv4.
+        TARGET_FPU="neon"
+        ;;
+    esac
 
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="no"
+  # Bootloader to use (syslinux / u-boot / bcm2835-bootloader)
+    BOOTLOADER="u-boot"
 
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="no"
+  # u-boot version to use (default)
+    UBOOT_VERSION="imx6-cuboxi"
 
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="no"
+  # Configuration for u-boot
+    UBOOT_CONFIG="mx6_cubox-i_config"
 
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
+  # Target Configfile for u-boot
+    UBOOT_CONFIGFILE=""
 
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
+  # Kernel target for u-boot (default 'uImage' if BOOTLOADER=u-boot) (uImage / zImage)
+    KERNEL_UBOOT_TARGET="zImage"
 
-# build and install 'FishBMC' Visualization (yes / no)
-  # does not work on RPi
-  KODI_VIS_FISHBMC="no"
+  # Kernel extra targets to build
+    KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb imx6dl-cubox-i.dtb"
+    KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-hummingboard.dtb imx6dl-hummingboard.dtb"
 
-# build and install ALSA Audio support (yes / no)
-  ALSA_SUPPORT="yes"
+  # Additional kernel make parameters (for example to specify the u-boot loadaddress)
+    KERNEL_MAKE_EXTRACMD=""
 
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
+  # Kernel to use. values can be:
+  # default:  default mainline kernel
+    LINUX="imx6"
 
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
 
-# build and install with non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
+################################################################################
+# setup build defaults
+################################################################################
 
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
+  # Build optimizations (size/normal)
+    OPTIMIZATIONS="size"
 
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
+  # Project CFLAGS
+    PROJECT_CFLAGS=""
 
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
+  # LTO (Link Time Optimization) support
+    LTO_SUPPORT="yes"
 
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
+  # GOLD (Google Linker) support
+    GOLD_SUPPORT="yes"
 
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU dvbhdhomerun"
+  # SquashFS compression method (gzip / lzo / xz)
+    SQUASHFS_COMPRESSION="gzip"
 
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
 
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
+################################################################################
+# setup project defaults
+################################################################################
 
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
+  # build and install ALSA Audio support (yes / no)
+    ALSA_SUPPORT="yes"
 
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
+  # OpenGL(X) implementation to use (no / Mesa)
+    OPENGL="no"
 
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
+  # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
+    OPENGLES="gpu-viv-bin-mx6q"
 
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
+  # include uvesafb support (yes / no)
+    UVESAFB_SUPPORT="no"
 
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
+  # Displayserver to use (x11 / no)
+    DISPLAYSERVER="no"
 
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
+  # Windowmanager to use (ratpoison / fluxbox / none)
+    WINDOWMANAGER="none"
 
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
+  # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
+  # Space separated list is supported,
+  # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
+    GRAPHIC_DRIVERS=""
 
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
+  # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
+    KODIPLAYER_DRIVER="libfslvpuwrap"
 
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
+  # Modules to install in initramfs for early boot
+    INITRAMFS_MODULES=""
 
-# build with afpfs-ng support (mounting AFP shares with KODI) (yes / no)
-  KODI_AFP_SUPPORT="no"
+  # build and install ATV IR remote support (yes / no)
+    ATVCLIENT_SUPPORT="no"
 
-# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
+  # build and install IRServer IR/LCD support (yes / no)
+    IRSERVER_SUPPORT="no"
 
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
+  # build with swap support (yes / no)
+    SWAP_SUPPORT="no"
 
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
+  # swap support enabled per default (yes / no)
+    SWAP_ENABLED_DEFAULT="no"
 
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
+  # swapfile size if SWAP_SUPPORT=yes in MB
+    SWAPFILESIZE="128"
 
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
+  # build with installer (yes / no)
+    INSTALLER_SUPPORT="no"
 
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
+  # build and install 'RSXS' Screensaver (yes / no)
+    KODI_SCR_RSXS="no"
 
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
+  # build and install 'ProjectM' Visualization (yes / no)
+    KODI_VIS_PROJECTM="no"
 
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
+  # build and install 'GOOM' Visualization (yes / no)
+    KODI_VIS_GOOM="no"
 
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# OpenGL(X) implementation to use (no / Mesa)
-  OPENGL="no"
-
-# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
-  OPENGLES="gpu-viv-bin-mx6q"
-
-# Windowmanager to use (ratpoison / fluxbox / none)
-  WINDOWMANAGER="none"
-
-# include uvesafb support (yes / no)
-  UVESAFB_SUPPORT="no"
-
-# Displayserver to use (x11 / no)
-  DISPLAYSERVER="no"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-  GRAPHIC_DRIVERS=""
-
-# KODI Player implementation to use (default / bcm2835-driver)
-  KODIPLAYER_DRIVER="libfslvpuwrap"
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="no"
-
-# build and install IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="no"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428"
-
-# Modules to install in initramfs for early boot
-  INITRAMFS_MODULES=""
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
-# Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="128"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="no"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+  # build and install 'FishBMC' Visualization (yes / no)
+    KODI_VIS_FISHBMC="no"