--- a/skin.xeebo/720p/DialogAddonInfo.xml
+++ b/skin.xeebo/720p/DialogAddonInfo.xml
@@ -15,7 +15,7 @@
 				<control type="image">
 					<description>page header tab icon</description>
 					<include>Common_Title_Image</include>
-					<texture>icon_addon.png</texture>
+					<texture>icons/icon_addon.png</texture>
 				</control>
 				<control type="label">
 					<description>Movies/Shows Title</description>
@@ -55,10 +55,10 @@
 						<onleft>-</onleft>
 						<label>24038</label>
 						<altlabel>24037</altlabel>
-						<texturenofocus>button_info_install.png</texturenofocus>
-						<texturefocus>button_info_install_on.png</texturefocus>
-						<alttexturenofocus>button_info_uninstall.png</alttexturenofocus>
-						<alttexturefocus>button_info_uninstall_on.png</alttexturefocus>
+						<texturenofocus>buttons/info_install.png</texturenofocus>
+						<texturefocus>buttons/info_install_on.png</texturefocus>
+						<alttexturenofocus>buttons/info_uninstall.png</alttexturenofocus>
+						<alttexturefocus>buttons/info_uninstall_on.png</alttexturefocus>
 						<font>-</font>
 						<usealttexture>StringCompare(Control.GetLabel(6),$LOCALIZE[24037])</usealttexture>
 						<visible>Control.IsEnabled(6)</visible>
@@ -96,49 +96,49 @@
 						<height>33</height>
 						<label>24022</label>
 						<altlabel>24021</altlabel>
-						<texturenofocus>dotted_line_divider.png</texturenofocus>
-						<texturefocus>dotted_line_divider.png</texturefocus>
+						<texturenofocus>icons/dotted_line_divider.png</texturenofocus>
+						<texturefocus>icons/dotted_line_divider.png</texturefocus>
 						<font>-</font>
 						<visible>Control.IsEnabled(7)</visible>
 						<hitrect x="0" y="0" w="100" h="33" />
 					</control>
-					<control type="image" id="37">
+					<control type="image" id="22">
 						<description>Enable/Disable Addon image</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texture>button_info_disable_on.png</texture>
+						<texture>buttons/info_disable_on.png</texture>
 						<visible>Control.IsEnabled(7) + Control.HasFocus(7) + StringCompare(Control.GetLabel(7),$LOCALIZE[24021])</visible>
 					</control>
-					<control type="image" id="38">
+					<control type="image" id="23">
 						<description>Enable/Disable Addon image</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texture>button_info_disable.png</texture>
+						<texture>buttons/info_disable.png</texture>
 						<visible>Control.IsEnabled(7) + !Control.HasFocus(7) + StringCompare(Control.GetLabel(7),$LOCALIZE[24021])</visible>
 					</control>
-					<control type="image" id="39">
+					<control type="image" id="24">
 						<description>Enable/Disable Addon image</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texture>button_info_enable_on.png</texture>
+						<texture>buttons/info_enable_on.png</texture>
 						<visible>Control.IsEnabled(7) + Control.HasFocus(7) + !StringCompare(Control.GetLabel(7),$LOCALIZE[24021])</visible>
 					</control>
-					<control type="image" id="40">
+					<control type="image" id="25">
 						<description>Enable/Disable Addon image</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texture>button_info_enable.png</texture>
+						<texture>buttons/info_enable.png</texture>
 						<visible>Control.IsEnabled(7) + !Control.HasFocus(7) + !StringCompare(Control.GetLabel(7),$LOCALIZE[24021])</visible>
 					</control>
-					<control type="label" id="23">
+					<control type="label" id="26">
 						<description>Enable/Disable Addon label</description>
 						<visible>Control.IsEnabled(7) + !Control.HasFocus(7)</visible>
 						<posx>0</posx>
@@ -150,7 +150,7 @@
 						<textcolor>grey</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="label" id="24">
+					<control type="label" id="27">
 						<description>Enable/Disable Addon label</description>
 						<visible>Control.IsEnabled(7) + Control.HasFocus(7)</visible>
 						<posx>0</posx>
@@ -162,13 +162,13 @@
 						<textcolor>green</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="image" id="25">
+					<control type="image" id="28">
 						<description>left dotted line</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>3</width>
 						<height>33</height>
-						<texture>dotted_line_divider.png</texture>
+						<texture>icons/dotted_line_divider.png</texture>
 						<visible>Control.IsEnabled(6)</visible>
 					</control>
 					<control type="button" id="9">
@@ -177,13 +177,13 @@
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texturenofocus>button_info_settings.png</texturenofocus>
-						<texturefocus>button_info_settings_on.png</texturefocus>
+						<texturenofocus>buttons/info_settings.png</texturenofocus>
+						<texturefocus>buttons/info_settings_on.png</texturefocus>
 						<font>-</font>
 						<visible>Control.IsEnabled(9)</visible>
 						<hitrect x="0" y="0" w="100" h="33" />
 					</control>
-					<control type="label" id="26">
+					<control type="label" id="29">
 						<description>Addon Settings label</description>
 						<visible>Control.IsEnabled(9) + !Control.HasFocus(9)</visible>
 						<posx>0</posx>
@@ -195,7 +195,7 @@
 						<textcolor>grey</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="label" id="27">
+					<control type="label" id="30">
 						<description>Addon Settings label</description>
 						<visible>Control.IsEnabled(9) + Control.HasFocus(9)</visible>
 						<posx>0</posx>
@@ -207,13 +207,13 @@
 						<textcolor>green</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="image" id="28">
+					<control type="image" id="31">
 						<description>left dotted line</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>3</width>
 						<height>33</height>
-						<texture>dotted_line_divider.png</texture>
+						<texture>icons/dotted_line_divider.png</texture>
 						<visible>Control.IsEnabled(9)</visible>
 					</control>
 					<control type="button" id="8">
@@ -222,13 +222,13 @@
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texturenofocus>button_info_refresh.png</texturenofocus>
-						<texturefocus>button_info_refresh_on.png</texturefocus>
+						<texturenofocus>buttons/info_refresh.png</texturenofocus>
+						<texturefocus>buttons/info_refresh_on.png</texturefocus>
 						<font>-</font>
 						<visible>Control.IsEnabled(8)</visible>
 						<hitrect x="0" y="0" w="100" h="33" />
 					</control>
-					<control type="label" id="29">
+					<control type="label" id="32">
 						<description>thumb label</description>
 						<visible>Control.IsEnabled(8) + !Control.HasFocus(8)</visible>
 						<posx>0</posx>
@@ -240,7 +240,7 @@
 						<textcolor>grey</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="label" id="30">
+					<control type="label" id="33">
 						<description>thumb label</description>
 						<visible>Control.IsEnabled(8) + Control.HasFocus(8)</visible>
 						<posx>0</posx>
@@ -252,13 +252,13 @@
 						<textcolor>green</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="image" id="31">
+					<control type="image" id="34">
 						<description>left dotted line</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>3</width>
 						<height>33</height>
-						<texture>dotted_line_divider.png</texture>
+						<texture>icons/dotted_line_divider.png</texture>
 						<visible>Control.IsEnabled(8)</visible>
 					</control>
 					<control type="button" id="10">
@@ -267,13 +267,13 @@
 						<posy>0</posy>
 						<width>33</width>
 						<height>33</height>
-						<texturenofocus>button_info_plot.png</texturenofocus>
-						<texturefocus>button_info_plot_on.png</texturefocus>
+						<texturenofocus>buttons/info_plot.png</texturenofocus>
+						<texturefocus>buttons/info_plot_on.png</texturefocus>
 						<font>-</font>
 						<visible>Control.IsEnabled(10)</visible>
 						<hitrect x="0" y="0" w="100" h="33" />
 					</control>
-					<control type="label" id="32">
+					<control type="label" id="35">
 						<description>Changelog label</description>
 						<visible>Control.IsEnabled(10) + !Control.HasFocus(10)</visible>
 						<posx>0</posx>
@@ -285,7 +285,7 @@
 						<textcolor>grey</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="label" id="33">
+					<control type="label" id="36">
 						<description>Changelog label</description>
 						<visible>Control.IsEnabled(10) + Control.HasFocus(10)</visible>
 						<posx>0</posx>
@@ -297,14 +297,59 @@
 						<textcolor>green</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="image" id="34">
+					<control type="image" id="37">
 						<description>left dotted line</description>
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>3</width>
 						<height>33</height>
-						<texture>dotted_line_divider.png</texture>
+						<texture>icons/dotted_line_divider.png</texture>
 						<visible>Control.IsEnabled(10)</visible>
+					</control>
+					<control type="button" id="11">
+						<description>Rollback button</description>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>33</width>
+						<height>33</height>
+						<texturenofocus>buttons/info_return.png</texturenofocus>
+						<texturefocus>buttons/info_return_on.png</texturefocus>
+						<font>-</font>
+						<visible>Control.IsEnabled(11)</visible>
+						<hitrect x="0" y="0" w="100" h="33" />
+					</control>
+					<control type="label" id="38">
+						<description>Rollback label</description>
+						<visible>Control.IsEnabled(11) + !Control.HasFocus(11)</visible>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width min="0" max="200">auto</width>
+						<height>33</height>
+						<aligny>center</aligny>
+						<label>24048</label>
+						<textcolor>grey</textcolor>
+						<font>font21</font>
+					</control>
+					<control type="label" id="39">
+						<description>Rollback label</description>
+						<visible>Control.IsEnabled(11) + Control.HasFocus(11)</visible>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width min="0" max="200">auto</width>
+						<height>33</height>
+						<aligny>center</aligny>
+						<label>24048</label>
+						<textcolor>green</textcolor>
+						<font>font21</font>
+					</control>
+					<control type="image" id="40">
+						<description>left dotted line</description>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>3</width>
+						<height>33</height>
+						<texture>icons/dotted_line_divider.png</texture>
+						<visible>Control.IsEnabled(11)</visible>
 					</control>
 					<control type="button" id="99">
 						<description>Close button</description>
@@ -314,12 +359,12 @@
 						<height>33</height>
 						<onright>-</onright>
 						<onclick>Close</onclick>
-						<texturenofocus>icon_cancel.png</texturenofocus>
-						<texturefocus>icon_cancel_on.png</texturefocus>
-						<font>-</font>
-						<hitrect x="0" y="0" w="100" h="33" />
-					</control>
-					<control type="label" id="35">
+						<texturenofocus>icons/icon_cancel.png</texturenofocus>
+						<texturefocus>icons/icon_cancel_on.png</texturefocus>
+						<font>-</font>
+						<hitrect x="0" y="0" w="100" h="33" />
+					</control>
+					<control type="label" id="41">
 						<description>Close label</description>
 						<visible>!Control.HasFocus(99)</visible>
 						<posx>0</posx>
@@ -331,7 +376,7 @@
 						<textcolor>grey</textcolor>
 						<font>font21</font>
 					</control>
-					<control type="label" id="36">
+					<control type="label" id="42">
 						<description>Close label</description>
 						<visible>Control.HasFocus(99)</visible>
 						<posx>0</posx>
@@ -358,7 +403,7 @@
 							<posy>0</posy>
 							<width>190</width>
 							<height>190</height>
-							<texture>frame_device_sq_white.png</texture>
+							<texture>views/frame_device_sq_white.png</texture>
 						</control>
 						<control type="image" id="3">
 							<description>Cover image</description>
@@ -369,7 +414,7 @@
 							<texture background="true" fallback="DefaultAddon.png">$INFO[ListItem.Icon]</texture>
 							<aspectratio>keep</aspectratio>
 							<bordersize>4</bordersize>
-							<bordertexture>info_cover_border.png</bordertexture>
+							<bordertexture>views/info_cover_border.png</bordertexture>
 						</control>
 					</control>
 
@@ -443,7 +488,7 @@
 								<posy>60</posy>
 								<width>930</width>
 								<height>2</height>
-								<texture>line_divider.png</texture>
+								<texture>views/line_divider.png</texture>
 							</control>
 
 							<control type="grouplist">
@@ -485,7 +530,7 @@
 								<posy>235</posy>
 								<width>930</width>
 								<height>2</height>
-								<texture>line_divider.png</texture>
+								<texture>views/line_divider.png</texture>
 							</control>
 							<control type="image">
 								<description>Icon image</description>