diff --git a/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss b/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss
index 9847d1e..e15b7af 100644
--- a/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss
+++ b/app/templates/SilverStripe/Blog/Includes/BlogPostInfo.ss
@@ -1,4 +1,4 @@
-<div class="blog-post-info">
+<div class="blog-post__info blog-post-info">
 	<div class="row">
 	    <%-- div class="published-date">
 	        <div class="day">$PublishDate.Format("d")</div>
@@ -6,22 +6,22 @@
 	    </div --%>
 	    <div class="col-sm-5">
 		    <% if $FeaturedImage %>
-		        <div class="img card-img-top">
+		        <div class="blog-post__img img card-img-top">
 		            $FeaturedImage.FocusFill(350,200)
 		        </div>
 		    <% end_if %>
 		</div>
 
-		<div class="col-sm-7 blog-body">
-	        <h2 class="card-title title h3">
+		<div class="col-sm-7 blog-post__body blog-body">
+	        <h2 class="blog-post__title card-title title h3">
 	        	$Title
 	        </h2>
 
-	        <div class="card-text typography summary">
+	        <div class="blog-post__summary card-text typography summary">
 	            $Summary
 	        </div>
 
-	        <a href="{$Link}" class="btn btn-link stretched-link">
+	        <a href="{$Link}" class="blog-post__btn btn btn-link stretched-link">
 	        	<span class="sr-only"><%t SilverStripe\\Blog\\Model\\Blog.READMORE "Read More" %> &raquo;</span>
 	        </a>
 
diff --git a/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss b/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss
index dd6c550..2a248ed 100644
--- a/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss
+++ b/app/templates/SilverStripe/Blog/Includes/EntryMeta.ss
@@ -1,6 +1,6 @@
-<div class="blog-post-meta text-muted">
+<div class="blog-post__meta blog-post-meta text-muted">
     <% if $Categories.exists %>
-        <div class="categories">
+        <div class="blog-post__categories categories">
             <%t SilverStripe\\Blog\\Model\\Blog.PostedIn "Posted in" %>
             <% loop $Categories %>
                 <a href="$Link" title="$Title" class="category">$Title</a><% if not Last %>, <% else %>;<% end_if %>
@@ -9,7 +9,7 @@
     <% end_if %>
 
     <% if $Tags.exists %>
-        <div class="tags">
+        <div class="blog-post__tags tags">
             <%t SilverStripe\\Blog\\Model\\Blog.Tagged "Tagged" %>
             <% loop $Tags %>
                 <a href="$Link" title="$Title" class="tag">$Title</a><% if not Last %>, <% else %>;<% end_if %>
@@ -17,36 +17,36 @@
         </div>
     <% end_if %>
 
-    <div class="posted-ago">
+    <div class="blog-post__ago posted-ago">
         <%t SilverStripe\\Blog\\Model\\Blog.Posted "Posted" %>
         <a href="$MonthlyArchiveLink">$PublishDate.ago</a>
     </div>
 
     <% if $Credits %>
-        <div class="credits">
+        <div class="blog-post__credits credits">
             <%t SilverStripe\\Blog\\Model\\Blog.By "by" %>
 
             <% loop $Credits %>
                 <% if not $First && not $Last %>, <% end_if %>
                 <% if not $First && $Last %> <%t SilverStripe\\Blog\\Model\\Blog.AND "and" %> <% end_if %>
                 <% if $URLSegment && not $Up.ProfilesDisabled %>
-                    <a href="$URL" class="credit">$Name.XML</a>
+                    <a href="$URL" class="blog-post__credit credit">$Name.XML</a>
                 <% else %>
-                    <span class="credit">$Name.XML</span>
+                    <span class="blog-post__credit credit">$Name.XML</span>
                 <% end_if %>
             <% end_loop %>
         </div>
     <% end_if %>
 
     <% if $Comments.exists %>
-        <a class="comments" href="{$Link}#comments-holder">
+        <a class="blog-post__comments comments" href="{$Link}#comments-holder">
             <span class="count">$Comments.count</span>
             <%t SilverStripe\\Blog\\Model\\Blog.Comments "comments" %>
         </a>
     <% end_if %>
 
     <% if $MinutesToRead %>
-    <div class="reading-time">
+    <div class="blog-post__reading-time reading-time">
         <% if $MinutesToRead < 1 %>
             <%t SilverStripe\\Blog\\Model\\Blog.LessThanAMinuteToRead "Less than a minute to read" %>
         <% else %>
diff --git a/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss b/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss
index 2abf711..4811b71 100644
--- a/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss
+++ b/app/templates/SilverStripe/Blog/Model/Layout/Blog.ss
@@ -42,7 +42,7 @@
 		<% else %>
 			<div class="element element__no_blogposts">
 				<div class="element-container $DefaultContainer">
-					<p class="alert alert-info alert-block">
+					<p class="blog__no-posts alert alert-info alert-block">
 						<%t SilverStripe\\Blog\\Model\\Blog.NoPosts 'There are no posts' %>
 					</p>
 				</div>
@@ -58,7 +58,7 @@
 		</div>
 
 		<% if $CommentsForm %>
-		<div class="element element__comments">
+		<div class="element element__comments blog__comments">
 			<div class="element-container $DefaultContainer">
 				$CommentsForm
 			</div>
diff --git a/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss b/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
index 3abab5c..0e2c90f 100644
--- a/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
+++ b/app/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
@@ -1,5 +1,5 @@
 <div id="PageContainer" class="page{$CSSClass} action{$Action}">
-    <article class="blog-entry">
+    <article class="blog-post blog-entry">
 
     	<%-- if $FeaturedImage %>
 	    <div id="CarouselTop" class="carousel slide js-carousel d-none d-sm-block">
@@ -23,7 +23,7 @@
     </article>
 
 	<% if $CommentsForm %>
-	<div class="element element__comments">
+	<div class="element element__comments blog__comments blog-post__comments">
 		<div class="element-container $DefaultContainer">
 			$CommentsForm
 		</div>
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss
index d2deac2..60f430b 100644
--- a/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss
+++ b/app/templates/SilverStripe/Blog/Widgets/BlogArchiveWidget.ss
@@ -1,4 +1,5 @@
 <% if $Archive %>
+<div class="blog__archive">
 	<ul>
 		<% loop $Archive %>
 			<li>
@@ -8,4 +9,5 @@
 			</li>
 		<% end_loop %>
 	</ul>
+</div>
 <% end_if %>
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss
index df33959..e2b4490 100644
--- a/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss
+++ b/app/templates/SilverStripe/Blog/Widgets/BlogCategoriesWidget.ss
@@ -1,4 +1,5 @@
 <% if $Categories %>
+<div class="blog__categories">
 	<ul class="list-unstyled list-inline">
 		<% loop $Categories %>
 			<li class="list-inline-item">
@@ -8,4 +9,5 @@
 			</li>
 		<% end_loop %>
 	</ul>
+</div>
 <% end_if %>
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss
index e195ad6..d5cb307 100644
--- a/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss
+++ b/app/templates/SilverStripe/Blog/Widgets/BlogFeaturedPostsWidget.ss
@@ -1,4 +1,5 @@
 <% if $Posts %>
+<div class="blog-posts__featured">
 	<ul>
 		<% loop $Posts %>
 			<li>
@@ -9,4 +10,5 @@
 			</li>
 		<% end_loop %>
 	</ul>
+</div>
 <% end_if %>
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss
index dbff131..42acf8d 100644
--- a/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss
+++ b/app/templates/SilverStripe/Blog/Widgets/BlogRecentPostsWidget.ss
@@ -1,4 +1,5 @@
 <% if $Posts %>
+<div class="blog-posts__recent">
 	<ul class="list-unstyled">
 		<% loop $Posts %>
 			<li>
@@ -8,4 +9,5 @@
 			</li>
 		<% end_loop %>
 	</ul>
+</div>
 <% end_if %>
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss
index 5447159..1115152 100644
--- a/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss
+++ b/app/templates/SilverStripe/Blog/Widgets/BlogTagsCloudWidget.ss
@@ -1,4 +1,5 @@
 <% if $Tags %>
+<div class="blog-posts__tags blog-posts__tags-cloud">
 	<ul class="list-unstyled list-inline">
 		<% loop $Tags %>
 			<li class="list-inline-item">
@@ -8,4 +9,5 @@
 			</li>
 		<% end_loop %>
 	</ul>
+</div>
 <% end_if %>
diff --git a/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss b/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss
index 53492f2..b09a581 100644
--- a/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss
+++ b/app/templates/SilverStripe/Blog/Widgets/BlogTagsWidget.ss
@@ -1,4 +1,5 @@
 <% if $Tags %>
+<div class="blog-posts__tags">
 	<ul class="list-unstyled list-inline">
 		<% loop $Tags %>
 			<li class="list-inline-item">
@@ -8,4 +9,5 @@
 			</li>
 		<% end_loop %>
 	</ul>
+</div>
 <% end_if %>
diff --git a/app/templates/SilverStripe/Forms/PasswordField.ss b/app/templates/SilverStripe/Forms/PasswordField.ss
index e5b4b8d..7ede20d 100644
--- a/app/templates/SilverStripe/Forms/PasswordField.ss
+++ b/app/templates/SilverStripe/Forms/PasswordField.ss
@@ -1,5 +1,6 @@
 <input $AttributesHTML />
-<b class="show-password">
+
+<b class="field-password__show-password show-password">
 	<i class="fas fa-eye"></i>
 	<span class="sr-only">Show Password</span>
 </b>
diff --git a/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss b/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss
index 02cbdb2..6111b5c 100644
--- a/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss
+++ b/app/templates/SilverStripe/UserForms/Control/UserDefinedFormController_ReceivedFormSubmission.ss
@@ -1,4 +1,4 @@
-<div id="uff">
+<div id="uff" class="userdefinedform__thx">
 	<div class="on-complete-message user-form">
         $OnCompleteMessage
     </div>
@@ -8,4 +8,4 @@
             $CustomThankYouCode.RAW
         </div>
     <% end_if %>
-</div>
\ No newline at end of file
+</div>