diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py
index b54fccf45f1..5b7d6e69f4b 100644
--- a/release/scripts/startup/bl_ui/space_text.py
+++ b/release/scripts/startup/bl_ui/space_text.py
@@ -194,14 +194,33 @@ class TEXT_MT_text(Menu):
             layout.operator("text.run_script")
 
 
+class TEXT_MT_templates_py(Menu):
+    bl_label = "Python"
+
+    def draw(self, context):
+        self.path_menu(bpy.utils.script_paths("templates_py"),
+                       "text.open",
+                       {"internal": True},
+                       )
+
+
+class TEXT_MT_templates_osl(Menu):
+    bl_label = "Open Shading Language"
+
+    def draw(self, context):
+        self.path_menu(bpy.utils.script_paths("templates_osl"),
+                       "text.open",
+                       {"internal": True},
+                       )
+
+
 class TEXT_MT_templates(Menu):
     bl_label = "Templates"
 
     def draw(self, context):
-        self.path_menu(bpy.utils.script_paths("templates"),
-                       "text.open",
-                       {"internal": True},
-                       )
+        layout = self.layout
+        layout.menu("TEXT_MT_templates_py")
+        layout.menu("TEXT_MT_templates_osl")
 
 
 class TEXT_MT_edit_select(Menu):
diff --git a/release/scripts/templates/addon_add_object.py b/release/scripts/templates_py/addon_add_object.py
similarity index 100%
rename from release/scripts/templates/addon_add_object.py
rename to release/scripts/templates_py/addon_add_object.py
diff --git a/release/scripts/templates/background_job.py b/release/scripts/templates_py/background_job.py
similarity index 100%
rename from release/scripts/templates/background_job.py
rename to release/scripts/templates_py/background_job.py
diff --git a/release/scripts/templates/batch_export.py b/release/scripts/templates_py/batch_export.py
similarity index 100%
rename from release/scripts/templates/batch_export.py
rename to release/scripts/templates_py/batch_export.py
diff --git a/release/scripts/templates/bmesh_simple.py b/release/scripts/templates_py/bmesh_simple.py
similarity index 100%
rename from release/scripts/templates/bmesh_simple.py
rename to release/scripts/templates_py/bmesh_simple.py
diff --git a/release/scripts/templates/bmesh_simple_editmode.py b/release/scripts/templates_py/bmesh_simple_editmode.py
similarity index 100%
rename from release/scripts/templates/bmesh_simple_editmode.py
rename to release/scripts/templates_py/bmesh_simple_editmode.py
diff --git a/release/scripts/templates/builtin_keyingset.py b/release/scripts/templates_py/builtin_keyingset.py
similarity index 100%
rename from release/scripts/templates/builtin_keyingset.py
rename to release/scripts/templates_py/builtin_keyingset.py
diff --git a/release/scripts/templates/driver_functions.py b/release/scripts/templates_py/driver_functions.py
similarity index 100%
rename from release/scripts/templates/driver_functions.py
rename to release/scripts/templates_py/driver_functions.py
diff --git a/release/scripts/templates/gamelogic.py b/release/scripts/templates_py/gamelogic.py
similarity index 100%
rename from release/scripts/templates/gamelogic.py
rename to release/scripts/templates_py/gamelogic.py
diff --git a/release/scripts/templates/gamelogic_module.py b/release/scripts/templates_py/gamelogic_module.py
similarity index 100%
rename from release/scripts/templates/gamelogic_module.py
rename to release/scripts/templates_py/gamelogic_module.py
diff --git a/release/scripts/templates/gamelogic_simple.py b/release/scripts/templates_py/gamelogic_simple.py
similarity index 100%
rename from release/scripts/templates/gamelogic_simple.py
rename to release/scripts/templates_py/gamelogic_simple.py
diff --git a/release/scripts/templates/operator_file_export.py b/release/scripts/templates_py/operator_file_export.py
similarity index 100%
rename from release/scripts/templates/operator_file_export.py
rename to release/scripts/templates_py/operator_file_export.py
diff --git a/release/scripts/templates/operator_file_import.py b/release/scripts/templates_py/operator_file_import.py
similarity index 100%
rename from release/scripts/templates/operator_file_import.py
rename to release/scripts/templates_py/operator_file_import.py
diff --git a/release/scripts/templates/operator_mesh_add.py b/release/scripts/templates_py/operator_mesh_add.py
similarity index 100%
rename from release/scripts/templates/operator_mesh_add.py
rename to release/scripts/templates_py/operator_mesh_add.py
diff --git a/release/scripts/templates/operator_modal.py b/release/scripts/templates_py/operator_modal.py
similarity index 100%
rename from release/scripts/templates/operator_modal.py
rename to release/scripts/templates_py/operator_modal.py
diff --git a/release/scripts/templates/operator_modal_draw.py b/release/scripts/templates_py/operator_modal_draw.py
similarity index 100%
rename from release/scripts/templates/operator_modal_draw.py
rename to release/scripts/templates_py/operator_modal_draw.py
diff --git a/release/scripts/templates/operator_modal_timer.py b/release/scripts/templates_py/operator_modal_timer.py
similarity index 100%
rename from release/scripts/templates/operator_modal_timer.py
rename to release/scripts/templates_py/operator_modal_timer.py
diff --git a/release/scripts/templates/operator_modal_view3d.py b/release/scripts/templates_py/operator_modal_view3d.py
similarity index 100%
rename from release/scripts/templates/operator_modal_view3d.py
rename to release/scripts/templates_py/operator_modal_view3d.py
diff --git a/release/scripts/templates/operator_modal_view3d_raycast.py b/release/scripts/templates_py/operator_modal_view3d_raycast.py
similarity index 100%
rename from release/scripts/templates/operator_modal_view3d_raycast.py
rename to release/scripts/templates_py/operator_modal_view3d_raycast.py
diff --git a/release/scripts/templates/operator_node.py b/release/scripts/templates_py/operator_node.py
similarity index 100%
rename from release/scripts/templates/operator_node.py
rename to release/scripts/templates_py/operator_node.py
diff --git a/release/scripts/templates/operator_simple.py b/release/scripts/templates_py/operator_simple.py
similarity index 100%
rename from release/scripts/templates/operator_simple.py
rename to release/scripts/templates_py/operator_simple.py
diff --git a/release/scripts/templates/operator_uv.py b/release/scripts/templates_py/operator_uv.py
similarity index 100%
rename from release/scripts/templates/operator_uv.py
rename to release/scripts/templates_py/operator_uv.py
diff --git a/release/scripts/templates/script_stub.py b/release/scripts/templates_py/script_stub.py
similarity index 100%
rename from release/scripts/templates/script_stub.py
rename to release/scripts/templates_py/script_stub.py
diff --git a/release/scripts/templates/ui_menu.py b/release/scripts/templates_py/ui_menu.py
similarity index 100%
rename from release/scripts/templates/ui_menu.py
rename to release/scripts/templates_py/ui_menu.py
diff --git a/release/scripts/templates/ui_menu_simple.py b/release/scripts/templates_py/ui_menu_simple.py
similarity index 100%
rename from release/scripts/templates/ui_menu_simple.py
rename to release/scripts/templates_py/ui_menu_simple.py
diff --git a/release/scripts/templates/ui_panel.py b/release/scripts/templates_py/ui_panel.py
similarity index 100%
rename from release/scripts/templates/ui_panel.py
rename to release/scripts/templates_py/ui_panel.py
diff --git a/release/scripts/templates/ui_panel_simple.py b/release/scripts/templates_py/ui_panel_simple.py
similarity index 100%
rename from release/scripts/templates/ui_panel_simple.py
rename to release/scripts/templates_py/ui_panel_simple.py
diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c
index a78dabbfb9b..d68d6ae0e78 100644
--- a/source/blender/editors/space_text/text_format_py.c
+++ b/source/blender/editors/space_text/text_format_py.c
@@ -271,7 +271,7 @@ static void txtfmt_py_format_line(SpaceText *st, TextLine *line, const int do_ne
 				/* Special vars(v) or built-in keywords(b) */
 				if      ((i = txtfmt_py_find_specialvar(str))   != -1) prev = FMT_TYPE_SPECIAL;
 				else if ((i = txtfmt_py_find_builtinfunc(str))  != -1) prev = FMT_TYPE_KEYWORD;
-				else if ((i = txtfmt_py_find_decorator(str))    != -1) prev = FMT_TYPE_SPECIAL;  /* could have a new color for this */
+				else if ((i = txtfmt_py_find_decorator(str))    != -1) prev = FMT_TYPE_DIRECTIVE;
 
 				if (i > 0) {
 					memset(fmt, prev, i);