diff --git a/templates/ip-blacklist.tpl b/templates/ip-blacklist.tpl
index da3fea1..1b640d3 100644
--- a/templates/ip-blacklist.tpl
+++ b/templates/ip-blacklist.tpl
@@ -3,34 +3,34 @@
 <div class="row ip-blacklist">
 	<div class="col-lg-12">
 		<p class="lead">
-			[[admin/manage/ip-blacklist:lead]]
+			[[ip-blacklist:lead]]
 		</p>
 		<p>
-			[[admin/manage/ip-blacklist:description]]
+			[[ip-blacklist:description]]
 		</p>
 
 		<div class="row">
 			<div class="col-sm-6">
 				<div class="panel panel-default">
-					<div class="panel-heading">[[admin/manage/ip-blacklist:active-rules]]</div>
+					<div class="panel-heading">[[ip-blacklist:active-rules]]</div>
 					<div class="panel-body">
 						<textarea id="blacklist-rules">{rules}</textarea><br />
 						<button type="button" class="btn btn-warning" data-action="test">
-							<i class="fa fa-bomb"></i> [[admin/manage/ip-blacklist:validate]]
+							<i class="fa fa-bomb"></i> [[ip-blacklist:validate]]
 						</button>
 						<button type="button" class="btn btn-primary" data-action="apply">
-							<i class="fa fa-save"></i> [[admin/manage/ip-blacklist:apply]]
+							<i class="fa fa-save"></i> [[ip-blacklist:apply]]
 						</button>
 					</div>
 				</div>
 				<div class="panel panel-default">
-					<div class="panel-heading">[[admin/manage/ip-blacklist:hints]]</div>
+					<div class="panel-heading">[[ip-blacklist:hints]]</div>
 					<div class="panel-body">
 						<p>
-							[[admin/manage/ip-blacklist:hint-1]]
+							[[ip-blacklist:hint-1]]
 						</p>
 						<p>
-							[[admin/manage/ip-blacklist:hint-2]]
+							[[ip-blacklist:hint-2]]
 						</p>
 					</div>
 				</div>
@@ -40,14 +40,14 @@
 					<div class="panel-body">
 						<div><canvas id="blacklist:hourly" height="250"></canvas></div>
 					</div>
-					<div class="panel-footer"><small>[[admin/manage/ip-blacklist:analytics.blacklist-hourly]]</small></div>
+					<div class="panel-footer"><small>[[ip-blacklist:analytics.blacklist-hourly]]</small></div>
 				</div>
 
 				<div class="panel panel-default">
 					<div class="panel-body">
 						<div><canvas id="blacklist:daily" height="250"></canvas></div>
 					</div>
-					<div class="panel-footer"><small>[[admin/manage/ip-blacklist:analytics.blacklist-daily]]</small></div>
+					<div class="panel-footer"><small>[[ip-blacklist:analytics.blacklist-daily]]</small></div>
 				</div>
 			</div>
 		</div>
diff --git a/templates/post-queue.tpl b/templates/post-queue.tpl
index 73e0293..9185f13 100644
--- a/templates/post-queue.tpl
+++ b/templates/post-queue.tpl
@@ -4,12 +4,12 @@
 	<div class="col-xs-12">
 		<div class="post-queue panel panel-primary preventSlideout">
 			<div class="panel-heading">
-				[[admin/manage/post-queue:post-queue]]
+				[[post-queue:post-queue]]
 			</div>
 
 			<!-- IF !posts.length -->
 			<p class="panel-body">
-				[[admin/manage/post-queue:description, {config.relative_path}/admin/settings/post#post-queue]]
+				[[post-queue:description, {config.relative_path}/admin/settings/post#post-queue]]
 			</p>
 			<!-- ENDIF !posts.length -->
 
@@ -17,11 +17,11 @@
 				<table class="table table-striped posts-list">
 					<thead>
 						<tr>
-							<th>[[admin/manage/post-queue:user]]</th>
-							<th>[[admin/manage/post-queue:category]] <i class="fa fa-info-circle" data-toggle="tooltip" title="[[admin/manage/post-queue:content-editable]]"></i></th>
-							<th>[[admin/manage/post-queue:title]] <i class="fa fa-info-circle" data-toggle="tooltip" title="[[admin/manage/post-queue:content-editable]]"></i></th>
-							<th>[[admin/manage/post-queue:content]] <i class="fa fa-info-circle" data-toggle="tooltip" title="[[admin/manage/post-queue:content-editable]]"></i></th>
-							<th>[[admin/manage/post-queue:posted]]</th>
+							<th>[[post-queue:user]]</th>
+							<th>[[post-queue:category]] <i class="fa fa-info-circle" data-toggle="tooltip" title="[[post-queue:content-editable]]"></i></th>
+							<th>[[post-queue:title]] <i class="fa fa-info-circle" data-toggle="tooltip" title="[[post-queue:content-editable]]"></i></th>
+							<th>[[post-queue:content]] <i class="fa fa-info-circle" data-toggle="tooltip" title="[[post-queue:content-editable]]"></i></th>
+							<th>[[post-queue:posted]]</th>
 							<th></th>
 						</tr>
 					</thead>
@@ -40,7 +40,7 @@
 							</td>
 							<td class="col-md-2 topic-title">
 								<!-- IF posts.data.tid -->
-								<a href="{config.relative_path}/topic/{posts.data.tid}">[[admin/manage/post-queue:reply-to, {posts.topic.title}]]</a>
+								<a href="{config.relative_path}/topic/{posts.data.tid}">[[post-queue:reply-to, {posts.topic.title}]]</a>
 								<!-- ENDIF posts.data.tid -->
 								{posts.data.title}
 							</td>