diff --git a/platformcode/config.py b/platformcode/config.py
index 82db0a40..f26ae0f0 100644
--- a/platformcode/config.py
+++ b/platformcode/config.py
@@ -149,7 +149,7 @@ def is_autorun_enabled():
 
 
 def enable_disable_autorun(is_enabled):
-    # using autoexec.py and not service.py to force autorun
+    # old method, now using service.py
 
     path = os.path.join(xbmc.translatePath('special://userdata'),'autoexec.py')
     append_write = 'a' if os.path.exists(path) else 'w'
@@ -165,7 +165,7 @@ def enable_disable_autorun(is_enabled):
         file.close()
         with open(path, "w") as file:
             file.write(new_content)
-        set_setting('autostart', 'Off')
+        set_setting('autostart', True)
     return True
 
 def get_all_settings_addon():
diff --git a/resources/settings.xml b/resources/settings.xml
index c317b4ec..6edd64e5 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -3,7 +3,7 @@
     <!-- General -->
     <category label="70168">
         <setting label="70786" type="lsep"/>
-        <setting id="autostart" type="action" label="70706" action="RunPlugin(plugin://plugin.video.kod/?ew0KICAgICJhY3Rpb24iOiAiYXV0b3N0YXJ0IiwNCiAgICAiY2hhbm5lbCI6ICJzZXR0aW5nIg0KfQ==)" default="Off"/>
+        <setting id="autostart" type="bool" label="70706" default="false"/>
         <setting label="70579" type="lsep"/>
         <setting id="addon_update_enabled" type="bool" label="70581" default="true"/>
         <setting id="addon_update_message" type="bool" label="70582" visible="eq(-1,true)" default="true"/>
diff --git a/service.py b/service.py
index 12db63fc..bc6ff4a3 100644
--- a/service.py
+++ b/service.py
@@ -396,6 +396,12 @@ class AddonMonitor(xbmc.Monitor):
 
 if __name__ == "__main__":
     logger.info('Starting KoD service')
+    if config.get_setting('autostart'):
+        xbmc.executebuiltin('RunAddon(plugin.video.' + config.PLUGIN_NAME + ')')
+
+    # handling old autoexec method
+    if config.is_autorun_enabled():
+        config.enable_disable_autorun(True)
     monitor = AddonMonitor()
 
     # mark as stopped all downloads (if we are here, probably kodi just started)
diff --git a/specials/setting.py b/specials/setting.py
index 895ffc27..cf7b9fa0 100644
--- a/specials/setting.py
+++ b/specials/setting.py
@@ -15,50 +15,8 @@ from channelselector import get_thumb
 from core import filetools, servertools
 from core.item import Item
 from platformcode import config, logger, platformtools
-import xbmcgui
 
 CHANNELNAME = "setting"
-AUTOSTART = config.is_autorun_enabled()
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = list()
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60535), action="settings", folder=False,
-                         thumbnail=get_thumb("setting_0.png")))
-    if AUTOSTART is False:
-        autostart_mode = config.get_localized_string(70707)
-    else:
-        autostart_mode = config.get_localized_string(70708)
-    itemlist.append(Item(channel=CHANNELNAME, title=autostart_mode + " " + config.get_localized_string(70706), action="autostart", folder=False, thumbnail=get_thumb("setting_0.png")))
-
-    #itemlist.append(Item(channel=CHANNELNAME, title="", action="", folder=False, thumbnail=get_thumb("setting_0.png")))
-
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60536) + ":", text_bold=True, action="", folder=False,
-                         thumbnail=get_thumb("setting_0.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(60537), action="menu_channels", folder=True,
-                         thumbnail=get_thumb("channels.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(60538), action="menu_servers", folder=True,
-                         thumbnail=get_thumb("channels.png")))
-    itemlist.append(Item(channel="news", title="     " + config.get_localized_string(60539), action="menu_opciones",
-                         folder=True, thumbnail=get_thumb("news.png")))
-    itemlist.append(Item(channel="search", title="     " + config.get_localized_string(60540), action="opciones", folder=True,
-                         thumbnail=get_thumb("search.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(60541), action="channel_config",
-                         config="downloads", folder=True, thumbnail=get_thumb("downloads.png")))
-
-    if config.get_videolibrary_support():
-        itemlist.append(Item(channel="videolibrary", title="     " + config.get_localized_string(60542), action="channel_config",
-                             folder=True, thumbnail=get_thumb("videolibrary.png")))
-
-    if config.is_xbmc():
-        itemlist.append(Item(channel=CHANNELNAME, title="     " + config.get_localized_string(70253), action="setting_torrent",
-                             folder=True, thumbnail=get_thumb("channels_torrent.png")))
-    #itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png")))
-    itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60544), action="submenu_tools", folder=True,
-                         thumbnail=get_thumb("setting_0.png")))
-
-    return itemlist
 
 
 def menu_channels(item):
@@ -96,15 +54,6 @@ def channel_config(item):
     return platformtools.show_channel_settings(channelpath=filetools.join(config.get_runtime_path(), "channels", item.config))
 
 
-def autostart(item):  # item required launcher.py line 265
-    if config.enable_disable_autorun(AUTOSTART):
-        logger.info('AUTOSTART ENABLED')
-        # xbmcgui.Dialog().ok(config.get_localized_string(20000), config.get_localized_string(70709))
-    else:
-        logger.info('AUTOSTART ENABLED')
-        # xbmcgui.Dialog().ok(config.get_localized_string(20000), config.get_localized_string(70710))
-
-
 # def setting_torrent(item):
 #     logger.info()