diff --git a/resources/lib/library.py b/resources/lib/library.py
index b86fd4e3..794569fc 100755
--- a/resources/lib/library.py
+++ b/resources/lib/library.py
@@ -1300,7 +1300,6 @@ def addons( self ):
                         if item['enabled'] == True:                            
                             path = "RunAddOn(" + item['addonid'].encode('utf-8') + ")"
                             action = None
-
                             thumb = "DefaultAddon.png"
                             if item['thumbnail'] != "":
                                 thumb = item[ 'thumbnail' ]
@@ -1365,7 +1364,12 @@ def hasPluginEntryPoint( self, path ):
                     if provides is None:
                         return None
                     return provides.text.split( " " )
-
+                elif "point" in extension.attrib and extension.attrib.get( "point" ) == "xbmc.python.script":
+                    # Script entry points should be treated as executable
+                    provides = extension.find( "provides" )
+                    if provides is None:
+                        return None
+                    return provides.text.split( " " )
 
         except:
             return None
diff --git a/resources/shortcuts/overrides.xml b/resources/shortcuts/overrides.xml
index 0fbf1b26..039f5aed 100755
--- a/resources/shortcuts/overrides.xml
+++ b/resources/shortcuts/overrides.xml
@@ -79,6 +79,10 @@
 	</flatgroupings>
 	
 	<groupings>
+        
+        <!-- script.skin.helper.service smart shortcuts -->
+        <shortcut label="$ADDON[script.skin.helper.service 32062]" type="32010" condition="System.HasAddon(script.skin.helper.service)">||BROWSE||script.skin.helper.service/?action=smartshortcuts</shortcut>
+        
 		<node label="32029">
 			<content>common</content>
 		</node>
@@ -164,7 +168,10 @@
 	</groupings>
 
 	<widget-groupings>
-		<content>widgets</content>
+        <!-- script.skin.helper.service default widgets -->
+        <shortcut label="$ADDON[script.skin.helper.service 32063]" type="32010" condition="System.HasAddon(script.skin.helper.service)">||BROWSE||script.skin.helper.service/?action=widgets&amp;path=skinplaylists,librarydataprovider,scriptwidgets,extendedinfo,smartshortcuts,pvr,smartishwidgets</shortcut>
+	
+        <content>widgets</content>
 		<node label="32030">
 			<content>video</content>
 			<node label="32040">