diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index f3205666..44f24ac3 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -291,8 +291,6 @@ def set_view_mode(item, parent_item):
     if mode == 0:
         logger.info('default mode')
         mode = 55
-    elif not Type:
-        Type = 'addons'
     xbmcplugin.setContent(handle=int(sys.argv[1]), content=Type)
     xbmc.executebuiltin('Container.SetViewMode(%s)' % mode)
     logger.info('TYPE: ' + Type + ' - ' + 'CONTENT: ' + content)
diff --git a/resources/settings.xml b/resources/settings.xml
index 5156a714..3265ba62 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -127,16 +127,15 @@
         <setting id="enable_link_menu" label="70527" type="bool" default="true"/>
         <setting id="enable_fav_menu" label="30102" type="bool" default="true"/>
         <setting id="enable_library_menu" label="30131" type="bool" default="true"/>
-        <!-- View Mode-->
-        <setting label="70754" type="lsep"/>
+        <!-- View Mode (hidden)-->
         <setting id="skin_name" label='Skin Name' type="text" default="skin.estuary" visible="false"/>
-        <setting id="view_mode_addon" type="action" label="70009" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6ImFkZG9uIg0KfQ==)" default= "Default, 0"/>
-        <setting id="view_mode_channel" type="action" label="30118" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6ImNoYW5uZWwiDQp9)" default= "Default, 0"/>
-        <setting id="view_mode_movie" type="action" label="30122" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6Im1vdmllIg0KfQ==)" default= "Default, 0"/>
-        <setting id="view_mode_tvshow" type="action" label="30123" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6InR2c2hvdyINCn0=)" default= "Default, 0"/>
-        <setting id="view_mode_season" type="action" label="30140" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6InNlYXNvbiINCn0=)" default= "Default, 0"/>
-        <setting id="view_mode_episode" type="action" label="70362" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6ImVwaXNvZGUiDQp9)" default= "Default, 0"/>
-        <setting id="view_mode_server" type="action" label="70145" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiJ2aWV3X21vZGUiLA0KICAgICJjaGFubmVsIjoic2hvcnRjdXRzIiwNCgkidHlwZSI6InNlcnZlciINCn0=)" default= "Default, 0"/>
+        <setting id="view_mode_addon" type="action" label="70009" default= "Default, 0" visible="false"/>
+        <setting id="view_mode_channel" type="action" label="30118" default= "Default, 0" visible="false"/>
+        <setting id="view_mode_movie" type="action" label="30122" default= "Default, 0" visible="false"/>
+        <setting id="view_mode_tvshow" type="action" label="30123" default= "Default, 0" visible="false"/>
+        <setting id="view_mode_season" type="action" label="30140" default= "Default, 0" visible="false"/>
+        <setting id="view_mode_episode" type="action" label="70362" default= "Default, 0" visible="false"/>
+        <setting id="view_mode_server" type="action" label="70145" default= "Default, 0" visible="false"/>
         <!-- Contextual -->
         <setting label="30024" type="lsep"/>
         <setting id="quick_menu" type="bool" label="60360" default="true"/>
diff --git a/resources/views/skin.ace2.json b/resources/views/skin.ace2.json
deleted file mode 100644
index 088ebcac..00000000
--- a/resources/views/skin.ace2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "all":{
-        "Right List": 50,
-        "Frame": 51,
-        "Wall": 56,
-        "Tech": 68,
-        "Sets Plus": 74
-    },
-    "movie":{
-        "Right List": 50,
-        "Frame": 51,
-        "Wall": 56,
-        "Tech": 68,
-        "Sets Plus": 74
-    },
-    "tvshow":{
-        "Right List": 50,
-        "Frame": 51,
-        "Wall": 56,
-        "Tech": 68,
-        "Sets Plus": 74
-    },
-    "season":{
-        "Right List": 50,
-        "Frame": 51,
-        "Wall": 56,
-        "Tech": 68,
-        "Sets Plus": 74
-    },
-    "episode":{
-        "Right List": 50,
-        "Frame": 51,
-        "Wall": 56,
-        "Tech": 68,
-        "Sets Plus": 74
-    },
-    "addon":{
-        "Right List": 50,
-        "Frame": 51,
-        "Wall": 56,
-        "Tech": 68,
-        "Sets Plus": 74
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.aeon.nox.silvo.json b/resources/views/skin.aeon.nox.silvo.json
deleted file mode 100644
index 3e777a57..00000000
--- a/resources/views/skin.aeon.nox.silvo.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "RightList": 506,
-        "FanartList": 602,
-        "LowList": 501,
-        "BigList": 507,
-        "Logo": 59,
-        "Showcase": 53,
-        "Shift": 57,
-        "Posters": 56,
-        "MyFlix": 509,
-        "TriPanel": 55,
-        "Icons": 500,
-        "Small Icons": 499,
-        "Wall": 503,
-        "Fullscreen Wall": 609,
-        "infoWall": 51,
-        "BannerWall": 58,
-        "BannerPlex": 601,
-        "Landscape": 52,
-        "BigFan": 591,
-        "Gallery": 504,
-        "Panel": 505,
-        "Episode": 502
-    },
-    "movie":{
-        "List": 50,
-        "RightList": 506,
-        "FanartList": 602,
-        "LowList": 501,
-        "BigList": 507,
-        "Logo": 59,
-        "Showcase": 53,
-        "Shift": 57,
-        "Posters": 56,
-        "MyFlix": 509,
-        "TriPanel": 55,
-        "Icons": 500,
-        "Small Icons": 499,
-        "Wall": 503,
-        "Fullscreen Wall": 609,
-        "infoWall": 51,
-        "BannerWall": 58,
-        "BannerPlex": 601,
-        "Landscape": 52,
-        "BigFan": 591,
-        "Gallery": 504,
-        "Panel": 505
-    },
-    "tvshow":{
-        "List": 50,
-        "RightList": 506,
-        "FanartList": 602,
-        "LowList": 501,
-        "BigList": 507,
-        "Logo": 59,
-        "Showcase": 53,
-        "Shift": 57,
-        "Posters": 56,
-        "MyFlix": 509,
-        "TriPanel": 55,
-        "Icons": 500,
-        "Small Icons": 499,
-        "Wall": 503,
-        "Fullscreen Wall": 609,
-        "infoWall": 51,
-        "BannerWall": 58,
-        "BannerPlex": 601,
-        "Landscape": 52,
-        "BigFan": 591,
-        "Gallery": 504,
-        "Panel": 505,
-        "Episode": 502
-    },
-    "season":{
-        "List": 50,
-        "RightList": 506,
-        "FanartList": 602,
-        "LowList": 501,
-        "Showcase": 53,
-        "Shift": 57,
-        "Posters": 56,
-        "TriPanel": 55,
-        "Icons": 500,
-        "Small Icons": 499,
-        "Wall": 503,
-        "BigFan": 591
-    },
-    "episode":{
-        "List": 50,
-        "RightList": 506,
-        "FanartList": 602,
-        "LowList": 501,
-        "BigList": 507,
-        "Episode": 502,
-        "MyFlix": 509,
-        "TriPanel": 55,
-        "Icons": 500,
-        "Landscape": 52,
-        "Panel": 505
-    },
-    "addon":{
-        "List": 50,
-        "Shift": 57,
-        "Icons": 500,
-        "Wall": 503
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.aeon.tajo.json b/resources/views/skin.aeon.tajo.json
deleted file mode 100644
index ad06eaaf..00000000
--- a/resources/views/skin.aeon.tajo.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "MultiSort": 589,
-        "MultiWall": 587,
-        "Shelf 3D": 595,
-        "List 3D": 596,
-        "Fanart 3D": 593,
-        "Triple 3D": 590,
-        "Wall 3D": 586,
-        "Banner 3D": 594,
-        "MultiWall 3D": 587
-    },
-    "movie":{
-        "List": 50,
-        "MultiSort": 589,
-        "MultiWall": 587,
-        "Shelf 3D": 595,
-        "List 3D": 596,
-        "Fanart 3D": 593,
-        "Triple 3D": 590,
-        "Wall 3D": 586,
-        "Banner 3D": 594,
-        "MultiWall 3D": 587
-    },
-    "tvshow":{
-        "List": 50,
-        "MultiWall": 587,
-        "Shelf 3D": 595,
-        "List 3D": 596,
-        "Fanart 3D": 593,
-        "Triple 3D": 590,
-        "Wall 3D": 586,
-        "Banner 3D": 594,
-        "MultiWall 3D": 587
-    },
-    "season":{
-        "List": 50,
-        "Shelf 3D": 595,
-        "List 3D": 596,
-        "Wall 3D": 586
-    },
-    "episode":{
-        "List": 50,
-        "List 3D": 596
-    },
-    "addon":{
-        "List": 50
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.aeonmq8.json b/resources/views/skin.aeonmq8.json
deleted file mode 100644
index e0ce9573..00000000
--- a/resources/views/skin.aeonmq8.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "all":{
-        "Right List": 51,
-        "Banner": 52,
-        "Banner Info": 53,
-        "Poster": 54,
-        "Low List": 55,
-        "Wall": 56,
-        "Glass List": 57,
-        "Coverflow": 58,
-        "Wide": 59,
-        "Showart": 60,
-        "Multiplex": 61,
-        "Panel": 62,
-        "Shelf": 63,
-        "Sets": 65,
-        "Showcase": 66,
-        "Wall 3D": 67,
-        "Posterlite": 80,
-        "Poster List": 70,
-        "Total Art": 71
-    },
-    "movie":{
-        "Right List": 51,
-        "Banner": 52,
-        "Banner Info": 53,
-        "Poster": 54,
-        "Low List": 55,
-        "Wall": 56,
-        "Glass List": 57,
-        "Coverflow": 58,
-        "Wide": 59,
-        "Showart": 60,
-        "Multiplex": 61,
-        "Panel": 62,
-        "Shelf": 63,
-        "Sets": 65,
-        "Showcase": 66,
-        "Wall 3D": 67,
-        "Posterlite": 80,
-        "Poster List": 70,
-        "Total Art": 71
-    },
-    "tvshow":{
-        "Right List": 51,
-        "Banner": 52,
-        "Banner Info": 53,
-        "Poster": 54,
-        "Low List": 55,
-        "Wall": 56,
-        "Glass List": 57,
-        "Coverflow": 58,
-        "Wide": 59,
-        "Showart": 60,
-        "Multiplex": 61,
-        "Panel": 62,
-        "Shelf": 63,
-        "Showcase": 66,
-        "Wall 3D": 67,
-        "Posterlite": 80
-    },
-    "season":{
-        "Right List": 51,
-        "Banner": 52,
-        "Banner Info": 53,
-        "Poster": 54,
-        "Low List": 55,
-        "Wall": 56,
-        "Glass List": 57,
-        "Coverflow": 58,
-        "Wide": 59,
-        "Showart": 60,
-        "Multiplex": 61,
-        "Panel": 62,
-        "Shelf": 63,
-        "Showcase": 66,
-        "Wall 3D": 67,
-        "Posterlite": 80
-    },
-    "episode":{
-        "Right List": 51,
-        "Poster": 54,
-        "Low List": 55,
-        "Wall": 56,
-        "Glass List": 57,
-        "Wide": 59,
-        "Showart": 60,
-        "Multiplex": 61,
-        "Panel": 62,
-        "Wall 3D": 67,
-        "Posterlite": 80
-    },
-    "addon":{
-        "Right List": 51
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.amber.json b/resources/views/skin.amber.json
deleted file mode 100644
index dafb4913..00000000
--- a/resources/views/skin.amber.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Low List": 54,
-        "Big List": 52,
-        "Tall List": 501,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 56
-    },
-    "movie":{
-        "List": 50,
-        "Low List": 54,
-        "Big List": 52,
-        "Tall List": 501,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 56
-    },
-    "tvshow":{
-        "List": 50,
-        "Low List": 54,
-        "Big List": 52,
-        "Tall List": 501,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 56
-    },
-    "season":{
-        "List": 50,
-        "Low List": 54,
-        "Big List": 52,
-        "Tall List": 501,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 56
-    },
-    "episode":{
-        "List": 50,
-        "Low List": 54,
-        "Big List": 52,
-        "Tall List": 501,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 56
-    },
-    "addon":{
-        "List": 50,
-        "Low List": 54,
-        "Big List": 52,
-        "Tall List": 501,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 56
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.apptv.json b/resources/views/skin.apptv.json
deleted file mode 100644
index a7e8373a..00000000
--- a/resources/views/skin.apptv.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Icons": 52,
-        "Banner": 53,
-        "Wrap": 54,
-        "Coverflow": 57,
-        "Wall": 58
-    },
-    "movie":{
-        "List": 50,
-        "Icons": 52,
-        "Wrap": 54,
-        "Coverflow": 57,
-        "Wall": 58
-    },
-    "tvshow":{
-        "List": 50,
-        "Icons": 52,
-        "Banner": 53,
-        "Wrap": 54,
-        "Coverflow": 57,
-        "Wall": 58
-    },
-    "season":{
-        "List": 50,
-        "Icons": 52,
-        "Wrap": 54,
-        "Coverflow": 57,
-        "Wall": 58
-    },
-    "episode":{
-        "List": 50,
-        "Icons": 52,
-        "Wrap": 54,
-        "Coverflow": 57
-    },
-    "addon":{
-        "List": 50,
-        "Icons": 52,
-        "Wrap": 54,
-        "Coverflow": 57,
-        "Wall": 58
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.arctic.zephyr.2.json b/resources/views/skin.arctic.zephyr.2.json
deleted file mode 100644
index 4c3e2e13..00000000
--- a/resources/views/skin.arctic.zephyr.2.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "MediaInfo": 501,
-        "MediaInfo 2": 502,
-        "Tri-Panel": 504,
-        "Banner List": 503,
-        "Poster Wall": 51,
-        "Landscape Wall": 511,
-        "Info Wall": 514,
-        "Info Wall 2": 516,
-        "Landscape Wall Small": 515,
-        "Poster Showcase": 52,
-        "Landscape Showcase": 521,
-        "Poster": 53,
-        "Lovefilm": 523,
-        "Seasons Info": 522,
-        "Seasons Info 2": 524,
-        "Square Wall": 510,
-        "Icon Wall": 512
-    },
-    "movie":{
-        "List": 50,
-        "MediaInfo": 501,
-        "MediaInfo 2": 502,
-        "Tri-Panel": 504,
-        "Banner List": 503,
-        "Poster Wall": 51,
-        "Landscape Wall": 511,
-        "Info Wall": 514,
-        "Info Wall 2": 516,
-        "Landscape Wall Small": 515,
-        "Poster Showcase": 52,
-        "Landscape Showcase": 521,
-        "Poster": 53,
-        "Lovefilm": 523
-    },
-    "tvshow":{
-        "List": 50,
-        "MediaInfo": 501,
-        "MediaInfo 2": 502,
-        "Tri-Panel": 504,
-        "Banner List": 503,
-        "Poster Wall": 51,
-        "Landscape Wall": 511,
-        "Info Wall": 514,
-        "Info Wall 2": 516,
-        "Landscape Wall Small": 515,
-        "Poster Showcase": 52,
-        "Landscape Showcase": 521,
-        "Poster": 53,
-        "Lovefilm": 523
-    },
-    "season":{
-        "List": 50,
-        "Banner List": 503,
-        "Poster Wall": 51,
-        "Info Wall": 514,
-        "Info Wall 2": 516,
-        "Poster Showcase": 52,
-        "Seasons Info": 522,
-        "Seasons Info 2": 524,
-        "Poster": 53
-    },
-    "episode":{
-        "List": 50,
-        "MediaInfo": 501,
-        "MediaInfo 2": 502,
-        "Tri-Panel": 504,
-        "Banner List": 503,
-        "Landscape Wall": 511,
-        "Info Wall 2": 516,
-        "Landscape Wall Small": 515,
-        "Landscape Showcase": 521
-    },
-    "addon":{
-        "List": 50,
-        "Square Wall": 510,
-        "Icon Wall": 512
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.aura.json b/resources/views/skin.aura.json
deleted file mode 100644
index b106fe37..00000000
--- a/resources/views/skin.aura.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Poster Wall": 51,
-        "Landscape Wall": 52,
-        "Square Wall": 53,
-        "Banner Wall": 54,
-        "Showcase": 55,
-        "Landscape Showcase": 56,
-        "Square Showcase": 57,
-        "Big Posters": 58,
-        "Lovefilm": 59,
-        "Media Info": 500,
-        "info List": 501,
-        "Episode List": 502,
-        "Square Wall Large": 503
-    },
-    "movie":{
-        "List": 50,
-        "Poster Wall": 51,
-        "Landscape Wall": 52,
-        "Showcase": 55,
-        "Landscape Showcase": 56,
-        "Square Showcase": 57,
-        "Big Posters": 58,
-        "Lovefilm": 59,
-        "Media Info": 500,
-        "info List": 501,
-        "Episode List": 502
-    },
-    "tvshow":{
-        "List": 50,
-        "Poster Wall": 51,
-        "Landscape Wall": 52,
-        "Banner Wall": 54,
-        "Showcase": 55,
-        "Landscape Showcase": 56,
-        "Square Showcase": 57,
-        "Big Posters": 58,
-        "Lovefilm": 59,
-        "Media Info": 500,
-        "info List": 501,
-        "Episode List": 502
-    },
-    "season":{
-        "List": 50,
-        "Poster Wall": 51,
-        "Landscape Wall": 52,
-        "Banner Wall": 54,
-        "Showcase": 55,
-        "Landscape Showcase": 56,
-        "Square Showcase": 57,
-        "Big Posters": 58,
-        "Lovefilm": 59,
-        "Media Info": 500,
-        "info List": 501,
-        "Episode List": 502
-    },
-    "episode":{
-        "List": 50,
-        "Poster Wall": 51,
-        "Landscape Wall": 52,
-        "Banner Wall": 54,
-        "Showcase": 55,
-        "Landscape Showcase": 56,
-        "Square Showcase": 57,
-        "Big Posters": 58,
-        "Lovefilm": 59,
-        "Media Info": 500,
-        "info List": 501,
-        "Episode List": 502
-    },
-    "addon":{
-        "List": 50,
-        "Square Wall": 53,
-        "Square Wall Large": 503
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.bello.7.json b/resources/views/skin.bello.7.json
deleted file mode 100644
index 992a8ffc..00000000
--- a/resources/views/skin.bello.7.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Bello": 66,
-        "Slide": 51,
-        "Gallery": 52,
-        "Tiles": 562,
-        "Thumbnails": 560,
-        "Posters": 561,
-        "Posters 2": 64,
-        "Banner List": 57,
-        "3D Wall": 53,
-        "Wall": 54,
-        "List Wall": 58,
-        "VideoWall": 580,
-        "Showtime": 65,
-        "Netflix": 59
-    },
-    "movie":{
-        "List": 50,
-        "Bello": 66,
-        "Slide": 51,
-        "Gallery": 52,
-        "Tiles": 562,
-        "Thumbnails": 560,
-        "Posters": 561,
-        "Posters 2": 64,
-        "Banner List": 57,
-        "3D Wall": 53,
-        "Wall": 54,
-        "List Wall": 58,
-        "VideoWall": 580,
-        "Showtime": 65,
-        "Netflix": 59
-    },
-    "tvshow":{
-        "List": 50,
-        "Bello": 66,
-        "Slide": 51,
-        "Gallery": 52,
-        "Tiles": 562,
-        "Thumbnails": 560,
-        "Posters 2": 64,
-        "Banner List": 57,
-        "3D Wall": 53,
-        "Wall": 54,
-        "List Wall": 58,
-        "VideoWall": 580,
-        "Showtime": 65,
-        "Netflix": 59
-    },
-    "season":{
-        "List": 50,
-        "Bello": 66,
-        "Slide": 51,
-        "Gallery": 52,
-        "Tiles": 562,
-        "Thumbnails": 560,
-        "Banner List": 57,
-        "Netflix": 59
-    },
-    "episode":{
-        "List": 50,
-        "Bello": 66,
-        "Gallery": 52,
-        "Tiles": 562,
-        "Thumbnails": 560,
-        "Banner List": 57,
-        "Netflix": 59
-    },
-    "addon":{
-        "List": 50,
-        "Bello": 66,
-        "Thumbnails": 560
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.blackglassnova.json b/resources/views/skin.blackglassnova.json
deleted file mode 100644
index d59b9ed2..00000000
--- a/resources/views/skin.blackglassnova.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Large List": 52,
-        "Low List": 54,
-        "Banner List": 56,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Poster Showcase": 59,
-        "Card List": 5050
-    },
-    "movie":{
-        "List": 50,
-        "Large List": 52,
-        "Low List": 54,
-        "Banner List": 56,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Poster Showcase": 59,
-        "Card List": 5050
-    },
-    "tvshow":{
-        "List": 50,
-        "Large List": 52,
-        "Low List": 54,
-        "Banner List": 56,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Poster Showcase": 59,
-        "Card List": 5050
-    },
-    "season":{
-        "List": 50,
-        "Large List": 52,
-        "Low List": 54,
-        "Banner List": 56,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Poster Showcase": 59,
-        "Card List": 5050
-    },
-    "episode":{
-        "List": 50,
-        "Large List": 52,
-        "Low List": 54,
-        "Banner List": 56,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Poster Showcase": 59,
-        "Card List": 5050
-    },
-    "addon":{
-        "List": 50,
-        "Large List": 52,
-        "Low List": 54,
-        "Panel": 51,
-        "Big Panel": 55,
-        "Icons": 53,
-        "Fanart": 58,
-        "Card List": 5050
-    }
-}
diff --git a/resources/views/skin.box.json b/resources/views/skin.box.json
deleted file mode 100644
index e602ab5c..00000000
--- a/resources/views/skin.box.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Thumbs": 52,
-        "Fanart": 527,
-        "Poster": 532,
-        "Banner": 50,
-        "Banner List": 536,
-        "Fanart Logo": 539,
-        "List Info": 5231,
-        "Thumb Info": 533
-    },
-    "movie":{
-        "List": 50,
-        "Thumbs": 52,
-        "Fanart": 527,
-        "Poster": 532,
-        "Fanart Logo": 539,
-        "List Info": 5231,
-        "Thumb Info": 533
-    },
-    "tvshow":{
-        "List": 50,
-        "Thumbs": 52,
-        "Fanart": 527,
-        "Poster": 532,
-        "Banner": 50,
-        "Banner List": 536,
-        "Fanart Logo": 539,
-        "List Info": 5231,
-        "Thumb Info": 533
-    },
-    "season":{
-        "List": 50,
-        "Poster": 532
-    },
-    "episode":{
-        "List": 50,
-        "Thumbs": 52,
-        "List Info": 5231,
-        "Thumb Info": 533
-    },
-    "addon":{
-        "List": 50
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.confluence.json b/resources/views/skin.confluence.json
deleted file mode 100644
index f0348dd8..00000000
--- a/resources/views/skin.confluence.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Big List": 55,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Fanart": 508,
-        "Media Info": 503,
-        "Media Info 2": 504,
-        "Media Info 3": 504,
-        "Wide": 505
-    },
-    "movie":{
-        "List": 50,
-        "Big List": 55,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Fanart": 508,
-        "Media Info": 503,
-        "Media Info 2": 504,
-        "Media Info 3": 504
-    },
-    "tvshow":{
-        "List": 50,
-        "Big List": 55,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Fanart": 508,
-        "Media Info": 503,
-        "Media Info 2": 504,
-        "Media Info 3": 504,
-        "Wide": 505
-    },
-    "season":{
-        "List": 50,
-        "Big List": 55,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Media Info 2": 504,
-        "Media Info 3": 504
-    },
-    "episode":{
-        "List": 50,
-        "Big List": 55,
-        "Thumbnail": 500,
-        "Media Info": 503,
-        "Media Info 2": 504,
-        "Media Info 3": 504
-    },
-    "addon":{
-        "List": 50,
-        "Big List": 55,
-        "Thumbnail": 500
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.eminence.2.json b/resources/views/skin.eminence.2.json
deleted file mode 100644
index f2a5267e..00000000
--- a/resources/views/skin.eminence.2.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "all":{
-        "Plain List": 552,
-        "Poster List": 550,
-        "Big List": 510,
-        "Media Info": 51,
-        "Media Info 2": 57,
-        "Media Info 3": 577,
-        "Info List": 53,
-        "Info List 2": 553,
-        "Fanart List": 54,
-        "Gallery": 58,
-        "Big Icons": 52,
-        "Mediun Icons": 525,
-        "Showcase": 535,
-        "Icons": 500,
-        "Info Icons": 59,
-        "Wide": 55,
-        "Fanart": 56
-    },
-    "movie":{
-        "Plain List": 552,
-        "Poster List": 550,
-        "Big List": 510,
-        "Media Info": 51,
-        "Media Info 2": 57,
-        "Media Info 3": 577,
-        "Info List": 53,
-        "Info List 2": 553,
-        "Fanart List": 54,
-        "Gallery": 58,
-        "Big Icons": 52,
-        "Mediun Icons": 525,
-        "Showcase": 535,
-        "Icons": 500,
-        "Info Icons": 59,
-        "Wide": 55,
-        "Fanart": 56
-    },
-    "tvshow":{
-        "Plain List": 552,
-        "Poster List": 550,
-        "Big List": 510,
-        "Media Info": 51,
-        "Media Info 2": 57,
-        "Media Info 3": 577,
-        "Info List": 53,
-        "Info List 2": 553,
-        "Fanart List": 54,
-        "Gallery": 58,
-        "Big Icons": 52,
-        "Mediun Icons": 525,
-        "Showcase": 535,
-        "Icons": 500,
-        "Info Icons": 59,
-        "Wide": 55,
-        "Fanart": 56
-    },
-    "season":{
-        "Plain List": 552,
-        "Poster List": 550,
-        "Media Info": 51,
-        "Media Info 2": 57,
-        "Info List": 53,
-        "Fanart List": 54,
-        "Gallery": 58,
-        "Big Icons": 52,
-        "Mediun Icons": 525,
-        "Showcase": 535,
-        "Icons": 500,
-        "Info Icons": 59
-    },
-    "episode":{
-        "Plain List": 552,
-        "Poster List": 550,
-        "Media Info": 51,
-        "Media Info 2": 57,
-        "Info List": 53,
-        "Info List 2": 553,
-        "Fanart List": 54,
-        "Gallery": 58,
-        "Icons": 500,
-        "Fanart": 56
-    },
-    "addon":{
-        "Plain List": 552,
-        "Poster List": 550,
-        "Big List": 510,
-        "Icons": 500,
-        "Info Icons": 59
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.estuary.json b/resources/views/skin.estuary.json
deleted file mode 100644
index f329efb6..00000000
--- a/resources/views/skin.estuary.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Poster": 51,
-        "Shift": 53,
-        "InfoWall": 54,
-        "WideList": 55,
-        "Wall": 500,
-        "Banner": 501,
-        "Fanart": 502
-    },
-    "movie":{
-        "List": 50,
-        "Poster": 51,
-        "Shift": 53,
-        "InfoWall": 54,
-        "WideList": 55,
-        "Wall": 500,
-        "Fanart": 502
-    },
-    "tvshow":{
-        "List": 50,
-        "Poster": 51,
-        "Shift": 53,
-        "InfoWall": 54,
-        "WideList": 55,
-        "Wall": 500,
-        "Banner": 501,
-        "Fanart": 502
-    },
-    "season":{
-        "List": 50,
-        "Poster": 51,
-        "Shift": 53,
-        "InfoWall": 54,
-        "WideList": 55,
-        "Wall": 500,
-        "Fanart": 502
-    },
-    "episode":{
-        "List": 50,
-        "Poster": 51,
-        "Shift": 53,
-        "InfoWall": 54,
-        "WideList": 55,
-        "Wall": 500,
-        "Banner": 501,
-        "Fanart": 502
-    },
-    "addon":{
-        "WideList": 55,
-        "Wall": 500
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.phenomenal.json b/resources/views/skin.phenomenal.json
deleted file mode 100644
index a59df640..00000000
--- a/resources/views/skin.phenomenal.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "all":{
-        "Fanart": 50,
-        "Poster": 51,
-        "Thumb": 52,
-        "Showcase": 53,
-        "Wide List": 54,
-        "Icons": 55,
-        "Pictures": 56,
-        "Banner List": 57
-    },
-    "movie":{
-        "Fanart": 50,
-        "Poster": 51,
-        "Thumb": 52,
-        "Showcase": 53,
-        "Wide List": 54,
-        "Icons": 55,
-        "Pictures": 56,
-        "Banner List": 57
-    },
-    "tvshow":{
-        "Fanart": 50,
-        "Poster": 51,
-        "Thumb": 52,
-        "Showcase": 53,
-        "Wide List": 54,
-        "Icons": 55,
-        "Pictures": 56,
-        "Banner List": 57
-    },
-    "season":{
-        "Fanart": 50,
-        "Poster": 51,
-        "Thumb": 52,
-        "Showcase": 53,
-        "Wide List": 54,
-        "Icons": 55,
-        "Pictures": 56,
-        "Banner List": 57
-    },
-    "episode":{
-        "Fanart": 50,
-        "Poster": 51,
-        "Thumb": 52,
-        "Showcase": 53,
-        "Wide List": 54,
-        "Icons": 55,
-        "Pictures": 56,
-        "Banner List": 57
-    },
-    "addon":{
-        "Fanart": 50,
-        "Poster": 51,
-        "Thumb": 52,
-        "Showcase": 53,
-        "Wide List": 54,
-        "Icons": 55,
-        "Pictures": 56,
-        "Banner List": 57
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.quartz.json b/resources/views/skin.quartz.json
deleted file mode 100644
index 8b352603..00000000
--- a/resources/views/skin.quartz.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Big List": 51,
-        "Media Info": 52,
-        "Media Info 2": 54,
-        "Icons": 53,
-        "Big Icons": 501,
-        "Panel": 501,
-        "Wide": 55,
-        "Fanart 1": 57,
-        "Fanart 2": 59,
-        "Fanart 3": 500
-    },
-    "movie":{
-        "List": 50,
-        "Big List": 51,
-        "Media Info": 52,
-        "Media Info 2": 54,
-        "Icons": 53,
-        "Big Icons": 501,
-        "Panel": 501,
-        "Fanart 1": 57,
-        "Fanart 2": 59,
-        "Fanart 3": 500
-    },
-    "tvshow":{
-        "List": 50,
-        "Big List": 51,
-        "Media Info": 52,
-        "Media Info 2": 54,
-        "Icons": 53,
-        "Big Icons": 501,
-        "Panel": 501,
-        "Wide": 55,
-        "Fanart 1": 57,
-        "Fanart 2": 59,
-        "Fanart 3": 500
-    },
-    "season":{
-        "List": 50,
-        "Big List": 51,
-        "Media Info": 52,
-        "Media Info 2": 54,
-        "Icons": 53,
-        "Big Icons": 501,
-        "Panel": 501,
-        "Fanart 1": 57,
-        "Fanart 2": 59,
-        "Fanart 3": 500
-    },
-    "episode":{
-        "List": 50,
-        "Big List": 51,
-        "Media Info": 52,
-        "Media Info 2": 54,
-        "Icons": 53,
-        "Panel": 501,
-        "Fanart 3": 500
-    },
-    "addon":{
-        "List": 50,
-        "Big List": 51,
-        "Icons": 53
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.rapier.json b/resources/views/skin.rapier.json
deleted file mode 100644
index edcd77b6..00000000
--- a/resources/views/skin.rapier.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "all":{
-
-    },
-    "movie":{
-        "Icon": 50,
-        "List": 52,
-        "List Info": 58,
-        "List Info 2": 66,
-        "List Info 3": 95,
-        "Thumbs Info": 97,
-        "Wrap Info": 53,
-        "3D Wrap": 588,
-        "Fanart": 583,
-        "Wall": 69
-    },
-    "tvshow":{
-        "Icon": 50,
-        "List": 52,
-        "List Info": 61,
-        "List Info 2": 65,
-        "List Info 3": 589,
-        "Thumbs Info": 100,
-        "Wrap Info": 577,
-        "3D Wrap": 588,
-        "Fanart": 583,
-        "Wall": 586
-    },
-    "season":{
-        "Icon": 50,
-        "List": 52,
-        "List Info": 61,
-        "List Info 2": 65,
-        "List Info 3": 589,
-        "Wall": 586,
-        "Extended": 585
-    },
-    "episode":{
-        "Icon": 50,
-        "List": 52,
-        "List Info": 73,
-        "List Info 2": 68,
-        "List Info 3": 94
-    },
-    "addon":{
-        "Icon": 50,
-        "List": 52,
-        "List Info": 91,
-        "Wrap Info": 93
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.revolve.json b/resources/views/skin.revolve.json
deleted file mode 100644
index b6343245..00000000
--- a/resources/views/skin.revolve.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "all":{
-        "Circle List": 52,
-        "Thumbnails List": 55,
-        "Drop List": 51,
-        "Landscape List": 53,
-        "Revolve List": 54,
-        "Panels List": 56,
-        "Gallery List": 57,
-        "Rotate List": 58,
-        "Banners List": 59
-    },
-    "movie":{
-        "Circle List": 52,
-        "Thumbnails List": 55,
-        "Drop List": 51,
-        "Landscape List": 53,
-        "Revolve List": 54,
-        "Panels List": 56,
-        "Gallery List": 57,
-        "Rotate List": 58,
-        "Banners List": 59
-    },
-    "tvshow":{
-        "Circle List": 52,
-        "Thumbnails List": 55,
-        "Drop List": 51,
-        "Landscape List": 53,
-        "Revolve List": 54,
-        "Panels List": 56,
-        "Gallery List": 57,
-        "Rotate List": 58,
-        "Banners List": 59
-    },
-    "season":{
-        "Circle List": 52,
-        "Thumbnails List": 55,
-        "Drop List": 51,
-        "Landscape List": 53,
-        "Revolve List": 54,
-        "Panels List": 56,
-        "Gallery List": 57,
-        "Rotate List": 58,
-        "Banners List": 59
-    },
-    "episode":{
-        "Circle List": 52,
-        "Thumbnails List": 55,
-        "Drop List": 51,
-        "Landscape List": 53,
-        "Revolve List": 54,
-        "Panels List": 56,
-        "Gallery List": 57,
-        "Rotate List": 58,
-        "Banners List": 59
-    },
-    "addon":{
-        "Circle List": 52,
-        "Thumbnails List": 55,
-        "Drop List": 51,
-        "Landscape List": 53,
-        "Revolve List": 54,
-        "Panels List": 56,
-        "Gallery List": 57,
-        "Rotate List": 58,
-        "Banners List": 59
-    }
-}
\ No newline at end of file
diff --git a/resources/views/skin.unity.json b/resources/views/skin.unity.json
deleted file mode 100644
index 9f17aa28..00000000
--- a/resources/views/skin.unity.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "all":{
-        "List": 50,
-        "Big List": 51,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Fanart": 508,
-        "Media Info": 505,
-        "Media Info 2": 504,
-        "Media Info 3": 503,
-        "Media Info 4": 515,
-        "Wide": 505,
-        "Info": 550,
-        "Info 2": 551
-    },
-    "movie":{
-        "List": 50,
-        "Big List": 51,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Fanart": 508,
-        "Media Info": 505,
-        "Media Info 2": 504,
-        "Media Info 3": 503
-    },
-    "tvshow":{
-        "List": 50,
-        "Big List": 51,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Fanart": 508,
-        "Media Info": 505,
-        "Media Info 2": 504,
-        "Media Info 3": 503,
-        "Wide": 505
-    },
-    "season":{
-        "List": 50,
-        "Big List": 51,
-        "Thumbnail": 500,
-        "Poster Wrap": 501,
-        "Media Info": 505,
-        "Media Info 2": 504,
-        "Media Info 3": 503
-    },
-    "episode":{
-        "List": 50,
-        "Big List": 51,
-        "Thumbnail": 500,
-        "Media Info": 505,
-        "Media Info 2": 504,
-        "Media Info 3": 503
-    },
-    "addon":{
-        "List": 50,
-        "Big List": 51,
-        "Thumbnail": 500,
-        "Info": 550,
-        "Info 2": 551
-    }
-}
\ No newline at end of file
diff --git a/specials/shortcuts.py b/specials/shortcuts.py
index b43b6478..aa7a4ab4 100644
--- a/specials/shortcuts.py
+++ b/specials/shortcuts.py
@@ -29,36 +29,6 @@ def settings_menu(item):
 	from platformcode import config
 	config.open_settings()
 
-def view_mode(item):
-	logger.info(str(item))
-	import xbmc
-	from core import filetools, jsontools
-	from core.support import typo
-	from platformcode import config, platformtools
-
-	skin_name = xbmc.getSkinDir()
-	config.set_setting('skin_name', skin_name)
-
-	path = filetools.join(config.get_runtime_path(), 'resources', 'views', skin_name + '.json')
-	if filetools.isfile(path):
-		json_file = open(path, "r").read()
-		json = jsontools.load(json_file)
-
-		Type = 'addon'if item.type in ['channel', 'server'] else item.type
-		skin = json[Type]
-
-		list_type = []
-		for key in skin:
-			list_type.append(key)
-		list_type.sort()
-		list_type.insert(0, config.get_localized_string(70003))
-
-		select = platformtools.dialog_select(config.get_localized_string(70754), list_type)
-		value = list_type[select] + ' , ' + str(skin[list_type[select]] if list_type[select] in skin else 0)
-		config.set_setting('view_mode_%s' % item.type, value)
-	else:
-		platformtools.dialog_ok(config.get_localized_string(30141), config.get_localized_string(30142) % typo(skin_name.replace('skin.','').replace('.',' '), 'capitalize bold'))
-
 def servers_menu(item):
 	# from core.support import dbg; dbg()
 	from core import servertools