diff --git a/.page-experience-by-locations.php b/.page-experience-by-locations.php
index 500dfc5..f974afd 100644
--- a/.page-experience-by-locations.php
+++ b/.page-experience-by-locations.php
@@ -12,21 +12,21 @@
 <?php	$loop = new WP_Query( $args ); ?>    
 <header class="entry-content tile location-block">
    <div class="post-header-title">
-	  <h1 id="page-title">Experience</h1>
-	  <h2 id="page-subtitle">by location</h2>
-	  <?php
+		<h1 id="page-title">Experience</h1>
+		<h2 id="page-subtitle">by location</h2>
+		<?php
 		while ( have_posts() ) :
 			the_post();
 			?>
-	 <div class="entry-content" id="taxonomy-description">
+		<div class="entry-content" id="taxonomy-description">
 			<?php the_content(); ?>
 		<div>
-		   <a class="hyperlink-button" href="?view=countries">Countries</a>
-		   <!--<a class="hyperlink-button" href="?view=regions">Regions</a>-->
-		   <a class="hyperlink-button" href="?view=locations">Locations</a>
+			<a class="hyperlink-button" href="?view=countries">Countries</a>
+			<!--<a class="hyperlink-button" href="?view=regions">Regions</a>-->
+			<a class="hyperlink-button" href="?view=locations">Locations</a>
 		</div>
-	 </div>
-	  <?php endwhile; ?>
+		</div>
+		<?php endwhile; ?>
    </div>
 </header>
 
@@ -43,10 +43,10 @@ $terms = get_terms(
 
 <div id="primary" class="content-area">
    <main id="company-main" class="site-main" role="main">
-	  <div class="row">
-	 <div id="map" style="height:100vh; width:100%;"></div>
-	  </div>
-	  <?php if ( ! empty( $locations ) ) : ?> 
+		<div class="row">
+		<div id="map" style="height:100vh; width:100%;"></div>
+		</div>
+		<?php if ( ! empty( $locations ) ) : ?> 
 			<?php if ( $_GET['view'] == 'countries' ) : ?>
 				<?php
 				$locationsSubset = array_filter(
@@ -58,24 +58,24 @@ $terms = get_terms(
 				?>
 		<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
 		<script type="text/javascript">
-		   google.charts.load('current', {'packages':['geochart']});
-		   google.charts.setOnLoadCallback(drawMap);
-		   
-		   function drawMap() {
-		  var data = google.visualization.arrayToDataTable([
-			 ['Country'],
+			google.charts.load('current', {'packages':['geochart']});
+			google.charts.setOnLoadCallback(drawMap);
+			
+			function drawMap() {
+			var data = google.visualization.arrayToDataTable([
+				['Country'],
 				<?php foreach ( (array) $locationsSubset as $term ) : ?>
-			 ['<?php echo $term->description; ?>'],
-		  <?php endforeach; ?>
-		  ]);
-		  var options = {};
-		  var chart = new google.visualization.GeoChart(document.getElementById('map'));
-		  
-		  chart.draw(data, options);
-		   }
+				['<?php echo $term->description; ?>'],
+			<?php endforeach; ?>
+			]);
+			var options = {};
+			var chart = new google.visualization.GeoChart(document.getElementById('map'));
+			
+			chart.draw(data, options);
+			}
 		</script>
-	 <?php elseif ( $_GET['view'] == 'locations' ) : ?>
-		 <?php
+		<?php elseif ( $_GET['view'] == 'locations' ) : ?>
+			<?php
 			$locationsSubset = array_filter(
 				$locations,
 				function ( $t ) {
@@ -84,42 +84,42 @@ $terms = get_terms(
 			);
 			?>
 		<script type="text/javascript">
-		   var locations = [
-		   <?php foreach ( (array) $locationsSubset as $term ) : ?>
-		  {<?php echo $term->description; ?>},
-		   <?php endforeach; ?>
-		   ]
-		   
-		   function initMap() {
-		  var map = new google.maps.Map(document.getElementById('map'), {
-			 zoom: 3,
-			 center: {lat: 51.483462, lng: 0.0586198}
-		  });
-		  
-		  // Create an array of alphabetical characters used to label the markers.
-		  var labels = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-		  
-		  // Add some markers to the map.
-		  // Note: The code uses the JavaScript Array.prototype.map() method to
-		  // create an array of markers based on a given "locations" array.
-		  // The map() method here has nothing to do with the Google Maps API.
-		  var markers = locations.map(function(location, i) {
-			 return new google.maps.Marker({
+			var locations = [
+			<?php foreach ( (array) $locationsSubset as $term ) : ?>
+			{<?php echo $term->description; ?>},
+			<?php endforeach; ?>
+			]
+			
+			function initMap() {
+			var map = new google.maps.Map(document.getElementById('map'), {
+				zoom: 3,
+				center: {lat: 51.483462, lng: 0.0586198}
+			});
+			
+			// Create an array of alphabetical characters used to label the markers.
+			var labels = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+			
+			// Add some markers to the map.
+			// Note: The code uses the JavaScript Array.prototype.map() method to
+			// create an array of markers based on a given "locations" array.
+			// The map() method here has nothing to do with the Google Maps API.
+			var markers = locations.map(function(location, i) {
+				return new google.maps.Marker({
 			position: location,
 			label: labels[i % labels.length]
-			 });
-		  });
-		  
-		  // Add a marker clusterer to manage the markers.
-		  var markerCluster = new MarkerClusterer(map, markers, {
-			 imagePath: 'https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m'
-		  });
-		   }
+				});
+			});
+			
+			// Add a marker clusterer to manage the markers.
+			var markerCluster = new MarkerClusterer(map, markers, {
+				imagePath: 'https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m'
+			});
+			}
 		</script>
 		<script src="https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/markerclusterer.js"></script>
 		<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBsMPnuCM59sC_n11CGxbpbqNY7FRUXnD0&callback=initMap"></script>
-	 <?php endif; ?>
-	  <?php endif; ?>
+		<?php endif; ?>
+		<?php endif; ?>
    </main><!-- .site-main -->
 </div><!-- .content-area -->
 
diff --git a/.search.php b/.search.php
index f6b1bd7..e8ff443 100644
--- a/.search.php
+++ b/.search.php
@@ -23,10 +23,10 @@ get_header(); ?>
 				the_post();
 
 				/**
-				 * Run the loop for the search to output the results.
-				 * If you want to overload this in a child theme then include a file
-				 * called content-search.php and that will be used instead.
-				 */
+					* Run the loop for the search to output the results.
+					* If you want to overload this in a child theme then include a file
+					* called content-search.php and that will be used instead.
+					*/
 				get_template_part( 'template-parts/content', 'search' );
 
 				// End the loop.
diff --git a/centred-page.php b/centred-page.php
index 9c08a79..467f2ec 100644
--- a/centred-page.php
+++ b/centred-page.php
@@ -15,8 +15,8 @@ get_header(); ?>
 while ( have_posts() ) :
 	the_post();
 	?>
-   <h1><?php echo wp_kses_post( get_the_title() ); ?></h1>
-   <h2><?php the_content(); ?></h2>
+	<h1><?php echo wp_kses_post( get_the_title() ); ?></h1>
+	<h2><?php the_content(); ?></h2>
 <?php endwhile; ?>
 </main>
 
diff --git a/comments.php b/comments.php
index 14689ea..09e985a 100644
--- a/comments.php
+++ b/comments.php
@@ -6,21 +6,21 @@
  * @since Omphaloskepsis 1.0
  */
 
-/*
-	* If the current post is protected by a password and
-	* the visitor has not yet entered the password we will
-	* return early without loading the comments.
-	*/
+/**
+ * If the current post is protected by a password and
+ * the visitor has not yet entered the password we will
+ * return early without loading the comments.
+ */
 if ( post_password_required() ) {
 	return;
 }
 ?>
 
 <div id="comments" class="comments-area">
-   <div class="row">
-	  <div class="col-7" id="comments-list">
-	 <h3 id="comments-list-title">Replies</h3>
-	 <?php if ( have_comments() ) : ?>
+	<div class="row">
+		<div class="col-7" id="comments-list">
+		<h3 id="comments-list-title">Replies</h3>
+		<?php if ( have_comments() ) : ?>
 			<?php the_comments_navigation(); ?>
 
 		<ol class="comment-list">
@@ -36,16 +36,16 @@ if ( post_password_required() ) {
 		</ol><!-- .comment-list -->
 
 			<?php the_comments_navigation(); ?>
-	 <?php else : ?>
+		<?php else : ?>
 		<p id="no-comments">No comments yet.</p>
-	 <?php endif; ?>
-	 <?php	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : ?>
+		<?php endif; ?>
+		<?php	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : ?>
 		<p class="no-comments"><?php wp_kses_post_e( 'Comments are closed.', 'twentysixteen' ); ?></p>
-	 <?php endif; ?>
-	  </div>
-	  
-	  <div class="col-5" id="comments-reply">
-	  <?php
+		<?php endif; ?>
+		</div>
+
+		<div class="col-5" id="comments-reply">
+		<?php
 		comment_form(
 			array(
 				'title_reply_before' => '<h3 id="comments-reply-title">',
@@ -53,6 +53,6 @@ if ( post_password_required() ) {
 			)
 		);
 		?>
-	  </div>
-   </div>
+		</div>
+	</div>
 </div><!-- .comments-area -->
diff --git a/footer.php b/footer.php
index 7866c9c..b0ad34c 100644
--- a/footer.php
+++ b/footer.php
@@ -7,10 +7,10 @@
  */
 
 ?>
-	  <footer id="site-footer" class="show">
-		  <p>By <a href="/">Ben</a> | <a href="https://github.com/Rumperuu/Omphaloskepsis/issues" target="_blank" rel="noopener noreferrer">Report an Issue</a> | <a href="/privacy-policy">Privacy Policy</a></p>
-	  </footer>
-	  
+		<footer id="site-footer" class="show">
+			<p>By <a href="/">Ben</a> | <a href="https://github.com/Rumperuu/Omphaloskepsis/issues" target="_blank" rel="noopener noreferrer">Report an Issue</a> | <a href="/privacy-policy">Privacy Policy</a></p>
+		</footer>
+
 		<script type="text/javascript">
 			// Displays and hides the top header bar on page scroll.
 			jQuery(document).ready(function($) {
@@ -18,32 +18,32 @@
 					var fromTop = $(window).scrollTop();
 					$('body > header').toggleClass("show", (fromTop > 200));
 				});
-				
+
 				$('blockquote').each(function() {
 					if ($(this).children('p').children().first().is('q')) {
 						$(this).addClass('no-first-quote');
 					}
-					
+
 					if ($(this).children('p').children().last().is('q')) {
 						$(this).addClass('no-last-quote');
 					}
 				});
 			});
-	  
-		 function toggleCommentary() {
+
+			function toggleCommentary() {
 			var linkText = ["Click here to hide all commentary and leave only reportage.", "Click here to show commentary."];
 			var commentaries = document.getElementsByClassName("article__text--commentary");
 			var link = document.getElementById("toggleCommentary");
-			
+
 			for (var i = 0; i < commentaries.length; i++) {
-			   commentaries[i].style.display = (commentaries[i].style.display == 'none') ? 'inline' : 'none';
+				commentaries[i].style.display = (commentaries[i].style.display == 'none') ? 'inline' : 'none';
 			}
 
 			link.innerHTML = (link.innerHTML == linkText[0]) ? linkText[1] : linkText[0];
-		 }
-	  </script>
-	  
+			}
+		</script>
+
 		<?php wp_footer(); ?>
-		
+
 	</body>
 </html>
diff --git a/functions.php b/functions.php
index dae0bea..7e4323f 100644
--- a/functions.php
+++ b/functions.php
@@ -27,10 +27,10 @@ if ( ! function_exists( 'omphaloskepsis_setup' ) ) :
 	 */
 	function omphaloskepsis_setup() {
 		/*
-		 * Make theme available for translation.
-		 * Translations can be filed in the /languages/ directory.
-		 * If you're building a theme based on Omphaloskepsis, use a find and replace
-		 * to change 'omphaloskepsis' to the name of your theme in all the template files
+			* Make theme available for translation.
+			* Translations can be filed in the /languages/ directory.
+			* If you're building a theme based on Omphaloskepsis, use a find and replace
+			* to change 'omphaloskepsis' to the name of your theme in all the template files
 		*/
 		load_theme_textdomain( 'omphaloskepsis', get_template_directory() . '/languages' );
 
@@ -38,17 +38,17 @@ if ( ! function_exists( 'omphaloskepsis_setup' ) ) :
 		add_theme_support( 'automatic-feed-links' );
 
 		/*
-		 * Let WordPress manage the document title.
-		 * By adding theme support, we declare that this theme does not use a
-		 * hard-coded <title> tag in the document head, and expect WordPress to
-		 * provide it for us.
+			* Let WordPress manage the document title.
+			* By adding theme support, we declare that this theme does not use a
+			* hard-coded <title> tag in the document head, and expect WordPress to
+			* provide it for us.
 		*/
 		add_theme_support( 'title-tag' );
 
 		/*
-		 * Enable support for custom logo.
-		 *
-		 *  @since Omphaloskepsis 1.2
+			* Enable support for custom logo.
+			*
+			*  @since Omphaloskepsis 1.2
 		*/
 		add_theme_support(
 			'custom-logo',
@@ -60,9 +60,9 @@ if ( ! function_exists( 'omphaloskepsis_setup' ) ) :
 		);
 
 		/*
-		 * Enable support for Post Thumbnails on posts and pages.
-		 *
-		 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+			* Enable support for Post Thumbnails on posts and pages.
+			*
+			* @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
 		*/
 		add_theme_support( 'post-thumbnails' );
 		set_post_thumbnail_size( 1200, 9999 );
@@ -76,8 +76,8 @@ if ( ! function_exists( 'omphaloskepsis_setup' ) ) :
 		);
 
 		/*
-		 * Switch default core markup for search form, comment form, and comments
-		 * to output valid HTML5.
+			* Switch default core markup for search form, comment form, and comments
+			* to output valid HTML5.
 		*/
 		add_theme_support(
 			'html5',
@@ -91,9 +91,9 @@ if ( ! function_exists( 'omphaloskepsis_setup' ) ) :
 		);
 
 		/*
-		 * Enable support for Post Formats.
-		 *
-		 * See: https://codex.wordpress.org/Post_Formats
+			* Enable support for Post Formats.
+			*
+			* See: https://codex.wordpress.org/Post_Formats
 		*/
 		add_theme_support(
 			'post-formats',
@@ -111,8 +111,8 @@ if ( ! function_exists( 'omphaloskepsis_setup' ) ) :
 		);
 
 		/*
-		 * This theme styles the visual editor to resemble the theme style,
-		 * specifically font, colors, icons, and column width.
+			* This theme styles the visual editor to resemble the theme style,
+			* specifically font, colors, icons, and column width.
 		*/
 		add_editor_style(
 			array(
diff --git a/header.php b/header.php
index 3101011..fc79154 100644
--- a/header.php
+++ b/header.php
@@ -10,26 +10,26 @@
 
 <!DOCTYPE html>
 <html <?php language_attributes(); ?> class="no-js">
-   <head>
-	  <meta charset="<?php bloginfo( 'charset' ); ?>">
-	  <meta name="viewport" content="width=device-width, initial-scale=1">
-	  <?php $index = get_post_meta( get_the_ID(), 'Index', true ); ?>
-   <?php if ( ! ( is_single() && ! is_page() && $index ) ) : ?>
-	  <meta name="robots" content="noindex">
-   <?php endif; ?>
-	  <link rel="profile" href="http://gmpg.org/xfn/11">
-   <?php if ( is_singular() && pings_open( get_queried_object() ) ) : ?>
-	  <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
-   <?php endif; ?>
+	<head>
+		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<?php $index = get_post_meta( get_the_ID(), 'Index', true ); ?>
+	<?php if ( ! ( is_single() && ! is_page() && $index ) ) : ?>
+		<meta name="robots" content="noindex">
+	<?php endif; ?>
+		<link rel="profile" href="http://gmpg.org/xfn/11">
+	<?php if ( is_singular() && pings_open( get_queried_object() ) ) : ?>
+		<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
+	<?php endif; ?>
 		<?php wp_head(); ?>
 		<?php // phpcs:disable WordPress.WP.EnqueuedResources ?> 
 		<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
 		<?php // phpcs:enable ?>
-   </head>
+	</head>
 
-   <body <?php body_class(); ?> id="site-wrapper">
-	  <?php if ( ! is_page_template( 'centred-page.php' ) ) : ?>
-	 <header id="site-header">
+	<body <?php body_class(); ?> id="site-wrapper">
+		<?php if ( ! is_page_template( 'centred-page.php' ) ) : ?>
+		<header id="site-header">
 		<nav id="site-header-nav">
 			<div class="site-header-nav-item"><a href="/"><h1>Ben Goldsworthy</a></div>
 			<div class="site-header-nav-item"><h2>Views my own. Do try this at home.</h2></div>
@@ -38,5 +38,5 @@
 			<div class="site-header-nav-item"><a href="/portfolios">Portfolios</a></div>
 			<div class="site-header-nav-item"><a href="/social-cataloguing">Social Cataloguing</a></div>
 		</nav>
-	 </header>
-	  <?php endif; ?>
+		</header>
+		<?php endif; ?>
diff --git a/home.php b/home.php
index 717ca5d..6d07c38 100644
--- a/home.php
+++ b/home.php
@@ -11,10 +11,10 @@
 <?php get_header(); ?>
 
 <main id="list-page" class="col-10 col-m-12" role="main">
-   <header>
-	  <h1>Blog.</h1>
-	  <h2><strong>All</strong> / <a href="/category/thoughts">Thoughts</a> / <a href="/category/reports">Reports</a> / <a href="/category/reviews">Reviews</a> / <a href="/category/projects">Projects</a></h2>
-	  <?php
+	<header>
+		<h1>Blog.</h1>
+		<h2><strong>All</strong> / <a href="/category/thoughts">Thoughts</a> / <a href="/category/reports">Reports</a> / <a href="/category/reviews">Reviews</a> / <a href="/category/projects">Projects</a></h2>
+		<?php
 		echo wp_kses_post(
 			get_the_posts_pagination(
 				array(
@@ -26,10 +26,10 @@
 			)
 		);
 		?>
-   </header>
+	</header>
    
-   <section id="grid" class="row">
-   <?php
+	<section id="grid" class="row">
+	<?php
 	if ( have_posts() ) :
 		// Start the loop.
 		while ( have_posts() ) :
@@ -41,28 +41,28 @@
 			*/
 			get_template_part( 'template-parts/content', get_post_format() );
 			// End the loop.
-	 endwhile;
+		endwhile;
 		// If no content, include the "No posts found" template.
-	  else :
-		  get_template_part( 'template-parts/content', 'none' );
-	  endif;
-		?>
-   </section><!-- .site-main -->
-   
-   <footer>
-	  <?php
-		echo wp_kses_post(
-			get_the_posts_pagination(
-				array(
-					'screen_reader_text' => ' ',
-					'mid_size'           => 20,
-					'prev_text'          => '',
-					'next_text'          => '',
-				)
+	else :
+		get_template_part( 'template-parts/content', 'none' );
+	endif;
+	?>
+	</section><!-- .site-main -->
+
+	<footer>
+	<?php
+	echo wp_kses_post(
+		get_the_posts_pagination(
+			array(
+				'screen_reader_text' => ' ',
+				'mid_size'           => 20,
+				'prev_text'          => '',
+				'next_text'          => '',
 			)
-		);
-		?>
-   </footer>
+		)
+	);
+	?>
+	</footer>
 </main><!-- .content-area -->
 
 <?php get_footer(); ?>
diff --git a/page-experience-by-companies.php b/page-experience-by-companies.php
index a593e72..47d813e 100644
--- a/page-experience-by-companies.php
+++ b/page-experience-by-companies.php
@@ -1,9 +1,7 @@
 <?php
 /**
  * Template Name: Experience by Companies
- * /
-
-/**
+ *
  * The template for displaying all items, indexed by organisation.
  *
  * @package Omphaloskepsis
@@ -13,130 +11,130 @@
 get_header(); ?>
 
 <main id="experience-wrapper" class="content-area col-10 col-m-12">
-   <!--Page Title & Details-->
-   <header class="post-header-title">
-	  <h1 style="margin-bottom: 20px;" id="page-title">Experience.</h1>
-   <?php
-	while ( have_posts() ) :
-		the_post();
-		?>
-	  <div class="entry-content tile" id="taxonomy-description">
-		<?php the_content(); ?>
-	  </div>
-	
-	  <div class="entry-content tile" id="settings">
-		 <h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
-		 <form action="/experience" id="settings" method="POST">
+	<!--Page Title & Details-->
+	<header class="post-header-title">
+		<h1 style="margin-bottom: 20px;" id="page-title">Experience.</h1>
+		<?php
+		while ( have_posts() ) :
+			the_post();
+			?>
+		<div class="entry-content tile" id="taxonomy-description">
+			<?php the_content(); ?>
+		</div>
+
+		<div class="entry-content tile" id="settings">
+			<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
+			<form action="/experience" id="settings" method="POST">
 			<?php echo wp_kses_post( wp_nonce_field( 'experience', 'settings_nonce' ) ); ?>
 			<input class="checkbox" type="checkbox" id="toplevel" value="toplevel" checked="checked">
 			<label for="toplevel">Display only top-level organisations</label>
 			<br>
 			<fieldset>
-			   <legend><p style="margin-top: 14px; margin-bottom: 14px;">Display only organisations with associated:</p></legend>
-			   <div class="controlgroup" id="typestodisplay">
-				  <label for="jobs">Roles <span class="dashicons dashicons-hammer"></span></label>
-				  <input type="checkbox" name="jobs" id="jobs" checked="checked">
-				  <label class="currentjobs" for="currentjobs">Display only current roles</label>
-				  <input class="currentjobs" type="checkbox" name="currentjobs" id="currentjobs" checked="checked">
-				  <label for="posts">Blog Posts <span class="dashicons dashicons-admin-post"></span></label>
-				  <input type="checkbox" name="posts" id="posts">
-				  <label for="websites">Websites <span class="dashicons dashicons-schedule"></span></label>
-				  <input type="checkbox" name="websites" id="websites">
-				  <label for="programs">Programs <span class="dashicons dashicons-desktop"></span></label>
-				  <input type="checkbox" name="programs" id="programs">
-				  <label for="writings">Writings <span class="dashicons dashicons-format-aside"></span></label>
-				  <input type="checkbox" name="writings" id="writings">
-				  <label for="videos">Videos <span class="dashicons dashicons-video-alt"></span></label>
-				  <input type="checkbox" name="videos" id="videos">
-				  <label for="other">Other <span class="dashicons dashicons-archive"></span></label>
-				  <input type="checkbox" name="other" id="other">
-				  <label for="qualifications">Qualifications <span class="dashicons dashicons-id"></span></label>
-				  <input type="checkbox" name="qualifications" id="qualifications">
-				  <label class="expired" for="expired">Show expired qualifications</label>
-				  <input class="expired" type="checkbox" name="expired" id="expired">
-				  <label for="awards">Awards <span class="dashicons dashicons-awards"></span></label>
-				  <input type="checkbox" name="awards" id="awards">
-			   </div>
+				<legend><p style="margin-top: 14px; margin-bottom: 14px;">Display only organisations with associated:</p></legend>
+				<div class="controlgroup" id="typestodisplay">
+					<label for="jobs">Roles <span class="dashicons dashicons-hammer"></span></label>
+					<input type="checkbox" name="jobs" id="jobs" checked="checked">
+					<label class="currentjobs" for="currentjobs">Display only current roles</label>
+					<input class="currentjobs" type="checkbox" name="currentjobs" id="currentjobs" checked="checked">
+					<label for="posts">Blog Posts <span class="dashicons dashicons-admin-post"></span></label>
+					<input type="checkbox" name="posts" id="posts">
+					<label for="websites">Websites <span class="dashicons dashicons-schedule"></span></label>
+					<input type="checkbox" name="websites" id="websites">
+					<label for="programs">Programs <span class="dashicons dashicons-desktop"></span></label>
+					<input type="checkbox" name="programs" id="programs">
+					<label for="writings">Writings <span class="dashicons dashicons-format-aside"></span></label>
+					<input type="checkbox" name="writings" id="writings">
+					<label for="videos">Videos <span class="dashicons dashicons-video-alt"></span></label>
+					<input type="checkbox" name="videos" id="videos">
+					<label for="other">Other <span class="dashicons dashicons-archive"></span></label>
+					<input type="checkbox" name="other" id="other">
+					<label for="qualifications">Qualifications <span class="dashicons dashicons-id"></span></label>
+					<input type="checkbox" name="qualifications" id="qualifications">
+					<label class="expired" for="expired">Show expired qualifications</label>
+					<input class="expired" type="checkbox" name="expired" id="expired">
+					<label for="awards">Awards <span class="dashicons dashicons-awards"></span></label>
+					<input type="checkbox" name="awards" id="awards">
+				</div>
 			</fieldset>
 			<br>
 			<input class="ui-button ui-widget ui-corner-all" id="refresh" type="submit" value="Refresh">
-		 </form>
-	 </div>
-   <?php endwhile; ?>
-   </header>
+			</form>
+		</div>
+		<?php endwhile; ?>
+	</header>
 
-   <!--Company Grid-->
-   <table class="row" id="organisations-grid">
-   </table>
+	<!--Company Grid-->
+	<table class="row" id="organisations-grid">
+	</table>
 	<?php // phpcs:disable WordPress.WP.EnqueuedResources ?>
-   <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">  
-   <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-   <script type="text/javascript">
-	  // Populates the organisations grid.
-	  jQuery(document).ready(function($) {
-		 // Sets up jQueryUI elements.
-		 $('input:checkbox').checkboxradio();
-		 $('.controlgroup').controlgroup();
-		 $('.refresh').button();
+	<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">  
+	<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+	<script type="text/javascript">
+		// Populates the organisations grid.
+		jQuery(document).ready(function($) {
+			// Sets up jQueryUI elements.
+			$('input:checkbox').checkboxradio();
+			$('.controlgroup').controlgroup();
+			$('.refresh').button();
 
-		 $('#refresh').click(function(event) {
+			$('#refresh').click(function(event) {
 			$(this).css('border-width', '1px');
 			event.preventDefault();
 			displayCompanies();
-		 });
-		 
-		 // Displays the initial organisations grid.
-		 $('#refresh').click();
+			});
 
-		 $('.expired').hide();
+			// Displays the initial organisations grid.
+			$('#refresh').click();
 
-		 $('input[type="checkbox"]').change(function() {
+			$('.expired').hide();
+
+			$('input[type="checkbox"]').change(function() {
 			$('#refresh').css('border-width', '5px');
-		 });
-		 
-		 $('#jobs').change(function() {
+			});
+
+			$('#jobs').change(function() {
 			if($(this).is(":checked")) {
-			   $('.currentjobs').fadeIn(100);
+				$('.currentjobs').fadeIn(100);
 			} else {
-			   $('.currentjobs').fadeOut(100);
+				$('.currentjobs').fadeOut(100);
 			}
-		 });
+			});
 
-		 $('#qualifications').change(function() {
+			$('#qualifications').change(function() {
 			if($(this).is(":checked")) {
-			   $('.expired').fadeIn(100);
+				$('.expired').fadeIn(100);
 			} else {
-			   $('.expired').fadeOut(100);
+				$('.expired').fadeOut(100);
 			}
-		 });
+			});
 
 
-		 function displayCompanies() {
+			function displayCompanies() {
 			$('#organisations-grid').html('<img class="loading" src="/wp-content/uploads/2016/12/ajax-loader.gif">');
 
 			var settings = {
-			   'action': 'display_companies',
-			   'settings_nonce': $('#settings_nonce').val(),
-			   'toplevel': $('#toplevel').is(':checked'),
-			   'job': $('#jobs').is(':checked'),
-			   'currentjobs': $('#currentjobs').is(':checked'),
-			   'post': $('#posts').is(':checked'),
-			   'website': $('#websites').is(':checked'),
-			   'program': $('#programs').is(':checked'),
-			   'writing': $('#writings').is(':checked'),
-			   'video': $('#videos').is(':checked'),
-			   'other': $('#other').is(':checked'),
-			   'qualification': $('#qualifications').is(':checked'),
-			   'showexpired': $('#expired').is(':checked'),
-			   'award': $('#awards').is(':checked'),
+				'action': 'display_companies',
+				'settings_nonce': $('#settings_nonce').val(),
+				'toplevel': $('#toplevel').is(':checked'),
+				'job': $('#jobs').is(':checked'),
+				'currentjobs': $('#currentjobs').is(':checked'),
+				'post': $('#posts').is(':checked'),
+				'website': $('#websites').is(':checked'),
+				'program': $('#programs').is(':checked'),
+				'writing': $('#writings').is(':checked'),
+				'video': $('#videos').is(':checked'),
+				'other': $('#other').is(':checked'),
+				'qualification': $('#qualifications').is(':checked'),
+				'showexpired': $('#expired').is(':checked'),
+				'award': $('#awards').is(':checked'),
 			};
 
 			$.post("/wp-admin/admin-ajax.php", settings, function(response) {
-			   $('#organisations-grid').html(response);
+				$('#organisations-grid').html(response);
 			}); 
-		 }
-	  });
-	 </script>
+			}
+		});
+		</script>
 	<?php // phpcs:disable ?>
 </main>
 
diff --git a/page-experience-timeline.php b/page-experience-timeline.php
index 6446a05..36fca03 100644
--- a/page-experience-timeline.php
+++ b/page-experience-timeline.php
@@ -1,9 +1,7 @@
 <?php
 /**
  * Template Name: Experience Timeline
- * /
-
-/**
+ *
  * The template for displaying all roles in a timeline.
  *
  * @package Omphaloskepsis
@@ -13,14 +11,14 @@
 get_header(); ?>
 
 <?php
-	/**
-	 *  Calculates wether a role is within the max. and min. dates
-	 *  for the timeline.
-	 *
-	 *  @param string $role_start_date The role's start date.
-	 *  @param string $role_end_date The role's end date.
-	 *  @return bool
-	 */
+/**
+ *  Calculates wether a role is within the max. and min. dates
+ *  for the timeline.
+ *
+ *  @param string $role_start_date The role's start date.
+ *  @param string $role_end_date The role's end date.
+ *  @return bool
+ */
 function within_dates( $role_start_date, $role_end_date ) {
 	$end_year      = gmdate( 'Y' );
 	$end_date      = $end_year . '-12-31';
@@ -37,19 +35,19 @@ function within_dates( $role_start_date, $role_end_date ) {
 	);
 	$loop = new WP_Query( $args );
 	?>
-		   
+
 <main id="experience-wrapper" class="content-area col-10 col-m-12">
-  <header class="post-header-title">
+	<header class="post-header-title">
 	<h1 id="page-title">Experience</h1>
 	<h2 id="page-subtitle">or, a brief history of Ben</h2>
-  <?php
+	<?php
 	while ( have_posts() ) :
 		the_post();
 		?>
 	<div class="entry-content tile" id="taxonomy-description">
 		<?php the_content(); ?>
 	</div>  
-	
+
 	<div class="entry-content tile" id="settings">
 		<h3 style="margin-bottom: 14px;" class="subheading">Settings</h3>
 		<form action="/experience-timeline" id="settings" method="GET">
@@ -57,48 +55,48 @@ function within_dates( $role_start_date, $role_end_date ) {
 			<label for="separate">Separate past and current roles</label>
 			<input class="ui-button ui-widget ui-corner-all" id="refresh" type="submit" value="Refresh">
 		</form>
-	 </div>
-  <?php endwhile; ?>
-  </header>  
-  
-  <div id="primary" class="content-area">
+		</div>
+	<?php endwhile; ?>
+	</header>  
+
+	<div id="primary" class="content-area">
 	<main id="company-main" class="site-main" role="main">
 		<?php // phpcs:disable WordPress.WP.EnqueuedResources ?>
-	  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">   
-	  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-	  <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
-	  <script type="text/javascript">
+		<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">   
+		<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+		<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
+		<script type="text/javascript">
 		jQuery(document).ready(function($) {
-		  $('input:checkbox').checkboxradio();
-		  $('.refresh').button();
-		  
-		  google.charts.load('current', {'packages':['timeline']});
-		  google.charts.setOnLoadCallback(drawChart);
-		  
-		  $('input[type="checkbox"]').change(function() {
+			$('input:checkbox').checkboxradio();
+			$('.refresh').button();
+
+			google.charts.load('current', {'packages':['timeline']});
+			google.charts.setOnLoadCallback(drawChart);
+
+			$('input[type="checkbox"]').change(function() {
 			alert("Feature in progress");
 			$('#refresh').css('border-width', '5px');
-		  });
-		
-		  $('#refresh').click(function(event) {
+			});
+
+			$('#refresh').click(function(event) {
 			$(this).css('border-width', '1px');
 			event.preventDefault();
 			drawChart();
-		  });
+			});
 		});
-		
+
 		function drawChart() {
-		  var container = document.getElementById('timeline');
-		  var chart = new google.visualization.Timeline(container);
-		  var dataTable = new google.visualization.DataTable();
-		  
-		  dataTable.addColumn({ type: 'string', id: 'Type' });
-		  dataTable.addColumn({ type: 'string', id: 'Role' });
-		  dataTable.addColumn({ type: 'string', role: 'tooltip', 'p': {'html': true} });
-		  dataTable.addColumn({ type: 'date', id: 'Start' });
-		  dataTable.addColumn({ type: 'date', id: 'End' });
-		  dataTable.addRows([
-		  <?php
+			var container = document.getElementById('timeline');
+			var chart = new google.visualization.Timeline(container);
+			var dataTable = new google.visualization.DataTable();
+
+			dataTable.addColumn({ type: 'string', id: 'Type' });
+			dataTable.addColumn({ type: 'string', id: 'Role' });
+			dataTable.addColumn({ type: 'string', role: 'tooltip', 'p': {'html': true} });
+			dataTable.addColumn({ type: 'date', id: 'Start' });
+			dataTable.addColumn({ type: 'date', id: 'End' });
+			dataTable.addRows([
+			<?php
 			while ( $loop->have_posts() ) :
 				$loop->the_post();
 				?>
@@ -114,46 +112,46 @@ function within_dates( $role_start_date, $role_end_date ) {
 					)
 				);
 
-				$role_title = htmlspecialchars_decode( strip_tags( get_the_title() ) );
+				$role_title = htmlspecialchars_decode( wp_strip_all_tags( get_the_title() ) );
 				$start      = get_the_date();
 				$end        = ( ! $end_date || ( $end_date && $end_date > gmdate( 'Y-m-d' ) ) ) ? gmdate( 'Y-m-d' ) : $end_date;
 				?>
 			[
-			  '<?php echo ( $is_current ) ? 'Current' : 'Past'; ?>',
-			  '<?php echo esc_html( $role_title . ', ' . html_entity_decode( $company[0] ) ); ?>',
-			  '<div style="padding: 20px"><h1 class="timeline-entry-title"><?php echo wp_kses_post( $role_title ); ?></h1><h2><?php echo wp_kses_post( html_entity_decode( $company[0] ) ); ?></h2><ul><li><?php echo esc_html( $start ); ?>&mdash;<?php echo esc_html( ( $is_current ) ? 'present' : $end ); ?></li></ul></div>',
-			  new Date('<?php echo esc_attr( $start ); ?>'),
-			  new Date('<?php echo esc_attr( $end ); ?>')
+				'<?php echo ( $is_current ) ? 'Current' : 'Past'; ?>',
+				'<?php echo esc_html( $role_title . ', ' . html_entity_decode( $company[0] ) ); ?>',
+				'<div style="padding: 20px"><h1 class="timeline-entry-title"><?php echo wp_kses_post( $role_title ); ?></h1><h2><?php echo wp_kses_post( html_entity_decode( $company[0] ) ); ?></h2><ul><li><?php echo esc_html( $start ); ?>&mdash;<?php echo esc_html( ( $is_current ) ? 'present' : $end ); ?></li></ul></div>',
+				new Date('<?php echo esc_attr( $start ); ?>'),
+				new Date('<?php echo esc_attr( $end ); ?>')
 			],
 			<?php endwhile; ?>
-		  ]);
-		  
-		  var rowHeight = 15;
-		  var chartHeight = dataTable.getNumberOfRows() * rowHeight + 50;
-		  var options = {
+			]);
+
+			var rowHeight = 15;
+			var chartHeight = dataTable.getNumberOfRows() * rowHeight + 50;
+			var options = {
 			tooltip: {isHtml: true},
 			timeline: {
-			  showRowLabels: true,
+				showRowLabels: true,
 			},
 			height: chartHeight,
 			width: window.innerWidth - 200,
-		  };
-		  
-		  chart.draw(dataTable, options);
+			};
+
+			chart.draw(dataTable, options);
 		}         
 		</script>
 		<?php // phpcs:disable ?>
-	  
-	  <div id="slider-range"></div>
-	  <section id="timeline">
+		
+		<div id="slider-range"></div>
+		<section id="timeline">
 		<div class="row">
-		  <div id="timeline" class="col-12">
+			<div id="timeline" class="col-12">
 			<img class="loading" src="/wp-content/uploads/2016/12/ajax-loader.gif">
-		  </div>
+			</div>
 		</div>
-	  </section>
+		</section>
 	</main>
-  </div>
+	</div>
 </main>
 <?php // get_sidebar(); ?>
 <?php get_footer(); ?>
diff --git a/page.php b/page.php
index bd61683..bd1c73c 100644
--- a/page.php
+++ b/page.php
@@ -1,18 +1,18 @@
 <?php
-   /**
-	* The template for displaying pages.
-	*
-	* @package Omphaloskepsis
-	* @since Omphaloskepsis 1.0
-	*/
+/**
+ * The template for displaying pages.
+ *
+ * @package Omphaloskepsis
+ * @since Omphaloskepsis 1.0
+ */
 
 ?>
 
 <?php get_header(); ?>
 
 <main id="split-page" role="main">
-   <?php
-	  // Start the loop.
+	<?php
+		// Start the loop.
 	while ( have_posts() ) :
 		the_post();
 
@@ -24,8 +24,8 @@
 			comments_template();
 		}
 
-		  // End of the loop.
-	  endwhile;
+			// End of the loop.
+		endwhile;
 	?>
 </main>
 
diff --git a/sidebar.php b/sidebar.php
index 7e760f3..12c9fd5 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,26 +1,26 @@
 <?php
-   /**
-	* The template for the sidebar.
-	*
-	* @package Omphaloskepsis
-	* @since Omphaloskepsis 1.0
-	*/
+/**
+ * The template for the sidebar.
+ *
+ * @package Omphaloskepsis
+ * @since Omphaloskepsis 1.0
+ */
 
 ?>
 
 <nav class="col-2" id="sidebar">
-   <ul id="sidebar-list">
-	  <li <?php echo 'blog' === $wp->request ? 'class="current"' : ''; ?>>
-	 <a href="/blog">Blog</a>
-	 <a href="/feed"><i class="fa fa-rss"></i></a>
-	  </li>
-	  <li><p>~</p></li>
-	  <li <?php echo 'website' === $wp->request ? 'class="current"' : ''; ?>><a href="/website">Websites</a></li>
-	  <li <?php echo 'program' === $wp->request ? 'class="current"' : ''; ?>><a href="/program">Programs</a></li>
-	  <li <?php echo 'writing' === $wp->request ? 'class="current"' : ''; ?>><a href="/writing">Writings</a></li>
-	  <li <?php echo 'video' === $wp->request ? 'class="current"' : ''; ?>><a href="/video">Videos</a></li>
-	  <li <?php echo 'other' === $wp->request ? 'class="current"' : ''; ?>><a href="/other">Other</a></li>
-	  <li><p>~</p></li>
-	  <li <?php echo 'experience' === $wp->request ? 'class="current"' : ''; ?>><a href="/experience">Experience (by organisation)</a></li>
-   </ul>
+	<ul id="sidebar-list">
+		<li <?php echo 'blog' === $wp->request ? 'class="current"' : ''; ?>>
+		<a href="/blog">Blog</a>
+		<a href="/feed"><i class="fa fa-rss"></i></a>
+		</li>
+		<li><p>~</p></li>
+		<li <?php echo 'website' === $wp->request ? 'class="current"' : ''; ?>><a href="/website">Websites</a></li>
+		<li <?php echo 'program' === $wp->request ? 'class="current"' : ''; ?>><a href="/program">Programs</a></li>
+		<li <?php echo 'writing' === $wp->request ? 'class="current"' : ''; ?>><a href="/writing">Writings</a></li>
+		<li <?php echo 'video' === $wp->request ? 'class="current"' : ''; ?>><a href="/video">Videos</a></li>
+		<li <?php echo 'other' === $wp->request ? 'class="current"' : ''; ?>><a href="/other">Other</a></li>
+		<li><p>~</p></li>
+		<li <?php echo 'experience' === $wp->request ? 'class="current"' : ''; ?>><a href="/experience">Experience (by organisation)</a></li>
+	</ul>
 </nav>
diff --git a/single.php b/single.php
index 0dc67c4..cb8739c 100644
--- a/single.php
+++ b/single.php
@@ -1,18 +1,18 @@
 <?php
-   /**
-	* The template for displaying all single Pages.
-	*
-	* @package Omphaloskepsis
-	* @since Omphaloskepsis 1.0
-	*/
+/**
+ * The template for displaying all single Pages.
+ *
+ * @package Omphaloskepsis
+ * @since Omphaloskepsis 1.0
+ */
 
 ?>
 
 <?php get_header(); ?>
 
 <main id="split-page" role="main">
-   <?php
-	  // Start the loop.
+	<?php
+		// Start the loop.
 	while ( have_posts() ) :
 		the_post();
 		// Include the single post content template.
@@ -23,7 +23,7 @@
 			comments_template();
 		}
 		// End of the loop.
-	  endwhile;
+		endwhile;
 	?>
 </main><!-- .site-main -->
 
diff --git a/taxonomy-company.php b/taxonomy-company.php
index a8a3f33..c3eeb06 100644
--- a/taxonomy-company.php
+++ b/taxonomy-company.php
@@ -133,7 +133,7 @@
 			<section id="related" class="row">
 			<div id="parents" class="col-6 col-m-12">
 			<?php
-			if ( get_queried_object()->parent != 0 ) {
+			if ( get_queried_object()->parent !== 0 ) {
 				// phpcs:disable WordPress.NamingConventions.ValidHookName.UseUnderscores
 				$parents = apply_filters(
 					'taxonomy-images-get-terms',
@@ -181,7 +181,7 @@
 			// phpcs:enable
 			if ( count( $children ) > 0 ) :
 				?>
-				<h2 class="subheading">Child<?php echo ( count( $children ) != 1 ) ? 'ren' : ''; ?></h2>
+				<h2 class="subheading">Child<?php echo ( count( $children ) !== 1 ) ? 'ren' : ''; ?></h2>
 				<ul class="index">
 				<?php
 				foreach ( (array) $children as $child ) :