Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.39.2.7 -r1.39.2.8
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	10 Sep 2015 08:22:07 -0000	1.39.2.7
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	18 Sep 2015 10:23:46 -0000	1.39.2.8
@@ -147,14 +147,20 @@
 }
 
 template_tag include { params } {
+    #
+    # Check, if the src can be resolved against resources/templates in
+    # the theme package
+    #
+    ns_set update $params src [template::themed_template [ns_set iget $params src]]
     template:template_tag_helper $params
 }
 
 #
-# <widget> is very similar to <include>, but uses name resolution
-# based on themes.  If the theme package contains
+# <widget> is very similar to <include>, but uses widget specific name
+# resolution based on themes.  If the theme package contains
 # resources/widgets/$specifiedName it is used from there. Otherwise it
-# behaves exactly like <include>
+# behaves exactly like <include> (without the resources/templates/
+# theming)
 #
 template_tag widget { params } {
     set src [ns_set iget $params src]
@@ -650,7 +656,11 @@
 
 template_tag include-optional { chunk params } {
 
-  set src [ns_set iget $params src]
+  #
+  # Check, if the src can be resolved against resources/templates in
+  # the theme package
+  #
+  set src [template::themed_template [ns_set iget $params src]]
   set ds [ns_set iget $params ds 1]
 
   #Start developer support frame around subordinate template.
Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v
diff -u -r1.28.2.8 -r1.28.2.9
--- openacs-4/packages/acs-templating/tcl/util-procs.tcl	18 Sep 2015 08:59:52 -0000	1.28.2.8
+++ openacs-4/packages/acs-templating/tcl/util-procs.tcl	18 Sep 2015 10:23:46 -0000	1.28.2.9
@@ -514,7 +514,7 @@
         set path $::acs::rootdir/$url
     }
 
-    return [template::themed_template [ns_normalizepath $path]]
+    return [ns_normalizepath $path]
 }
 
 ad_proc -public template::util::resolve_directory_url { url } {