--- a/skin.xeebo/720p/DialogNumeric.xml
+++ b/skin.xeebo/720p/DialogNumeric.xml
@@ -16,7 +16,7 @@
 					<posy>0</posy>
 					<width>968</width>
 					<height>504</height>
-					<texture>keyboard_oneline_background.png</texture>
+					<texture>keyboard/keyboard_oneline_background.png</texture>
 					<visible>!Window.IsVisible(virtualkeyboard)</visible>
 				</control>
 				<control type="label" id="1">
@@ -37,7 +37,7 @@
 					<posy>70</posy>
 					<height>60</height>
 					<width>672</width>
-					<texture border="12">keyboard_input_field_numeric.png</texture>
+					<texture border="12">keyboard/keyboard_input_field_numeric.png</texture>
 				</control>
 				<control type="label" id="4">
 					<description>Edit Text</description>
@@ -59,7 +59,7 @@
 						<description>'Q' button</description>
 						<posx>12</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -67,7 +67,7 @@
 						<description>'W' button</description>
 						<posx>80</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -75,7 +75,7 @@
 						<description>'E' button</description>
 						<posx>148</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -83,7 +83,7 @@
 						<description>'R' button</description>
 						<posx>216</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -91,7 +91,7 @@
 						<description>'T' button</description>
 						<posx>284</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -99,7 +99,7 @@
 						<description>'Y' button</description>
 						<posx>352</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -107,7 +107,7 @@
 						<description>'U' button</description>
 						<posx>420</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -115,7 +115,7 @@
 						<description>'I' button</description>
 						<posx>488</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -123,7 +123,7 @@
 						<description>'O' button</description>
 						<posx>556</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -131,7 +131,7 @@
 						<description>'P' button</description>
 						<posx>624</posx>
 						<posy>12</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -139,7 +139,7 @@
 						<description>CAPS LOCK button</description>
 						<posx>12</posx>
 						<posy>80</posy>
-						<texture border="20">keyboard_button_off.png</texture>
+						<texture border="20">keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -147,7 +147,7 @@
 						<description>'A' button</description>
 						<posx>80</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -155,7 +155,7 @@
 						<description>'S' button</description>
 						<posx>148</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -163,7 +163,7 @@
 						<description>'D' button</description>
 						<posx>216</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -171,7 +171,7 @@
 						<description>'F' button</description>
 						<posx>284</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -179,7 +179,7 @@
 						<description>'G' button</description>
 						<posx>352</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -187,7 +187,7 @@
 						<description>'H' button</description>
 						<posx>420</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -195,7 +195,7 @@
 						<description>'J' button</description>
 						<posx>488</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -203,7 +203,7 @@
 						<description>'K' button</description>
 						<posx>556</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -211,7 +211,7 @@
 						<description>'L' button</description>
 						<posx>624</posx>
 						<posy>80</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -219,7 +219,7 @@
 						<description>Shift button</description>
 						<posx>12</posx>
 						<posy>148</posy>
-						<texture border="20">keyboard_button_off.png</texture>
+						<texture border="20">keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -227,7 +227,7 @@
 						<description>'Z' button</description>
 						<posx>80</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -235,7 +235,7 @@
 						<description>'X' button</description>
 						<posx>148</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -243,7 +243,7 @@
 						<description>'C' button</description>
 						<posx>216</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -251,7 +251,7 @@
 						<description>'V' button</description>
 						<posx>284</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -259,7 +259,7 @@
 						<description>'B' button</description>
 						<posx>352</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -267,7 +267,7 @@
 						<description>'N' button</description>
 						<posx>420</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -275,7 +275,7 @@
 						<description>'M' button</description>
 						<posx>488</posx>
 						<posy>148</posy>
-						<texture>keyboard_button_off.png</texture>
+						<texture>keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 						<include>Common_Keyboard_Button</include>
 					</control>
@@ -290,8 +290,8 @@
 						<onright>17</onright>
 						<onup>-</onup>
 						<ondown>330</ondown>
-						<texturenofocus>keyboard_backspace.png</texturenofocus>
-						<texturefocus>keyboard_backspace_on.png</texturefocus>
+						<texturenofocus>keyboard/keyboard_backspace.png</texturenofocus>
+						<texturefocus>keyboard/keyboard_backspace_on.png</texturefocus>
 						<align>center</align>
 						<aligny>center</aligny>
 						<font>font23b</font>
@@ -305,7 +305,7 @@
 						<posy>216</posy>
 						<width>196</width>
 						<height>60</height>
-						<texture border="20">keyboard_button_off.png</texture>
+						<texture border="20">keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 					</control>
 					<control type="image">
@@ -314,7 +314,7 @@
 						<posy>216</posy>
 						<width>264</width>
 						<height>60</height>
-						<texture border="20">keyboard_button_off.png</texture>
+						<texture border="20">keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 					</control>
 					<control type="image">
@@ -323,7 +323,7 @@
 						<posy>216</posy>
 						<width>196</width>
 						<height>60</height>
-						<texture border="20">keyboard_button_off.png</texture>
+						<texture border="20">keyboard/keyboard_button_off.png</texture>
 						<colordiffuse>99FFFFFF</colordiffuse>
 					</control>
 					<control type="button" id="11">
@@ -471,8 +471,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>
 						<onclick>Close</onclick>
@@ -502,8 +502,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" />