diff --git a/manifest.json b/manifest.json
index 3c5d8f0..ac1ceb0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"minAppVersion": "0.11.13",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",
diff --git a/src/ExcalidrawTemplate.ts b/src/ExcalidrawTemplate.ts
index cc55db6..972a453 100644
--- a/src/ExcalidrawTemplate.ts
+++ b/src/ExcalidrawTemplate.ts
@@ -141,7 +141,7 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
           this.canvas.theme = "light";
           return "light";
         default:
-          this.canvas = "dark";
+          this.canvas.theme = "dark";
           return "dark";
       }      
     },
@@ -152,7 +152,8 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
       });
     },
     async toClipboard(templatePath?:string) {
-      let elements = templatePath ? (await getTemplate(templatePath)).elements : [];
+      const template = templatePath ? (await getTemplate(templatePath)) : null;
+      let elements = template ? template.elements : [];
       for (let i=0;i<this.elementIds.length;i++) {
         elements.push(this.elementsDict[this.elementIds[i]]);
       }
@@ -163,7 +164,8 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
       }));
     },
     async create(params?:{filename: string, foldername:string, templatePath:string, onNewPane: boolean}) {
-      let elements = params?.templatePath ? (await getTemplate(params.templatePath)).elements : [];
+      const template = params?.templatePath ? (await getTemplate(params.templatePath)) : null;
+      let elements = template ? template.elements : [];
       for (let i=0;i<this.elementIds.length;i++) {
         elements.push(this.elementsDict[this.elementIds[i]]);
       }
@@ -177,14 +179,15 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
           "source": "https://excalidraw.com",
           "elements": elements,
           "appState": {
-            "theme": this.canvas.theme,
-            "viewBackgroundColor": this.canvas.viewBackgroundColor
+            "theme": template ? template.appState.theme : this.canvas.theme,
+            "viewBackgroundColor": template? template.appState.viewBackgroundColor : this.canvas.viewBackgroundColor
           }
         })
       );  
     },
     async createSVG(templatePath?:string) {
-      let elements = templatePath ? (await getTemplate(templatePath)).elements : [];
+      const template = templatePath ? (await getTemplate(templatePath)) : null;
+      let elements = template ? template.elements : [];
       for (let i=0;i<this.elementIds.length;i++) {
         elements.push(this.elementsDict[this.elementIds[i]]);
       }
@@ -195,8 +198,8 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
           "source": "https://excalidraw.com",
           "elements": elements,
           "appState": {
-            "theme": this.canvas.theme,
-            "viewBackgroundColor": this.canvas.viewBackgroundColor
+            "theme": template ? template.appState.theme : this.canvas.theme,
+            "viewBackgroundColor": template? template.appState.viewBackgroundColor : this.canvas.viewBackgroundColor
           }
         }),
         {
@@ -206,7 +209,8 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
       )     
     },
     async createPNG(templatePath?:string) {
-      let elements = templatePath ? (await getTemplate(templatePath)).elements : [];
+      const template = templatePath ? (await getTemplate(templatePath)) : null;
+      let elements = template ? template.elements : [];
       for (let i=0;i<this.elementIds.length;i++) {
         elements.push(this.elementsDict[this.elementIds[i]]);
       }
@@ -217,8 +221,8 @@ export function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
           "source": "https://excalidraw.com",
           "elements": elements,
           "appState": {
-            "theme": this.canvas.theme,
-            "viewBackgroundColor": this.canvas.viewBackgroundColor
+            "theme": template ? template.appState.theme : this.canvas.theme,
+            "viewBackgroundColor": template? template.appState.viewBackgroundColor : this.canvas.viewBackgroundColor
           }
         }),
         {
diff --git a/versions.json b/versions.json
index 0b8fa27..28de36e 100644
--- a/versions.json
+++ b/versions.json
@@ -1,4 +1,5 @@
 {
+  "1.0.9": "0.11.13",
   "1.0.8": "0.11.13",
   "1.0.7": "0.11.13",
   "1.0.6": "0.11.13",