diff --git a/themes/buha/layouts/partials/structure/paginator.html b/themes/buha/layouts/partials/structure/paginator.html
index 65ad767f..dc1c8e57 100644
--- a/themes/buha/layouts/partials/structure/paginator.html
+++ b/themes/buha/layouts/partials/structure/paginator.html
@@ -1,5 +1,5 @@
-{{ $paginator := .paginator}}
-	<div id="pagination">
+	{{ $paginator := .paginator}}
+<div id="pagination">
 	<!-- Number of links either side of the current page. -->
 	{{ $adjacent_links := 2 }}
 
@@ -15,74 +15,73 @@
 	<!-- If there's more than one page. -->
 	{{ if gt $paginator.TotalPages 1 }}
 
-	    
-	    <!-- First page. -->
-	    {{ if ne $paginator.PageNumber 1 }}
-	      <a class="pagination__link pagination__link--first" href="{{ $paginator.First.URL }}">
-	        ««
-	      </a>
-	    {{ end }}
+		<!-- First page. -->
+		{{ if ne $paginator.PageNumber 1 }}
+		  <a class="pagination__link pagination__link--first" href="{{ $paginator.First.URL }}">
+		    ««
+		  </a>
+		{{ end }}
 
-	    <!-- Previous page. -->
-	    {{ if $paginator.HasPrev }}
-	      <a href="{{ $paginator.Prev.URL }}" class="pagination__link pagination__link--previous">
-	        «
-	      </a>
-	    {{ end }}
-	    <!-- Page numbers. -->
-	    {{ range $paginator.Pagers }}
-	  	  {{ $page_number_flag := false }}
+		<!-- Previous page. -->
+		{{ if $paginator.HasPrev }}
+		  <a href="{{ $paginator.Prev.URL }}" class="pagination__link pagination__link--previous">
+		    «
+		  </a>
+		{{ end }}
 
-	      
-	      <!-- Advanced page numbers. -->
-	      {{ if gt $paginator.TotalPages $max_links }}
+		<!-- Page numbers. -->
+		{{ range $paginator.Pagers }}
+			{{ $page_number_flag := false }}
 
 
-	        <!-- Lower limit pages. -->
-	        <!-- If the user is on a page which is in the lower limit.  -->
-	        {{ if le $paginator.PageNumber $lower_limit }}
+			<!-- Advanced page numbers. -->
+			{{ if gt $paginator.TotalPages $max_links }}
 
-	          <!-- If the current loop page is less than max_links. -->
-	          {{ if le .PageNumber $max_links }}
-	            {{ $page_number_flag = true }}
-	          {{ end }}
+				<!-- Lower limit pages. -->
+				<!-- If the user is on a page which is in the lower limit.  -->
+				{{ if le $paginator.PageNumber $lower_limit }}
+
+					<!-- If the current loop page is less than max_links. -->
+					{{ if le .PageNumber $max_links }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				<!-- Upper limit pages. -->
+				<!-- If the user is on a page which is in the upper limit. -->
+				{{ else if ge $paginator.PageNumber $upper_limit }}
+
+					<!-- If the current loop page is greater than total pages minus $max_links -->
+					{{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				<!-- Middle pages. -->
+				{{ else }}
+
+					{{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
+						{{ $page_number_flag = true }}
+					{{ end }}
+
+				{{ end }}
 
 
-	        <!-- Upper limit pages. -->
-	        <!-- If the user is on a page which is in the upper limit. -->
-	        {{ else if ge $paginator.PageNumber $upper_limit }}
+			<!-- Simple page numbers. -->
+			{{ else }}
 
-	          <!-- If the current loop page is greater than total pages minus $max_links -->
-	          {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }}
-	            {{ $page_number_flag = true }}
-	          {{ end }}
+				{{ $page_number_flag = true }}
 
+			{{ end }}
 
-	        <!-- Middle pages. -->
-	        {{ else }}
-	          
-	          {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add $paginator.PageNumber $adjacent_links) ) }}
-	            {{ $page_number_flag = true }}
-	          {{ end }}
+			<!-- Output page numbers. -->
+			{{ if eq $page_number_flag true }}
+			<a href="{{ .URL }}" class="pagination__link">
+				{{ if eq $paginator.PageNumber .PageNumber }}<b>{{ end }}
+				{{ .PageNumber }}
+				{{ if eq $paginator.PageNumber .PageNumber }}</b>{{ end }}
+			</a>
+			{{ end }}
 
-	        {{ end }}
-
-	      
-	      <!-- Simple page numbers. -->
-	      {{ else }}
-
-	        {{ $page_number_flag = true }}
-
-	      {{ end }}
-
-	      <!-- Output page numbers. -->
-	      {{ if eq $page_number_flag true }}
-	          <a href="{{ .URL }}" class="pagination__link">
-	            {{ .PageNumber }}
-	          </a>
-	      {{ end }}
-
-	    {{ end }}
+		{{ end }}
 
 	    <!-- Next page. -->
 	    {{ if $paginator.HasNext }}
@@ -97,6 +96,5 @@
 	        »»
 	      </a>
 	    {{ end }}
-
 	{{ end }}
 </div>
\ No newline at end of file