diff --git a/src/umbraco.presentation/config/ExamineIndex.Release.config b/src/umbraco.presentation/config/ExamineIndex.Release.config
index e72178978c..ce180cd9c2 100644
--- a/src/umbraco.presentation/config/ExamineIndex.Release.config
+++ b/src/umbraco.presentation/config/ExamineIndex.Release.config
@@ -38,4 +38,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
     <IncludeNodeTypes/>
     <ExcludeNodeTypes />
   </IndexSet>
+    
+  <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
+  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
 </ExamineLuceneIndexSets>
\ No newline at end of file
diff --git a/src/umbraco.presentation/config/ExamineSettings.Release.config b/src/umbraco.presentation/config/ExamineSettings.Release.config
index 4955628ce7..2ab27fbf57 100644
--- a/src/umbraco.presentation/config/ExamineSettings.Release.config
+++ b/src/umbraco.presentation/config/ExamineSettings.Release.config
@@ -20,14 +20,24 @@ More information and documentation can be found on CodePlex: http://umbracoexami
            supportProtected="true"
            interval="10"
            analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net"/>
+
+        <!-- default external indexer, which excludes protected and published pages-->
+        <add name="ExternalIndexer" type="UmbracoExamine.UmbracoContentIndexer, UmbracoExamine"
+            supportUnpublished="false"
+            supportProtected="false"
+            interval="10"
+            analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
     </providers>
   </ExamineIndexProviders>
 
-  <ExamineSearchProviders defaultProvider="InternalSearcher">
+  <ExamineSearchProviders defaultProvider="ExternalSearcher">
     <providers>
       <add name="InternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
            analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net"/>
 
+      <add name="ExternalSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
+             analyzer="Lucene.Net.Analysis.WhitespaceAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
+        
       <add name="InternalMemberSearcher" type="UmbracoExamine.UmbracoExamineSearcher, UmbracoExamine"
            analyzer="Lucene.Net.Analysis.Standard.StandardAnalyzer, Lucene.Net" enableLeadingWildcards="true"/>
     </providers>
diff --git a/src/umbraco.presentation/umbraco/config/create/UI.Release.xml b/src/umbraco.presentation/umbraco/config/create/UI.Release.xml
index 51b032f5ac..57167cb553 100644
--- a/src/umbraco.presentation/umbraco/config/create/UI.Release.xml
+++ b/src/umbraco.presentation/umbraco/config/create/UI.Release.xml
@@ -241,13 +241,36 @@
       <delete assembly="umbraco" type="cacheTasks" />
     </tasks>
   </nodeType>
-  <nodeType alias="initpython">
-    <header>Python file</header>
-    <usercontrol>/create/simple.ascx</usercontrol>
-    <tasks>
-      <create assembly="umbraco" type="PythonTasks" />
-    </tasks>
-  </nodeType>
+
+    <nodeType alias="initpython">
+        <header>Scripting file</header>
+        <usercontrol>/create/DLRScripting.ascx</usercontrol>
+        <tasks>
+            <create assembly="umbraco" type="PythonTasks" />
+        </tasks>
+    </nodeType>
+    <nodeType alias="python">
+        <header>Macro</header>
+        <usercontrol>/create/DLRScripting.ascx</usercontrol>
+        <tasks>
+            <delete assembly="umbraco" type="PythonTasks" />
+        </tasks>
+    </nodeType>
+    <nodeType alias="initdlrscripting">
+        <header>Scripting file</header>
+        <usercontrol>/create/DLRScripting.ascx</usercontrol>
+        <tasks>
+            <create assembly="umbraco" type="DLRScriptingTasks" />
+        </tasks>
+    </nodeType>
+    <nodeType alias="dlrscripting">
+        <header>Macro</header>
+        <usercontrol>/create/DLRScripting.ascx</usercontrol>
+        <tasks>
+            <delete assembly="umbraco" type="DLRScriptingTasks" />
+        </tasks>
+    </nodeType>
+    
   <nodeType alias="python">
     <header>Macro</header>
     <usercontrol>/create/simple.ascx</usercontrol>