--- a/skin.xeebo/720p/DialogNetworkSetup.xml
+++ b/skin.xeebo/720p/DialogNetworkSetup.xml
@@ -12,7 +12,7 @@
 				<posy>0</posy>
 				<width>900</width>
 				<height>520</height>
-				<texture>browser_background.png</texture>
+				<texture>backgrounds/background.png</texture>
 			</control>
 			<control type="label" id="1">
 				<description>heading label</description>
@@ -32,12 +32,12 @@
 				<posy>70</posy>
 				<width>850</width>
 				<height>44</height>
-				<texturefocus>line_frame_device_white.png</texturefocus>
-				<texturenofocus>line_frame_device_black1.png</texturenofocus>
-				<textureup>scroll_up.png</textureup>
-				<texturedown>scroll_down.png</texturedown>
-				<textureupfocus>settings_arrow_button_up.png</textureupfocus>
-				<texturedownfocus>settings_arrow_button_down.png</texturedownfocus>
+				<texturefocus>views/line_frame_device_white.png</texturefocus>
+				<texturenofocus>views/line_frame_device_black.png</texturenofocus>
+				<textureup>icons/scroll_up.png</textureup>
+				<texturedown>icons/scroll_down.png</texturedown>
+				<textureupfocus>icons/settings_arrow_button_up.png</textureupfocus>
+				<texturedownfocus>icons/settings_arrow_button_down.png</texturedownfocus>
 				<font>font21</font>
 				<textcolor>white</textcolor>
 				<focusedcolor>black</focusedcolor>
@@ -61,11 +61,11 @@
 				<aligny>center</aligny>
 				<selectedcolor>black</selectedcolor>
 				<textcolor>black</textcolor>
-				<disabledcolor>medgrey</disabledcolor>
-				<textoffsetx>10</textoffsetx>
-				<aligny>center</aligny>
-				<texturefocus border="10">keyboard_input_field_on.png</texturefocus>
-				<texturenofocus border="10">keyboard_input_field_off.png</texturenofocus>
+				<disabledcolor>lightgrey</disabledcolor>
+				<textoffsetx>10</textoffsetx>
+				<aligny>center</aligny>
+				<texturefocus border="10">keyboard/keyboard_input_field_on.png</texturefocus>
+				<texturenofocus border="10">keyboard/keyboard_input_field_off.png</texturenofocus>
 				<label>-</label>
 				<onup>10</onup>
 				<onleft>-</onleft>
@@ -77,7 +77,7 @@
 				<posy>125</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_off.png</texture>
+				<texture>buttons/keyboard_off.png</texture>
 				<visible>!Control.HasFocus(11)</visible>
 			</control>
 			<control type="image">
@@ -85,7 +85,7 @@
 				<posy>125</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_on.png</texture>
+				<texture>buttons/keyboard_on.png</texture>
 				<visible>Control.HasFocus(11)</visible>
 			</control>
 			<control type="button" id="16">
@@ -98,11 +98,11 @@
 				<aligny>center</aligny>
 				<selectedcolor>black</selectedcolor>
 				<textcolor>black</textcolor>
-				<disabledcolor>medgrey</disabledcolor>
-				<textoffsetx>10</textoffsetx>
-				<aligny>center</aligny>
-				<texturefocus border="10">keyboard_input_field_on.png</texturefocus>
-				<texturenofocus border="10">keyboard_input_field_off.png</texturenofocus>
+				<disabledcolor>lightgrey</disabledcolor>
+				<textoffsetx>10</textoffsetx>
+				<aligny>center</aligny>
+				<texturefocus border="10">keyboard/keyboard_input_field_on.png</texturefocus>
+				<texturenofocus border="10">keyboard/keyboard_input_field_off.png</texturenofocus>
 				<label>-</label>
 				<onup>11</onup>
 				<onleft>-</onleft>
@@ -114,7 +114,7 @@
 				<posy>175</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_off.png</texture>
+				<texture>buttons/keyboard_off.png</texture>
 				<visible>!Control.HasFocus(16)</visible>
 			</control>
 			<control type="image">
@@ -122,7 +122,7 @@
 				<posy>175</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_on.png</texture>
+				<texture>buttons/keyboard_on.png</texture>
 				<visible>Control.HasFocus(16)</visible>
 			</control>
 			<control type="button" id="13">
@@ -135,11 +135,11 @@
 				<aligny>center</aligny>
 				<selectedcolor>black</selectedcolor>
 				<textcolor>black</textcolor>
-				<disabledcolor>medgrey</disabledcolor>
-				<textoffsetx>10</textoffsetx>
-				<aligny>center</aligny>
-				<texturefocus border="10">keyboard_input_field_on.png</texturefocus>
-				<texturenofocus border="10">keyboard_input_field_off.png</texturenofocus>
+				<disabledcolor>lightgrey</disabledcolor>
+				<textoffsetx>10</textoffsetx>
+				<aligny>center</aligny>
+				<texturefocus border="10">keyboard/keyboard_input_field_on.png</texturefocus>
+				<texturenofocus border="10">keyboard/keyboard_input_field_off.png</texturenofocus>
 				<label>1013</label>
 				<onup>16</onup>
 				<onleft>-</onleft>
@@ -151,7 +151,7 @@
 				<posy>225</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_off.png</texture>
+				<texture>buttons/keyboard_off.png</texture>
 				<visible>!Control.HasFocus(13)</visible>
 			</control>
 			<control type="image">
@@ -159,7 +159,7 @@
 				<posy>225</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_on.png</texture>
+				<texture>buttons/keyboard_on.png</texture>
 				<visible>Control.HasFocus(13)</visible>
 			</control>
 			<control type="button" id="14">
@@ -172,11 +172,11 @@
 				<aligny>center</aligny>
 				<selectedcolor>black</selectedcolor>
 				<textcolor>black</textcolor>
-				<disabledcolor>medgrey</disabledcolor>
-				<textoffsetx>10</textoffsetx>
-				<aligny>center</aligny>
-				<texturefocus border="10">keyboard_input_field_on.png</texturefocus>
-				<texturenofocus border="10">keyboard_input_field_off.png</texturenofocus>
+				<disabledcolor>lightgrey</disabledcolor>
+				<textoffsetx>10</textoffsetx>
+				<aligny>center</aligny>
+				<texturefocus border="10">keyboard/keyboard_input_field_on.png</texturefocus>
+				<texturenofocus border="10">keyboard/keyboard_input_field_off.png</texturenofocus>
 				<label>1014</label>
 				<onup>13</onup>
 				<onleft>-</onleft>
@@ -188,7 +188,7 @@
 				<posy>275</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_off.png</texture>
+				<texture>buttons/keyboard_off.png</texture>
 				<visible>!Control.HasFocus(14)</visible>
 			</control>
 			<control type="image">
@@ -196,7 +196,7 @@
 				<posy>275</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_on.png</texture>
+				<texture>buttons/keyboard_on.png</texture>
 				<visible>Control.HasFocus(14)</visible>
 			</control>
 			<control type="button" id="15">
@@ -209,11 +209,11 @@
 				<aligny>center</aligny>
 				<selectedcolor>black</selectedcolor>
 				<textcolor>black</textcolor>
-				<disabledcolor>medgrey</disabledcolor>
-				<textoffsetx>10</textoffsetx>
-				<aligny>center</aligny>
-				<texturefocus border="10">keyboard_input_field_on.png</texturefocus>
-				<texturenofocus border="10">keyboard_input_field_off.png</texturenofocus>
+				<disabledcolor>lightgrey</disabledcolor>
+				<textoffsetx>10</textoffsetx>
+				<aligny>center</aligny>
+				<texturefocus border="10">keyboard/keyboard_input_field_on.png</texturefocus>
+				<texturenofocus border="10">keyboard/keyboard_input_field_off.png</texturenofocus>
 				<label>15052</label>
 				<onup>14</onup>
 				<onleft>-</onleft>
@@ -225,7 +225,7 @@
 				<posy>325</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_off.png</texture>
+				<texture>buttons/keyboard_off.png</texture>
 				<visible>!Control.HasFocus(15)</visible>
 			</control>
 			<control type="image">
@@ -233,7 +233,7 @@
 				<posy>325</posy>
 				<width>44</width>
 				<height>44</height>
-				<texture>button_keyboard_on.png</texture>
+				<texture>buttons/keyboard_on.png</texture>
 				<visible>Control.HasFocus(15)</visible>
 			</control>
 
@@ -249,8 +249,8 @@
 					<description>Cancel Button</description>
 					<width>33</width>
 					<height>33</height>
-					<texturefocus>icon_cancel_on.png</texturefocus>
-					<texturenofocus>icon_cancel.png</texturenofocus>
+					<texturefocus>icons/icon_cancel_on.png</texturefocus>
+					<texturenofocus>icons/icon_cancel.png</texturenofocus>
 					<font>-</font>
 					<onleft>-</onleft>
 					<hitrect x="0" y="0" w="100" h="33" />
@@ -279,8 +279,8 @@
 					<description>OK Button</description>
 					<width>33</width>
 					<height>33</height>
-					<texturefocus>icon_ok_on.png</texturefocus>
-					<texturenofocus>icon_ok.png</texturenofocus>
+					<texturefocus>icons/icon_ok_on.png</texturefocus>
+					<texturenofocus>icons/icon_ok.png</texturenofocus>
 					<font>-</font>
 					<onright>-</onright>
 					<hitrect x="0" y="0" w="100" h="33" />