diff --git a/TODO.otl b/TODO.otl
index 67dd945..bea7747 100755
--- a/TODO.otl
+++ b/TODO.otl
@@ -6,7 +6,7 @@
 		[_] BUG: no drag threshold on excludedElements (TouchSwipe)
 		| stalled...
 	[_] 78% general todo
-		[_] add templates...
+		[_] add in-page live templates...
 		| elements that will get generated content, like page numbers etc.
 		[_] BUG: initial load on android does not center on the correct page...
 		[_] magazine loader and data format...
diff --git a/magazine.js b/magazine.js
index 174af84..ef9ff80 100755
--- a/magazine.js
+++ b/magazine.js
@@ -424,8 +424,10 @@ function setupBookmarkTouchZones(){
 			.attr({
 				title: 'Toggle bookmark (B)'
 			})
-			.click(function(){
-				toggleBookmark($(e))
+			.swipe({
+				click: function(){
+					toggleBookmark($(e))
+				}
 			})
 	})	
 }
@@ -472,8 +474,10 @@ function toggleBookmark(n){
 			.attr({
 				title: 'Toggle bookmark (B)'
 			})
-			.click(function(){
-				toggleBookmark(cur)
+			.swipe({
+				click: function(){
+					toggleBookmark(cur)
+				}
 			})
 
 		$('.viewer').trigger('bookmarkAdded', n)
@@ -526,8 +530,10 @@ function makeArticleIndicator(i, article, width){
 			width: width,
 			left: width*n
 		})
-		.click(function(){
-			setCurrentPage(n)
+		.swipe({
+			click: function(){
+				setCurrentPage(n)
+			}
 		})
 	return article
 }
@@ -628,8 +634,10 @@ function makeBookmarkIndicator(n){
 		.attr({
 			page: n
 		})
-		.click(function(){
-			setCurrentPage(n)
+		.swipe({
+			click: function(){
+				setCurrentPage(n)
+			}
 		})
 
 	return res