diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 9f5c606a11..6ad5660ccb 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -7,7 +7,7 @@
 		</span>
 	</div>
 
-	<div class="row-fluid">
+	<div class="row">
 		<div class="span2 account-block" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block">
 				<img src="{picture}" class="user-profile-picture img-thumbnail"/>
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 974147a6ef..1edeff2baa 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -67,7 +67,7 @@
 		</span>
 	</div>
 
-	<div class="row-fluid">
+	<div class="row">
 		<div class="span2" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block text-center">
 				<img id="user-current-picture" class="user-profile-picture img-thumbnail" src="{picture}" /><br/>
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index d5d51fc26e..b65c515f17 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -8,7 +8,7 @@
 		</span>
 	</div>
 
-	<div class="row-fluid">
+	<div class="row">
 		<div class="span6">
 			<h4>privacy</h4>
 			<label class="checkbox">
diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl
index 14a70f057a..bd5a7d587b 100644
--- a/public/templates/admin/categories.tpl
+++ b/public/templates/admin/categories.tpl
@@ -10,7 +10,7 @@
 
 <!-- TODO: remove inline event listeners. -->
 
-<div class="row-fluid admin-categories">
+<div class="row admin-categories">
 	<ul class="col-md-12" id="entry-container">
 	<!-- BEGIN categories -->
 		<li data-cid="{categories.cid}" class="entry-row {categories.blockclass}">
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index fea02f83e4..b83e9cd022 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -64,7 +64,7 @@
 	<div id="alert_window"></div>
 	
 	<div class="container">
-		<div class="row-fluid">
+		<div class="row">
 			<div class="col-md-3">
 				<div class="well sidebar-nav">
 					<ul class="nav nav-list">
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
index 0c1d18e6c5..b91c1393d0 100644
--- a/public/templates/favourites.tpl
+++ b/public/templates/favourites.tpl
@@ -11,7 +11,7 @@
 
 	<div id="no-favourites-notice" class="alert alert-warning {show_nofavourites}">You don't have any favourites, favourite some posts to see them here!</div>
 
-	<div class="row-fluid">
+	<div class="row">
 		<div class="col-md-12 user-favourite-posts">
 			<!-- BEGIN posts -->
 			<div class="topic-row img-thumbnail clearfix" topic-url="topic/{posts.tid}/#{posts.pid}">
diff --git a/public/templates/noscript/topic.tpl b/public/templates/noscript/topic.tpl
index c9a259a6cd..5a4e5925a8 100644
--- a/public/templates/noscript/topic.tpl
+++ b/public/templates/noscript/topic.tpl
@@ -1,7 +1,7 @@
 		<ul class="posts">
 			<!-- BEGIN main_posts -->
 			<li>
-				<div class="row-fluid">
+				<div class="row">
 					<div class="span2">
 						<img src="{main_posts.picture}" /><br />
 						{main_posts.username}
@@ -14,7 +14,7 @@
 			<!-- END main_posts -->
 			<!-- BEGIN posts -->
 			<li>
-				<div class="row-fluid">
+				<div class="row">
 					<div class="span2">
 						<img src="{posts.picture}" /><br />
 						{posts.username}
diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl
index 9661f468cd..16683d8083 100644
--- a/public/templates/recent.tpl
+++ b/public/templates/recent.tpl
@@ -18,7 +18,7 @@
 		<!-- BEGIN topics -->
 		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 			<li class="category-item {topics.deleted-class}">
-				<div class="row-fluid">
+				<div class="row">
 					<div class="col-md-12 topic-row img-thumbnail">
 						<div class="latest-post visible-lg visible-md">
 							<div class="pull-right">										
diff --git a/public/templates/search.tpl b/public/templates/search.tpl
index 1f65ad24e4..a506a1c7fc 100644
--- a/public/templates/search.tpl
+++ b/public/templates/search.tpl
@@ -13,7 +13,7 @@
 		<!-- BEGIN topics -->
 		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 			<li class="category-item">
-				<div class="row-fluid">
+				<div class="row">
 					<div class="col-md-12 img-thumbnail">
 						<div class="search-result-post">
 							<img src="{topics.teaser_userpicture}" />
@@ -28,7 +28,7 @@
 		<!-- BEGIN posts -->
 		<a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}">
 			<li class="category-item">
-				<div class="row-fluid">
+				<div class="row">
 					<div class="col-md-12 img-thumbnail">
 						<div class="search-result-post">
 							<img src="{posts.picture}" />
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 1df6d1c766..45ce6f7f7c 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -75,7 +75,7 @@
 
 	<!-- BEGIN posts -->
 		<a id="post_anchor_{posts.pid}" name="{posts.pid}"></a>
-		<li class="row-fluid post-row" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.username}" data-deleted="{posts.deleted}">
+		<li class="row post-row" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.username}" data-deleted="{posts.deleted}">
 			<div class="span1 profile-image-block hidden-xs hidden-sm">
 				<!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>-->
 				<a href="/users/{posts.userslug}">
diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl
index 3a37ac38bb..817151ab98 100644
--- a/public/templates/unread.tpl
+++ b/public/templates/unread.tpl
@@ -22,7 +22,7 @@
 		<!-- BEGIN topics -->
 		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 			<li class="category-item {topics.deleted-class}">
-				<div class="row-fluid">
+				<div class="row">
 					<div class="col-md-12 topic-row img-thumbnail">
 						<div class="latest-post visible-lg visible-md">
 							<div class="pull-right">