diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..804a1a6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+build
+js/templates.js
+vendor
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 3db1d2c..4769878 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,9 @@ depsmin:
 	wget https://github.com/varun-raj/medium-editor-autolist/raw/master/dist/autolist.min.js
 	mv autolist.min.js vendor/autolist.js
 
+js-templates:
+	handlebars js/templates -f js/templates.js
+
 clean:
 	rm -rf $(build_dir)
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 44365d6..71d855d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -17,6 +17,6 @@
     <screenshot small-thumbnail="https://user-images.githubusercontent.com/733715/38871311-dac5a80a-4226-11e8-961d-63b276380b6b.png">https://user-images.githubusercontent.com/733715/38871311-dac5a80a-4226-11e8-961d-63b276380b6b.png</screenshot>
     <screenshot>https://user-images.githubusercontent.com/733715/38871255-b07a7d5a-4226-11e8-8403-650cbea50be0.png</screenshot>
     <dependencies>
-        <nextcloud min-version="14" max-version="14" />
+        <nextcloud min-version="14" max-version="15"/>
     </dependencies>
 </info>
diff --git a/js/script.js b/js/script.js
index 219a5c4..ba6bfaa 100644
--- a/js/script.js
+++ b/js/script.js
@@ -290,10 +290,12 @@ View.prototype = {
         return digits[1] + '#' + rgb.toString(16).toUpperCase();
     },
     renderContent: function () {
-        var source = $('#content-tpl').html();
-        var template = Handlebars.compile(source);
-        var html = template({notes: this._notes.getAll()});
-
+        var html = Handlebars.templates['notes']({
+            notes: this._notes.getAll(),
+            cancelTxt: t('quicknotes', 'Cancel'),
+            saveTxt: t('quicknotes', 'Save'),
+            emptyTxt: t('quicknotes', 'Nothing here. Take your quick notes.'),
+        });
         $('#div-content').html(html);
 
         // Init masonty grid to notes.
@@ -510,9 +512,14 @@ View.prototype = {
         });
     },
     renderNavigation: function () {
-        var source = $('#navigation-tpl').html();
-        var template = Handlebars.compile(source);
-        var html = template({colors: this._notes.getColors(), notes: this._notes.getAll()});
+        var html = Handlebars.templates['navigation']({
+            colors: this._notes.getColors(),
+            notes: this._notes.getAll(),
+            newNoteTxt: t('quicknotes', 'New note'),
+            allNotesTxt: t('quicknotes', 'All notes'),
+            colorsTxt: t('quicknotes', 'Colors'),
+            notesTxt: t('quicknotes', 'Notes'),
+        });
 
         $('#app-navigation ul').html(html);
 
diff --git a/js/templates/navigation.handlebars b/js/templates/navigation.handlebars
new file mode 100644
index 0000000..e358d66
--- /dev/null
+++ b/js/templates/navigation.handlebars
@@ -0,0 +1,33 @@
+<div id="new-note-fixed">
+	<div>
+		<button type="button" id="new-note" class="icon-add">{{newNoteTxt}}</button>
+	</div>
+</div>
+<li id="all-notes">
+	<a href="#" class="icon-home svg">
+		{{allNotesTxt}}
+	</a>
+</li>
+<li id="colors-folder" class="collapsible open">
+	<button class="collapse"></button>
+	<a href="#" class="icon-search svg">{{colorsTxt}}</a>
+	<ul>
+		<li style="display: flex; justify-content: center;">
+			<button class="circle-toolbar icon-checkmark any-color"></button>
+			{{#each colors}}
+				<button class="circle-toolbar" style="background-color: {{color}} "></button>
+			{{/each}}
+		</li>
+	</ul>
+</li>
+<li id="notes-folder" class="collapsible open">
+	<button class="collapse"></button>
+	<a href="#" class="icon-folder svg">{{notesTxt}}</a>
+	<ul>
+		{{#each notes}}
+			<li class="note with-menu {{#if active}}active{{/if}}"  data-id="{{ id }}">
+				<a href="#">{{{ title }}}</a>
+			</li>
+		{{/each}}
+	</ul>
+</li>
diff --git a/templates/part.note-modal-editable.php b/js/templates/notes.handlebars
similarity index 53%
rename from templates/part.note-modal-editable.php
rename to js/templates/notes.handlebars
index 9d51dff..0fe1d20 100644
--- a/templates/part.note-modal-editable.php
+++ b/js/templates/notes.handlebars
@@ -1,3 +1,38 @@
+{{#if notes}}
+<div class="notes-grid">
+	{{#each notes}}
+	<div class="note-grid-item">
+		<div class="quicknote noselect {{#if active}}note-active{{/if}} {{#if isshared}}shared{{/if}} {{#if sharedwith}}shareowner{{/if}}" style="background-color: {{color}}" data-id="{{ id }}" data-timestamp="{{ timestamp }}" >
+			{{#if isshared}}
+			<div>
+				<div class='icon-share shared-title' title="Shared by {{ userid }}"></div>
+				<div class='note-title'>
+					{{{ title }}}
+				</div>
+			</div>
+			<div id='content' class='note-content'>
+				{{{ content }}}
+			</div>
+			{{else}}
+			<div>
+				<div class="icon-delete hide-delete-icon icon-delete-note" title="Delete"></div>
+				<!--
+				{{#if sharedwith}}
+				<div class='icon-share shared-title-owner' title="Shared with {{ sharedwith }}"></div>
+				{{/if}}
+				-->
+				<div class='note-title'>
+					{{{ title }}}
+				</div>
+			</div>
+			<div class='note-content'>
+				{{{ content }}}
+			</div>
+			{{/if}}
+		</div>
+	</div>
+	{{/each}}
+</div>
 <div id="modal-note-div" class="hide-modal-note modal-note-background">
 	<div class="modal-content">
 		<div class="quicknote note-active" style="background-color: #F7EB96" data-id="-1">
@@ -25,11 +60,23 @@
 					<!--
 					<button id='share-button'><?php p($l->t('Share'));?></button>
 					-->
-					<button id='cancel-button'><?php p($l->t('Cancel')); ?></button>
-					<button id='save-button'><?php p($l->t('Save')); ?></button>
+					<button id='cancel-button'>
+						{{ cancelTxt }}
+					</button>
+					<button id='save-button'>
+						{{ saveTxt }}
+					</button>
+					</div>
+						<div style="clear: both;"></div>
+					</div>
 				</div>
-				<div style="clear: both;"></div>
 			</div>
 		</div>
 	</div>
 </div>
+{{else}}
+<div class="emptycontent">
+	<div class="icon-folder"></div>
+		{{ emptyMsg }}
+	</div>
+{{/if}}
diff --git a/templates/main.php b/templates/main.php
index 7c35751..8a9780b 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,5 +1,6 @@
 <?php
 vendor_script('quicknotes', 'handlebars');
+script('quicknotes', 'templates');
 vendor_script('quicknotes', 'isotope.pkgd');
 vendor_script('quicknotes', 'medium-editor');
 vendor_style('quicknotes', 'medium-editor');
diff --git a/templates/part.content.php b/templates/part.content.php
index cb07a98..4856679 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -1,16 +1 @@
-<script id="content-tpl" type="text/x-handlebars-template">
-	{{#if notes}}
-		<div class="notes-grid">
-			{{#each notes}}
-				<?php print_unescaped($this->inc('part.note')); ?>
-			{{/each}}
-		</div>
-		<?php print_unescaped($this->inc('part.note-modal-editable')); ?>
-	{{else}}
-		<div class="emptycontent">
-			<div class="icon-folder"></div>
-			<?php p($l->t('Nothing here. Take your quick notes.')); ?>
-		</div>
-	{{/if}}
-</script>
 <div id="div-content"></div>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 7034eb1..3052017 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -1,50 +1 @@
-<!-- translation strings -->
-<div style="display:none" id="new-note-string"><?php p($l->t('New note')); ?></div>
-
-<script id="navigation-tpl" type="text/x-handlebars-template">
-	<div id="new-note-fixed">
-		<div><button type="button" id="new-note" class="icon-add"><?php p($l->t('New note'));?></button></div>
-	</div>
-	<li id="all-notes"><a href="#" class="icon-home svg"><?php p($l->t('All notes')); ?></a></li>
-	<!--
-	<li id="shared-with-you"><a href="#" class="icon-share svg"><?php p($l->t('Shared with you')); ?></a></li>
-	<li id="shared-by-you"><a href="#" class="icon-share svg"><?php p($l->t('Shared with others')); ?></a></li>
-	-->
-	<li id="colors-folder" class="collapsible open">
-		<button class="collapse"></button>
-		<a href="#" class="icon-search svg"><?php p($l->t('Colors')); ?></a>
-		<ul>
-			<li style="display: flex; justify-content: center;">
-				<button class="circle-toolbar icon-checkmark any-color"></button>
-				{{#each colors}}
-					<button class="circle-toolbar" style="background-color: {{color}} "></button>
-				{{/each}}
-			</li>
-		</ul>
-	</li>
-	<li id="notes-folder" class="collapsible open">
-		<button class="collapse"></button>
-		<a href="#" class="icon-folder svg"><?php p($l->t('Notes')); ?></a>
-		<ul>
-			{{#each notes}}
-				<li class="note with-menu {{#if active}}active{{/if}}"  data-id="{{ id }}">
-					<a href="#">{{{ title }}}</a>
-					<!--
-					<div class="app-navigation-entry-utils">
-						<ul>
-							<li class="app-navigation-entry-utils-menu-button svg"><button></button></li>
-						</ul>
-					</div>
-					<div class="app-navigation-entry-menu">
-						<ul>
-							<li><button class="delete icon-delete svg" title="delete"></button></li>
-						</ul>
-					</div>
-					-->
-				</li>
-			{{/each}}
-		</ul>
-	</li>
-</script>
-
 <ul class="with-icon"></ul>
\ No newline at end of file
diff --git a/templates/part.note.php b/templates/part.note.php
deleted file mode 100644
index bae5767..0000000
--- a/templates/part.note.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="note-grid-item">
-	<div class="quicknote noselect {{#if active}}note-active{{/if}} {{#if isshared}}shared{{/if}} {{#if sharedwith}}shareowner{{/if}}" style="background-color: {{color}}" data-id="{{ id }}" data-timestamp="{{ timestamp }}" >
-		{{#if isshared}}
-			<div>
-				<div class='icon-share shared-title' title="Shared by {{ userid }}"></div>
-				<div class='note-title'>{{{ title }}}</div>
-			</div>
-			<div id='content' class='note-content'>{{{ content }}}</div>
-		{{else}}
-			<div>
-				<div class="icon-delete hide-delete-icon icon-delete-note" title="Delete"></div>
-				<!--
-				{{#if sharedwith}}
-					<div class='icon-share shared-title-owner' title="Shared with {{ sharedwith }}"></div>
-				{{/if}}
-				-->
-				<div class='note-title'>{{{ title }}}</div>
-			</div>
-			<div class='note-content'>{{{ content }}}</div>
-		{{/if}}
-	</div>
-</div>