diff --git a/content-types/BlogAuthor.json b/content-types/BlogAuthor.json
index 3199052..11b5e3a 100644
--- a/content-types/BlogAuthor.json
+++ b/content-types/BlogAuthor.json
@@ -3,7 +3,7 @@
   "id" : "045d0b52-fa68-465a-b820-f9fc22febc50",
   "name" : "Blog Author",
   "variable" : "BlogAuthor",
-  "modDate" : "2024-09-24T23:06:22.000+00:00",
+  "modDate" : "2024-09-24T23:09:59.000+00:00",
   "iDate" : "2019-04-12T16:26:25.000+00:00",
   "host" : "SYSTEM_HOST",
   "folder" : "SYSTEM_FOLDER",
diff --git a/files/live/en-us/demo.dotcms.com/template.vtl b/files/live/en-us/demo.dotcms.com/template.vtl
new file mode 100644
index 0000000..94c6937
--- /dev/null
+++ b/files/live/en-us/demo.dotcms.com/template.vtl
@@ -0,0 +1,207 @@
+<script type="application/javascript">
+
+dojo.require("dotcms.dojo.data.TemplateReadStore");
+
+function templateChanged() {
+    var templateSel=dijit.byId("templateSel");
+    var value=templateSel.get('value');
+    if(value == "0") {
+        var store=window.top._templateStore;
+        store.hostId="";
+        templateSel.set("value","");
+        templateSel.filter();
+    }
+    else if(value) {
+        dojo.byId("template").value=value;
+        fetch("/api/v1/templates/image", {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+                templateId: value
+            })
+        }).then(async (response) => {
+            // The ok value represents the result of the response status 200 codes
+            if (response.ok) {
+                const result = await response.json();
+
+                getTemplateCallBack(result); // here we pass the result of the json response to the callback function
+            } else {
+                throw new Error("Error fetching template image");
+            }
+        })
+        .catch((error) => {
+            var imageEl = dojo.byId("templateThumbnailHolder");
+            imageEl.src = "/html/images/shim.gif";
+            imageEl.style.border = "0px";
+        });
+    }
+}
+
+function getTemplateCallBack(data) {
+    var imageInode = data.identifier;
+    var imageExtension = data.extension;
+    
+    var imageEl=dojo.byId("templateThumbnailHolder");
+    if (isInodeSet(imageInode)) {
+    	imageEl.src = "/dA/" + imageInode + "/250w";
+        imageEl.style.border = '1px solid #B6CBEB';
+        imageEl.style.marginTop = '1rem';
+    } else {
+        imageEl.src  = "/html/images/shim.gif";
+        imageEl.style.border = '0px';
+    }
+    
+}
+
+dojo.ready(function(){
+    var hostId = "$request.getSession().getAttribute('CMS_SELECTED_HOST_ID')";
+    var templateId = dojo.byId("template").value;
+    var templateStore = new dotcms.dojo.data.TemplateReadStore({
+        hostId: hostId,
+        templateSelected: templateId
+    });
+
+    window.top._templateStore=templateStore;
+
+    var templateSelect=new dijit.form.FilteringSelect({
+        id:"templateSel",
+        name:"templateSel",
+        style:"width:350px;",
+        onChange: templateChanged,
+        store: templateStore,
+        searchDelay: 300,
+        pageSize: 15,
+        autoComplete: false,
+        ignoreCase: true,
+        labelType:"html",
+        searchType:"html",
+        labelAttr: "htmlTitle",
+        searchAttr: "fullTitle",
+        value: templateId,
+        invalidMessage: '$text.get("Invalid-option-selected")'
+    },"templateHolder");
+
+
+    var val  = dojo.byId("template").value;
+    if (val != undefined && val != "" && val != "0"){
+        fetch("/api/v1/templates/image", {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+                templateId: val
+            })
+        }).then(async (response) => {
+            // The ok value represents the result of the response status 200 codes
+            if (response.ok) {
+                const result = await response.json();
+
+                getTemplateCallBack(result); // here we pass the result of the json response to the callback function
+            } else {
+                throw new Error("Error fetching template image");
+            }
+        })
+        .catch((error) => {
+            var imageEl = dojo.byId("templateThumbnailHolder");
+            imageEl.src = "/html/images/shim.gif";
+            imageEl.style.border = "0px";
+        });
+
+        var templateSel=dijit.byId("templateSel");
+        templateSel.set("value",val);
+    }
+
+    var currentTemplateIdElement = dojo.byId("currentTemplateId");
+    currentTemplateIdElement.value = val;
+
+
+
+    // try to preload the default template.
+    var defaultTemplateName = '$config.getStringProperty("DEFAULT_TEMPLATE_NAME", "System Template")';
+
+    var onTemplateFetchComplete = function(templates, currentRequest){
+
+        var normalizeKey = function (obj) {
+            return obj.fullTitle.replace(new RegExp("\\("+obj.hostName+"\\)"), '').replace(/\s+/g,'').toLowerCase();
+        }
+
+        if((templates) && (templates.length > 0)){
+            var templatesMapByName = templates.reduce(function(map, obj) {
+                var key = normalizeKey(obj);
+                if (!(key in map)){
+                    map[key] = obj;
+                }
+                return map;
+            }, {});
+
+            var templatesMapById = templates.reduce(function(map, obj) {
+                map[obj.identifier] = obj;
+                return map;
+            }, {});
+
+            var obj = val != undefined && val != "" && val != "0"? templatesMapById[val]:null;
+
+            if (!obj) {
+                var normalizedTemplateName = defaultTemplateName.replace(/\s+/g,'').toLowerCase();
+                var obj = templatesMapByName[normalizedTemplateName];
+            }
+
+            if(obj){
+                var value = obj.identifier;
+                var fullTitle = obj.fullTitle;
+                // We set the values directly into the components because setting it direcrtly into`templateSel` fires another load operation.
+                dojo.byId("currentTemplateId").value = value;
+                dojo.byId("template").value = value;
+                dijit.byId('templateSel').set("displayedValue", fullTitle);
+                fetch("/api/v1/templates/image", {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/json"
+                    },
+                    body: JSON.stringify({
+                        templateId: value
+                    })
+                }).then(async (response) => {
+                    // The ok value represents the result of the response status 200 codes
+                    if (response.ok) {
+                        const result = await response.json();
+
+                        getTemplateCallBack(result); // here we pass the result of the json response to the callback function
+                    } else {
+                        throw new Error("Error fetching template image");
+                    }
+                })
+                .catch((error) => {
+                    var imageEl = dojo.byId("templateThumbnailHolder");
+                    imageEl.src = "/html/images/shim.gif";
+                    imageEl.style.border = "0px";
+                });
+            }
+        }
+    };
+
+    var templateFetchParams = {
+        query: {
+            fullTitle: '*',
+            hostId: hostId
+        },
+        queryOptions: {},
+        start: 0,
+        count: 1000,
+        sort: [],
+        onComplete: onTemplateFetchComplete
+    };
+
+    window.top._templateStore.fetch(templateFetchParams);
+});
+</script>
+
+<div id="templateHolder"></div>
+<input id="currentTemplateId" type="hidden" name="currentTemplateId" value=""/>
+<div>
+    <img id="templateThumbnailHolder" src="/html/images/shim.gif" alt="Template Thumbnail"/>
+</div>
+
diff --git a/files/working/es-es/demo.dotcms.com/my test/cli-screenshot.png b/files/working/es-es/demo.dotcms.com/my test/cli-screenshot.png
new file mode 100644
index 0000000..2d98753
Binary files /dev/null and b/files/working/es-es/demo.dotcms.com/my test/cli-screenshot.png differ