diff --git a/manifest.json b/manifest.json
index 2bda0a2..484ab04 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
 	"id": "obsidian-plantuml",
 	"name": "PlantUML",
-	"version": "1.7.0",
-	"minAppVersion": "1.3.0",
+	"version": "1.8.0",
+	"minAppVersion": "1.5.7",
 	"description": "Render PlantUML Diagrams",
 	"author": "Johannes Theiner",
 	"authorUrl": "https://github.com/joethei/",
diff --git a/src/main.ts b/src/main.ts
index 77af878..b2aece8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,13 +1,13 @@
 import {
-    addIcon, Component, Platform,
-    Plugin, TFile
+    addIcon, Platform,
+    Plugin
 } from 'obsidian';
 import {DEFAULT_SETTINGS, PlantUMLSettings, PlantUMLSettingsTab} from "./settings";
-import {LocalProcessors} from "./localProcessors";
-import {DebouncedProcessors} from "./debouncedProcessors";
+import {LocalProcessors} from "./processors/localProcessors";
+import {DebouncedProcessors} from "./processors/debouncedProcessors";
 import {LOGO_SVG} from "./const";
-import {Processor} from "./processor";
-import {ServerProcessor} from "./serverProcessor";
+import {Processor} from "./processors/processor";
+import {ServerProcessor} from "./processors/serverProcessor";
 import {Replacer} from "./functions";
 import {PumlView, VIEW_TYPE} from "./PumlView";
 import localforage from "localforage";
@@ -84,10 +84,12 @@ export default class PlantumlPlugin extends Plugin {
         });
         this.registerExtensions(["puml", "pu"], VIEW_TYPE);
 
-        this.registerMarkdownCodeBlockProcessor("plantuml", processor.png);
+        this.registerMarkdownCodeBlockProcessor("plantuml", processor.default);
+        this.registerMarkdownCodeBlockProcessor("plantuml-png", processor.png);
         this.registerMarkdownCodeBlockProcessor("plantuml-ascii", processor.ascii);
         this.registerMarkdownCodeBlockProcessor("plantuml-svg", processor.svg);
-        this.registerMarkdownCodeBlockProcessor("puml", processor.png);
+        this.registerMarkdownCodeBlockProcessor("puml", processor.default);
+        this.registerMarkdownCodeBlockProcessor("puml-png", processor.png);
         this.registerMarkdownCodeBlockProcessor("puml-svg", processor.svg);
         this.registerMarkdownCodeBlockProcessor("puml-ascii", processor.ascii);
 
diff --git a/src/debouncedProcessors.ts b/src/processors/debouncedProcessors.ts
similarity index 98%
rename from src/debouncedProcessors.ts
rename to src/processors/debouncedProcessors.ts
index f28ebcf..01ecc95 100644
--- a/src/debouncedProcessors.ts
+++ b/src/processors/debouncedProcessors.ts
@@ -1,6 +1,6 @@
 import { debounce, Debouncer, MarkdownPostProcessorContext, Menu, Notice, TFile } from "obsidian";
 import { v4 as uuidv4 } from "uuid";
-import PlantumlPlugin from "./main";
+import PlantumlPlugin from "../main";
 import { Processor } from "./processor";
 
 export class DebouncedProcessors implements Processor {
@@ -18,6 +18,10 @@ export class DebouncedProcessors implements Processor {
         this.debounceTime = debounceTime * this.SECONDS_TO_MS_FACTOR;
     }
 
+    default = async(source: string, el: HTMLElement, ctx: MarkdownPostProcessorContext) => {
+        await this.png(source, el, ctx);
+    }
+
     png = async (source: string, el: HTMLElement, ctx: MarkdownPostProcessorContext) => {
         await this.processor(source, el, ctx, "png", this.plugin.getProcessor().png);
     }
diff --git a/src/localProcessors.ts b/src/processors/localProcessors.ts
similarity index 98%
rename from src/localProcessors.ts
rename to src/processors/localProcessors.ts
index c0b5029..fb6f2a2 100644
--- a/src/localProcessors.ts
+++ b/src/processors/localProcessors.ts
@@ -1,9 +1,9 @@
-import PlantumlPlugin from "./main";
+import PlantumlPlugin from "../main";
 import {Processor} from "./processor";
 import {MarkdownPostProcessorContext, moment} from "obsidian";
 import * as plantuml from "plantuml-encoder";
-import {insertAsciiImage, insertImageWithMap, insertSvgImage} from "./functions";
-import {OutputType} from "./const";
+import {insertAsciiImage, insertImageWithMap, insertSvgImage} from "../functions";
+import {OutputType} from "../const";
 import * as localforage from "localforage";
 
 export class LocalProcessors implements Processor {
diff --git a/src/processor.ts b/src/processors/processor.ts
similarity index 100%
rename from src/processor.ts
rename to src/processors/processor.ts
diff --git a/src/serverProcessor.ts b/src/processors/serverProcessor.ts
similarity index 96%
rename from src/serverProcessor.ts
rename to src/processors/serverProcessor.ts
index eef83b7..082a785 100644
--- a/src/serverProcessor.ts
+++ b/src/processors/serverProcessor.ts
@@ -1,9 +1,9 @@
 import {MarkdownPostProcessorContext, request} from "obsidian";
-import {DEFAULT_SETTINGS} from "./settings";
+import {DEFAULT_SETTINGS} from "../settings";
 import * as plantuml from "plantuml-encoder";
-import PlantumlPlugin from "./main";
+import PlantumlPlugin from "../main";
 import {Processor} from "./processor";
-import {insertAsciiImage, insertImageWithMap, insertSvgImage} from "./functions";
+import {insertAsciiImage, insertImageWithMap, insertSvgImage} from "../functions";
 
 export class ServerProcessor implements Processor {
     plugin: PlantumlPlugin;
diff --git a/versions.json b/versions.json
index eb8e37f..eeb8e0b 100644
--- a/versions.json
+++ b/versions.json
@@ -25,5 +25,6 @@
 	"1.6.4": "0.13.0",
 	"1.6.5": "0.13.0",
 	"1.6.6": "0.15.0",
-	"1.7.0": "1.3.0"
+	"1.7.0": "1.3.0",
+	"1.8.0": "1.5.7"
 }