diff --git a/templates/_footer.gtpl b/templates/_footer.html
similarity index 100%
rename from templates/_footer.gtpl
rename to templates/_footer.html
diff --git a/templates/_head.gtpl b/templates/_head.html
similarity index 100%
rename from templates/_head.gtpl
rename to templates/_head.html
diff --git a/templates/completed.gtpl b/templates/completed.html
similarity index 98%
rename from templates/completed.gtpl
rename to templates/completed.html
index 3e1034d..1f525ae 100644
--- a/templates/completed.gtpl
+++ b/templates/completed.html
@@ -1,4 +1,4 @@
-{{template "_head.gtpl"}}
+{{template "_head.html"}}
 
   <div class="timeline">
     {{ if .}} {{range .}}
diff --git a/templates/deleted.gtpl b/templates/deleted.gtpl
deleted file mode 100644
index 05e8c49..0000000
--- a/templates/deleted.gtpl
+++ /dev/null
@@ -1,91 +0,0 @@
-{{template "_head.gtpl"}}
-<!--end mainHeader -->
-{{if .}}
-<a href="/delete/all">
-  <button class="btn-danger btn glyphicon glyphicon-trash floating-action-icon"></button>
-</a>
-{{end}}
-
-<!-- Add note modal -->
-<div class="modal fade " id="addNoteModal" tabindex="-1" role="dialog" aria-labelledby="newNoteLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="newNoteLabel"><span class="glyphicon glyphicon-pencil"></span>  New Task</h4>
-      </div>
-      <div class="modal-body">
-        <form>
-          <div class="form-group">
-            <!-- <label for="note-title" class="control-label">Title:</label> -->
-            <input type="text" class="form-control" id="add-note-title" placeholder="Title" style="border:none;border-bottom:1px solid gray; box-shadow:none;">
-          </div>
-          <div class="form-group">
-            <!-- <label for="note-content" class="control-label">Content:</label> -->
-            <textarea class="form-control" id="add-note-content" placeholder="Content" rows="10" style="border:none;border-bottom:1px solid gray; box-shadow:none;"></textarea>
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" id="addNoteModalSaveBtn">Save</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- modal for opening note -->
-<div class="modal fade" id="openNoteModal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button class="close" data-dismiss="modal"> &times;</button>
-        <h4 class="modal-title"></h4>
-      </div>
-      <div class="modal-body">
-
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="timeline">
-  {{ if .}} {{range .}}
-  <div class="note">
-    <p class="noteHeading">{{.Title}}</p>
-    <hr>
-    <p class="noteContent">{{.Content}}</p>
-    <span class="notefooter">
-                    <ul class="menu">
-                     <!-- <li role="presentation">
-                          <a role="menuitem" tabindex="-1" href="/share/{{.Id}}">
-                          <span class="glyphicon glyphicon-share"></span> Share</a>
-    </li>
-    <li role="presentation">
-      <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
-        <span class="glyphicon glyphicon-lock"></span> Mask</a>
-    </li>
-    <li role="presentation">
-      <a role="menuitem" tabindex="-1" href="/archive/{{.Id}}">
-        <span class="glyphicon glyphicon-inbox"></span> Edit</a>
-    </li>!-->
-    <li role="presentation">
-      <a role="menuitem" tabindex="-1" href="/delete/{{.Id}}">
-        <span class="glyphicon glyphicon-trash"></span> Delete</a>
-    </li>
-    <li role="presentation">
-      <a role="menuitem" tabindex="-1" href="/restore/{{.Id}}">
-        <span class="glyphicon glyphicon-inbox"></span> Restore</a>
-    </li>
-    </ul>
-    </span>
-  </div>
-  {{end}} {{else}}
-  <p>No tasks here</p>
-  {{end}}
-</div>
-{{template "footer.gtpl"}}
-
-</body>
-
-</html>
diff --git a/templates/edit.gtpl b/templates/edit.html
similarity index 97%
rename from templates/edit.gtpl
rename to templates/edit.html
index 2abc3ab..f3a6314 100644
--- a/templates/edit.gtpl
+++ b/templates/edit.html
@@ -1,4 +1,4 @@
-{{template "_head.gtpl"}}
+{{template "_head.html"}}
   <div class="timeline">
     {{ if .}}
     <div class="modal-content">
diff --git a/templates/home.gtpl b/templates/home.html
similarity index 99%
rename from templates/home.gtpl
rename to templates/home.html
index 58721d6..8a7c6c1 100755
--- a/templates/home.gtpl
+++ b/templates/home.html
@@ -1,4 +1,4 @@
-{{template "_head.gtpl"}}
+{{template "_head.html"}}
 
   <!--end mainHeader -->
   <button class=" btn-danger btn glyphicon glyphicon-plus floating-action-icon floating-action-icon-add"></button>
diff --git a/templates/search.gtpl b/templates/search.html
similarity index 98%
rename from templates/search.gtpl
rename to templates/search.html
index 4ae5a5a..3c445e7 100644
--- a/templates/search.gtpl
+++ b/templates/search.html
@@ -1,4 +1,4 @@
-{{template "_head.gtpl"}}
+{{template "_head.html"}}
   <!--end mainHeader -->
   <button class=" btn-danger btn glyphicon glyphicon-plus floating-action-icon floating-action-icon-add"></button>