diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
index da465eb0e3..997d2bc294 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
@@ -15,8 +15,11 @@
 	<string id="2122">Netwerk apparaat of MAC adres</string>
 	<string id="2130">IP instelling</string>
 	<string id="2131">Statisch IP adres</string>
-	<string id="2132">Netwerk gateway</string>
-	<string id="2133">DNS servers (gescheiden met ';')</string>
+	<string id="2132">Netmask Prefixlength</string>
+	<string id="2133">Netwerk gateway</string>
+	<string id="2134">DNS servers 1</string>
+	<string id="2135">DNS servers 2</string>
+	<string id="2136">DNS servers 3</string>
 	<string id="2150">WLAN Instellingen</string>
 	<string id="2151">WLAN SSID (router naam)</string>
 	<string id="2152">WLAN beveiliging</string>
@@ -46,7 +49,7 @@
 	<string id="5122">Gebruikersnaam</string>
 	<string id="5123">Wachtwoord</string>
 	<string id="5130">Netwerk instellingen</string>
-	<string id="5131">Toegestane IP adressen (gescheiden met een ",")</string>
+	<string id="5131">Toegestane IP adressen (gescheiden met een ',')</string>
 
 	<!-- SABnzbd -->
 	<string id="5200">SABnzbd</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index 323f7c0f88..25f8faf1bc 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -12,11 +12,14 @@
 	<string id="2111">Hostname</string>
 	<string id="2120">Network Adapter</string>
 	<string id="2121">Network Technology</string>
-	<string id="2122">Network name or MAC address</string>
+	<string id="2122">Network Interface</string>
 	<string id="2130">IP settings</string>
 	<string id="2131">Static IP address</string>
-	<string id="2132">Network gateway</string>
-	<string id="2133">DNS servers (semicolon seperated)</string>
+	<string id="2132">Netmask Prefixlength</string>
+	<string id="2133">Network gateway</string>
+	<string id="2134">DNS server 1</string>
+	<string id="2135">DNS server 2</string>
+	<string id="2136">DNS server 3</string>
 	<string id="2150">WLAN settings</string>
 	<string id="2151">WLAN SSID</string>
 	<string id="2152">WLAN Security</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
index 950ac49f6b..967cd3e327 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
@@ -11,12 +11,15 @@
 	<string id="2110">Général</string>
 	<string id="2111">Nom d'hote</string>
 	<string id="2120">Réseau</string>
-	<string id="2121">Interface réseau</string>
-	<string id="2122">Nom réseau ou adresse MAC</string>
+	<string id="2121">Type de réseau</string>
+	<string id="2122">Interface réseau</string>
 	<string id="2130">Paramètes IP</string>
 	<string id="2131">Adresse IP statique</string>
-	<string id="2132">Passerelle Réseau</string>
-	<string id="2133">Serveurs DNS (séparés par des virgules)</string>
+	<string id="2132">Netmask Prefixlength</string>
+	<string id="2133">Passerelle Réseau</string>
+	<string id="2134">Serveurs DNS 1</string>
+	<string id="2135">Serveurs DNS 2</string>
+	<string id="2136">Serveurs DNS 3</string>
 	<string id="2150">Paramètres WIFI</string>
 	<string id="2151">SSID</string>
 	<string id="2152">Sécurité WIFI</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index e666a7e6a3..f20988c06c 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -4,61 +4,76 @@
    <!-- UPDATE -->
 	<category label="2000">
 		<setting label="2010" type="lsep"/>
-		<setting id="UPDATE_AUTO" type="labelenum" label="2011" values="no|manually|auto" default="manually" />
+		<setting type="sep" />
+		<setting id="UPDATE_AUTO" type="labelenum" label="2011" values="no|manually|auto" sort="yes" default="manually" />
     </category>
 
    <!-- Network -->
 	<category label="2100">
 		<setting label="2110" type="lsep"/>
-		<setting id="NET_HOSTNAME" type="text" label="2111" default=""/>
+		<setting type="sep" />
+		<setting id="NET_HOSTNAME" type="text" label="2111" default="openelec"/>
 		<setting label="2120" type="lsep"/>
-		<setting id="NET_NETWORK" type="labelenum" label="2121" values="LAN|WLAN" default="LAN" />
-		<setting id="NET_IFACE" type="text" label="2122" default=""/>
+		<setting type="sep" />
+		<setting id="NET_NETWORK" type="labelenum" label="2121" values="LAN|WLAN" sort="yes" default="LAN" />
+		<setting id="NET_IFACE" type="labelenum" label="2122" values="eth0|eth1|wlan0|wlan1" sort="yes" default="eth0"/>
 		<setting label="2130" type="lsep"/>
-		<setting id="NET_IPADDRESS" type="text" label="2131" default=""/>
-		<setting id="NET_GATEWAY" type="text" label="2132" default=""/>
-		<setting id="NET_NAMESERVER" type="text" label="2133" default=""/>
+		<setting type="sep" />
+		<setting id="NET_IPADDRESS" type="ipaddress" label="2131" default=""/>
+		<setting id="NET_PREFIXLEN" type="labelenum" label="2132" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32" sort="yes" default="24"/>
+		<setting id="NET_GATEWAY" type="ipaddress" label="2133" default=""/>
+		<setting id="NET_DNS1" type="ipaddress" label="2134" default=""/>
+		<setting id="NET_DNS2" type="ipaddress" label="2135" default=""/>
+		<setting id="NET_DNS3" type="ipaddress" label="2136" default=""/>
 		<setting label="2150" type="lsep"/>
+		<setting type="sep" />
 		<setting id="NET_SSID" type="text" label="2151" default=""/>
-		<setting id="NET_SECURITY" type="labelenum" label="2152" values="NONE|WEP|PSK" default="NONE" />
-		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2153" default="" />
+		<setting id="NET_SECURITY" type="labelenum" label="2152" values="NONE|PSK|WEP" sort="yes" default="NONE" />
+		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2153" default=""  enable="!eq(-1,0)"/>
     </category>
 
    <!-- LCD -->
 	<category label="3100">
 		<setting label="3110" type="lsep"/>
-		<setting id="LCD_DRIVER" type="labelenum" label="3111" values="none|irtrans|imon" default="none" />
+		<setting type="sep" />
+		<setting id="LCD_DRIVER" type="labelenum" label="3111" values="none|irtrans|imon" sort="yes" default="none" />
     </category>
 
    <!-- TV-SERVER -->
 	<category label="4100">
 		<setting label="4110" type="lsep"/>
-		<setting id="TVHEADEND_START" type="labelenum" label="4111" values="yes|no" default="no" />
+		<setting type="sep" />
+		<setting id="TVHEADEND_START" type="bool" label="4111" default="false" />
     </category>
 
    <!-- SAMBA -->
     <category label="5000">
 		<setting label="5010" type="lsep"/>
-		<setting id="SAMBA_START" type="labelenum" label="5011" values="yes|no" default="yes"/>
+		<setting type="sep" />
+		<setting id="SAMBA_START" type="bool" label="5011" default="true" />
     </category>
 
    <!-- Transmission -->
     <category label="5100">
 		<setting label="5110" type="lsep"/>
-		<setting id="TRANSMISSION_START" type="labelenum" label="5111" values="yes|no" default="no"/>
+		<setting type="sep" />
+		<setting id="TRANSMISSION_START" type="bool" label="5111" default="false" />
 
 		<setting label="5120" type="lsep"/>
-		<setting id="TRANSMISSION_AUTH" type="labelenum" label="5121" values="yes|no" default="yes"/>
-		<setting id="TRANSMISSION_USER" type="text" label="5122" default="openelec"/>
-		<setting id="TRANSMISSION_PWD" type="text" label="5123" default="openelec"/>
+		<setting type="sep" />
+		<setting id="TRANSMISSION_AUTH" type="bool" label="5121" default="false" />
+		<setting id="TRANSMISSION_USER" type="text" label="5122" default="openelec" enable="eq(-1,true)"/>
+		<setting id="TRANSMISSION_PWD" type="text" label="5123" default="openelec" enable="eq(-2,true)"/>
 
 		<setting label="5130" type="lsep"/>
+		<setting type="sep" />
 		<setting id="TRANSMISSION_IP" type="text" label="5131" default=""/>
     </category>
 
    <!-- SABnzbd -->
     <category label="5200">
 		<setting label="5210" type="lsep"/>
-		<setting id="SABNZBD_START" type="labelenum" label="5211" values="yes|no" default="no"/>
+		<setting type="sep" />
+		<setting id="SABNZBD_START" type="bool" label="5211" default="false" />
 	</category>
 </settings>