diff --git a/attachment.php b/attachment.php
index d464af1..8c00d46 100644
--- a/attachment.php
+++ b/attachment.php
@@ -9,7 +9,7 @@
 get_header(); ?>
 
 <div id="content-area">
-	<div id="site-content" role="main"><?php
+	<main id="site-content"><?php
 
 if ( have_posts() ) {
 
@@ -83,7 +83,7 @@
 }
 ?>
 
-	</div><!-- #site-content -->
+	</main><!-- #site-content -->
 </div><!-- #content-area -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/css/style.min.css b/css/style.min.css
index 625e152..fac83e0 100644
--- a/css/style.min.css
+++ b/css/style.min.css
@@ -1,2 +1 @@
-@font-face{font-family:'Droid Sans';src:url(../fonts/droidsans-webfont.eot);src:url(../fonts/droidsans-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/droidsans-webfont.woff) format("woff"),url(../fonts/droidsans-webfont.ttf) format("truetype"),url(../fonts/droidsans-webfont.svg#droid_sansregular) format("svg");font-weight:normal;font-style:normal}@font-face{font-family:'Droid Serif';src:url(../fonts/droidserif-webfont.eot);src:url(../fonts/droidserif-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/droidserif-webfont.woff) format("woff"),url(../fonts/droidserif-webfont.ttf) format("truetype"),url(../fonts/droidserif-webfont.svg#droid_serifregular) format("svg");font-weight:normal;font-style:normal}body,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,a,img,dl,dt,dd,ol,ul,li,fieldset,form,legend,table,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;list-style:none}body{background:#fff}b,strong{font-weight:bold}header,nav,article,footer,address{display:block}.screen-reader-text{display:none}a{text-decoration:none;color:#d90000}a:hover{text-decoration:underline}#site-header{display:block;margin:0 auto;max-width:1180px;border-bottom:1px solid #ddd;overflow:auto}#site-header .site-branding{overflow:hidden;margin:2em auto 1em auto;max-width:1080px}#site-header h1{font-size:1em;margin:0}#site-header #page-title{float:left;font-family:"Droid Sans",sans-serif;font-size:2.8em;line-height:1.5em;font-weight:bold;letter-spacing:-0.05em;text-shadow:1px 1px 0 rgba(0,0,0,0.3);margin:0 0 0 2%;color:#000}#site-header #page-title:hover{text-decoration:none}#site-header #page-title span{color:#d90000}#site-header #page-title small{font-size:65%}#site-header h2{font-family:"Droid Sans",sans-serif;font-size:1em;font-style:italic;line-height:1.2em;float:right;font-weight:normal;margin:1.5em 2% 0 2%;color:#999}body.page-template-full-width-php #site-content{width:94%;padding:0 3%}#content-area{font-size:1em;font-family:"Droid Sans",sans-serif;line-height:1.8em;color:#333}h1,h2,h3,h4,h5,h6{font-family:"Droid Serif",serif;color:#333;font-weight:normal;line-height:1em}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:#333}.page-title,.entry-title,h1{font-size:2.4em;margin:1em 0 0.3em}h2{font-size:1.7em;margin:1em 0 0.3em}.widget-title{font-size:1.4em;font-weight:bold}h3{font-size:1.4em;margin:1em 0 0.3em}h4{font-size:1.3em;margin:0.7em 0 0.2em}h5{font-size:1.2em;margin:0.7em 0 0.2em}h6{font-size:1.1em;margin:0.5em 0 0.15em}p,li,dd,dt,.page-links,caption,th,td{font-size:1em;font-family:"Droid Sans",sans-serif;color:#333}.page-links,p,li{margin:1.5em 0}.page-links{clear:both}p{line-height:1.8em;word-wrap:break-word}ul,ol{margin:1em 0 1em 1.2em}ul li{list-style:square;line-height:2em;margin:0;padding:0}ol li{list-style-type:decimal;line-height:2em;margin:0;padding:0}dt{font-weight:bold}blockquote{position:relative;margin:1.5em 0 1.5em 2.5em;padding:0 1em 0 1em}blockquote p:before,blockquote p:after{font-family:serif;position:absolute;font-size:3em}blockquote p:before{left:-0.3em;top:0.05em;content:"\201C"}blockquote p:after{margin-top:0.1em;margin-left:0.05em;content:"\201D"}blockquote,blockquote p{color:#999;font-style:italic}code,pre{max-width:100%;overflow:auto;font-family:monospace;font-size:0.9em}input[type=text]{border:1px solid #ddd;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;padding:3% 4%}.search-form input[type=submit],.search-form label{display:none}.search-form input[type=text]{width:90%;max-width:400px;font-size:0.9em}iframe{max-width:100%;padding:0;margin:0}img{max-width:100%;height:auto;padding:0;margin:0}body .wp-caption{max-width:94%;margin:1em auto;padding:2% 2% 0 2%;border:1px solid #ddd;-webkit-border-radius:6px;-moz-border-radius:6px;-ms-border-radius:6px;-o-border-radius:6px;border-radius:6px}.wp-caption p{margin:0.4em 0;padding:0 0.8em;font-size:0.8em;line-height:1.5em;color:#666}.wp-caption img{display:block;margin:0 auto;margin:0.4em auto 0}.yarpp-related,.wp-video{margin-top:1em;margin-bottom:1em}.page #content-area article,.single #content-area article{border-bottom:none}article{margin:0 0 2em 0;padding:0 0 2em 0;border-bottom:1px solid #ddd}article.last-post{border-bottom:none}.entry-content{width:100%;overflow:auto}.thumbnail,.attachment-excerpt-thumb{float:right;max-width:38%;margin:0 0 1em 2em}.entry-meta{color:#888;font-family:"Droid Sans",sans-serif;font-size:0.8em}.alignleft{float:left;margin:0 1em 1em 0}.aligncenter{margin:0 auto;display:block}.alignright{float:right;margin:0 0 1em 1em}table{border-bottom:1px solid #ededed;border-collapse:collapse;border-spacing:0;font-size:0.8em;line-height:1.7em;margin:0 0 2em 0;width:100%}caption,th,td{font-weight:normal;text-align:left}caption{font-size:1em;margin:1.5em 0}th{font-weight:bold;text-transform:uppercase}td{border-top:1px solid #ededed;padding:1em 1em 1em 0}#content-area{margin:0 auto;max-width:1080px}#site-content{width:63%;padding:0 0 0 3%;float:left;overflow:hidden}#sidebar{padding:3%;width:24%;float:right;border-left:1px solid #ddd}#sidebar ul li{line-height:1.5em}#sidebar td{padding:0.2em}#numeric-pagination{margin:4em 0 0 0;padding:0 0 4em 0}#numeric-pagination li{float:left;list-style:none;margin:0 0.3em;padding:0;height:1.6em;line-height:1.6em;text-align:center;border:1px solid #ddd}#numeric-pagination a{float:left;height:1.3em;margin:0;padding:0.1em 0.5em 0.2em 0.5em}#numeric-pagination li.active a,#numeric-pagination li a:hover{background:#d90000;text-decoration:none;color:#fff}#comments{margin:3em 0 0 0;overflow:auto}#comments h3{margin:0 0 20px}ol.commentlist{margin:0;padding:0;list-style:none}ol.commentlist li.trackback,ol.commentlist li.pingback,ol.commentlist li.comment{list-style:none;background:#fafafa;border:1px solid #ddd;margin:0 0 1.5em 0;padding:0;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;font-size:0.9em;color:#999}ol.commentlist li.trackback ul,ol.commentlist li.pingback ul,ol.commentlist li.comment ul{margin:0 1.5em 1.5em 1.5em;padding:0}ol.commentlist li.trackback .comment-body,ol.commentlist li.pingback .comment-body,ol.commentlist li.comment .comment-body{padding:1.5em}ol.commentlist li.comment li.comment{font-size:1em;background:#f6f6f6;margin:1.5em 0 0 0}ol.commentlist li.comment li.comment li.comment{background:#f3f3f3}ol.commentlist cite{font-style:normal}ol.commentlist img.avatar{float:right;border:1px solid #ddd;margin:0 0 1.5em 1.5em}ol.commentlist .comment-reply-link{background:#eee;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;border:1px solid #ddd;font-size:0.8em;padding:0.4em 0.8em;color:#333}ol.commentlist .comment-reply-link:hover{background:#d90000;color:#fff;text-decoration:none}.comment-author,.comment-meta{line-height:1.5em}.comment-meta{font-size:0.8em}.gform_wrapper,.contact-form,#respond{margin:3em 0 2em 0;overflow:auto}.comment #respond{margin:3em 1.5em 2em 1.5em}.gform_wrapper ul{margin:1em 0}.gform_wrapper li{list-style:none}.gform_validation_container{display:none}label{display:block;line-height:1.5em;margin:1.5em 0 0 0}textarea,input[type=email],input[type=text],input[type=submit]{display:block;margin:0 0 0.8em;padding:0.5em 0.8em;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;background:#fafafa;border:1px solid #ddd;color:#666;max-width:100%}input[type=email],input[type=text]{width:300px;max-width:88%}textarea{max-width:700px;width:95%;height:200px}input[type=email],input[type=text],textarea{font-size:0.9em;font-family:"Droid Sans",sans-serif}input[type=submit]{font-size:1.2em;background:#eee;color:#333;border:1px solid #ddd;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;margin:1.5em 0 0 0;padding:0.4em 1em}input[type=submit]:hover{background:#d90000;color:#fff;cursor:pointer}.comment-notes,.form-allowed-tags{font-size:1em;color:#999}.metro-tabs a{height:16px}#respond .subscribe-to-comments label{display:inline}#site-footer{clear:both;margin:0 auto;max-width:1180px;text-align:center;font-family:"Droid Sans",sans-serif;font-size:1em}#site-footer .site-info{border-top:1px solid #ddd;padding:1.6em 0}@media (min-width: 900px){body{font-size:120%}}@media (max-width: 650px){#site-content{width:94%;padding:0 3%;float:left}#sidebar{padding:3%;width:94%;border-left:none}textarea{max-width:88%}}@media (max-width: 350px){article .attachment-excerpt-thumb{float:none;display:block;margin:0 auto;max-width:100%}}.rtl .page-title{float:right;margin:0 2% 0 0}.rtl #site-header h2{float:left;margin:1.5em 0 0 2%}.rtl #site-content{padding:0 3% 0 0;float:right}.rtl #sidebar{float:left;border-right:1px solid #ddd;border-left:none}.rtl #numeric-pagination li{float:right}@media print{#respond,.sep,#numeric-pagination,.comments-link,#sidebar{display:none}}
-/*# sourceMappingURL=style.min.css.map */
+.sr-only,.sr-only-focusable:not(:focus){position:absolute !important;width:1px !important;height:1px !important;padding:0 !important;margin:-1px !important;overflow:hidden !important;clip:rect(0, 0, 0, 0) !important;white-space:nowrap !important;border:0 !important}div[tabindex="-1"]{outline:none}@font-face{font-family:"Droid Sans";src:url(../fonts/droidsans-webfont.eot);src:url(../fonts/droidsans-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/droidsans-webfont.woff) format("woff"),url(../fonts/droidsans-webfont.ttf) format("truetype"),url(../fonts/droidsans-webfont.svg#droid_sansregular) format("svg");font-weight:normal;font-style:normal;font-display:fallback}@font-face{font-family:"Droid Serif";src:url(../fonts/droidserif-webfont.eot);src:url(../fonts/droidserif-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/droidserif-webfont.woff) format("woff"),url(../fonts/droidserif-webfont.ttf) format("truetype"),url(../fonts/droidserif-webfont.svg#droid_serifregular) format("svg");font-weight:normal;font-style:normal;font-display:fallback}body,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,a,img,dl,dt,dd,ol,ul,li,fieldset,form,legend,table,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;list-style:none}body{background:#fff}b,strong{font-weight:bold}header,nav,article,footer,address{display:block}a{text-decoration:none;font-style:oblique;color:#d90000}a:hover{text-decoration:underline}#site-header{display:block;margin:0 auto;max-width:1180px;border-bottom:1px solid #ddd;overflow:auto}#site-header .site-branding{overflow:hidden;margin:2em auto 1em auto;max-width:1080px}#site-header h1{font-size:1em;margin:0}#site-header #page-title{float:left;font-family:"Droid Sans",sans-serif;font-size:2.8em;line-height:1.5em;font-weight:bold;font-display:swap;letter-spacing:-0.05em;text-shadow:1px 1px 0 rgba(0,0,0,.3);margin:0 0 0 2%;color:#000}#site-header #page-title:hover{text-decoration:none}#site-header #page-title span{color:#d90000}#site-header #page-title small{font-size:65%}#site-header h2{font-family:"Droid Sans",sans-serif;font-size:1em;font-style:italic;line-height:1.2em;float:right;font-weight:normal;margin:1.5em 2% 0 2%;color:#333}body.page-template-full-width-php #site-content{width:94%;padding:0 3%}#content-area{font-size:1em;font-family:"Droid Sans",sans-serif;line-height:1.8em;color:#333}h1,h2,h3,h4,h5,h6{font-family:"Droid Serif",serif;color:#333;font-weight:normal;line-height:1em}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color:#333}.page-title,.entry-title,h1{font-size:2.4em;margin:1em 0 .3em}h2{font-size:1.7em;margin:1em 0 .3em}.widget-title{font-family:"Droid Serif",serif;font-size:1.4em;font-weight:bold}h3{font-size:1.4em;margin:1em 0 .3em}h4{font-size:1.3em;margin:.7em 0 .2em}h5{font-size:1.2em;margin:.7em 0 .2em}h6{font-size:1.1em;margin:.5em 0 .15em}p,li,dd,dt,.page-links,caption,th,td{font-size:1em;font-family:"Droid Sans",sans-serif;color:#333}.page-links,p,li{margin:1.5em 0}.page-links{clear:both}p{line-height:1.8em;word-wrap:break-word}ul,ol{margin:1em 0 1em 1.2em}ul li{list-style:square;line-height:2em;margin:0;padding:0}ol li{list-style-type:decimal;line-height:2em;margin:0;padding:0}dt{font-weight:bold}blockquote{position:relative;margin:1.5em 0 1.5em 2.5em;padding:0 1em 0 1em}blockquote p:before,blockquote p:after{font-family:serif;position:absolute;font-size:3em}blockquote p:before{left:-0.3em;top:.05em;content:"“"}blockquote p:after{margin-top:.1em;margin-left:.05em;content:"”"}blockquote,blockquote p{color:#333;font-style:italic}code,pre{max-width:100%;overflow:auto;font-family:monospace;font-size:.9em}input[type=text]{border:1px solid #ddd;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;padding:3% 4%}.search-form input[type=text]{width:90%;max-width:400px;font-size:.9em}iframe{max-width:100%;padding:0;margin:0}img{max-width:100%;height:auto;padding:0;margin:0}body .wp-caption{max-width:94%;margin:1em auto;padding:2% 2% 0 2%;border:1px solid #ddd;-webkit-border-radius:6px;-moz-border-radius:6px;-ms-border-radius:6px;-o-border-radius:6px;border-radius:6px}.wp-caption p{margin:.4em 0;padding:0 .8em;font-size:.8em;line-height:1.5em;color:#666}.wp-caption img{display:block;margin:0 auto;margin:.4em auto 0}.yarpp-related,.wp-video{margin-top:1em;margin-bottom:1em}.page #content-area article,.single #content-area article{border-bottom:none}article{margin:0 0 2em 0;padding:0 0 2em 0;border-bottom:1px solid #ddd}article.last-post{border-bottom:none}.entry-content{width:100%;overflow:auto}.thumbnail,.attachment-excerpt-thumb{float:right;max-width:38%;margin:0 0 1em 2em}.entry-meta{color:#333;font-family:"Droid Sans",sans-serif;font-size:.8em}.alignleft{float:left;margin:0 1em 1em 0}.aligncenter{margin:0 auto;display:block}.alignright{float:right;margin:0 0 1em 1em}table{border-bottom:1px solid #ededed;border-collapse:collapse;border-spacing:0;font-size:.8em;line-height:1.7em;margin:0 0 2em 0;width:100%}caption,th,td{font-weight:normal;text-align:left}caption{font-size:1em;margin:1.5em 0}th{font-weight:bold;text-transform:uppercase}td{border-top:1px solid #ededed;padding:1em 1em 1em 0}#content-area{margin:0 auto;max-width:1080px}#site-content{width:63%;padding:0 0 0 3%;float:left;overflow:hidden}#sidebar{padding:3%;width:24%;float:right;border-left:1px solid #ddd}#sidebar ul li{line-height:1.5em}#sidebar td{padding:.2em}#numeric-pagination{margin:4em 0 0 0;padding:0 0 4em 0}#numeric-pagination li{float:left;list-style:none;margin:0 .3em;padding:0;height:1.6em;line-height:1.6em;text-align:center;border:1px solid #ddd}#numeric-pagination a{float:left;height:1.3em;margin:0;padding:.1em .5em .2em .5em}#numeric-pagination li.active a,#numeric-pagination li a:hover{background:#d90000;text-decoration:none;color:#fff}#comments{margin:3em 0 0 0;overflow:auto}#comments h3{margin:0 0 20px}ol.commentlist{margin:0;padding:0;list-style:none}ol.commentlist li.trackback,ol.commentlist li.pingback,ol.commentlist li.comment{list-style:none;background:#fafafa;border:1px solid #ddd;margin:0 0 1.5em 0;padding:0;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;font-size:.9em;color:#333}ol.commentlist li.trackback ul,ol.commentlist li.pingback ul,ol.commentlist li.comment ul{margin:0 1.5em 1.5em 1.5em;padding:0}ol.commentlist li.trackback .comment-body,ol.commentlist li.pingback .comment-body,ol.commentlist li.comment .comment-body{padding:1.5em}ol.commentlist li.comment li.comment{font-size:1em;background:#f6f6f6;margin:1.5em 0 0 0}ol.commentlist li.comment li.comment li.comment{background:#f3f3f3}ol.commentlist cite{font-style:normal}ol.commentlist img.avatar{float:right;border:1px solid #ddd;margin:0 0 1.5em 1.5em}ol.commentlist .comment-reply-link{background:#eee;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;border:1px solid #ddd;font-size:.8em;padding:.4em .8em;color:#333}ol.commentlist .comment-reply-link:hover{background:#d90000;color:#fff;text-decoration:none}.comment-author,.comment-meta{line-height:1.5em}.comment-meta{font-size:.8em}.gform_wrapper,.contact-form,#respond{margin:3em 0 2em 0;overflow:auto}.comment #respond{margin:3em 1.5em 2em 1.5em}.gform_wrapper ul{margin:1em 0}.gform_wrapper li{list-style:none}.gform_validation_container{display:none}label{display:block;line-height:1.5em;margin:1.5em 0 0 0}textarea,input[type=email],input[type=text],input[type=submit]{display:block;margin:0 0 .8em;padding:.5em .8em;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;background:#fafafa;border:1px solid #ddd;color:#666;max-width:100%}input[type=email],input[type=text]{width:300px;max-width:88%}textarea{max-width:700px;width:95%;height:200px}input[type=email],input[type=text],textarea{font-size:.9em;font-family:"Droid Sans",sans-serif}input[type=submit]{font-size:1.2em;background:#eee;color:#333;border:1px solid #ddd;border-radius:6px;-moz-border-radius:6px;-webkit-border-radius:6px;margin:1.5em 0 0 0;padding:.4em 1em}input[type=submit]:hover{background:#d90000;color:#fff;cursor:pointer}.comment-notes,.form-allowed-tags{font-size:1em;color:#333}.metro-tabs a{height:16px}#respond .subscribe-to-comments label{display:inline}#site-footer{clear:both;margin:0 auto;max-width:1180px;text-align:center;font-family:"Droid Sans",sans-serif;font-size:1em}#site-footer .site-info{border-top:1px solid #ddd;padding:1.6em 0}@media(min-width: 900px){body{font-size:120%}}@media(max-width: 650px){#site-content{width:94%;padding:0 3%;float:left}#sidebar{padding:3%;width:94%;border-left:none}textarea{max-width:88%}}@media(max-width: 350px){article .attachment-excerpt-thumb{float:none;display:block;margin:0 auto;max-width:100%}}.rtl .page-title{float:right;margin:0 2% 0 0}.rtl #site-header h2{float:left;margin:1.5em 0 0 2%}.rtl #site-content{padding:0 3% 0 0;float:right}.rtl #sidebar{float:left;border-right:1px solid #ddd;border-left:none}.rtl #numeric-pagination li{float:right}@media print{#respond,.sep,#numeric-pagination,.comments-link,#sidebar{display:none}}/*# sourceMappingURL=style.min.css.map */
diff --git a/css/style.min.css.map b/css/style.min.css.map
index caee128..d1ef4df 100644
--- a/css/style.min.css.map
+++ b/css/style.min.css.map
@@ -1,7 +1 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["style.scss"],
-"names": [],
-"file": "style.min.css"
-}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["style.scss"],"names":[],"mappings":"CAkDA,wCAjBE,6BACA,qBACA,sBACA,qBACA,uBACA,2BACA,iCACA,8BACA,oBAeF,mBACC,aAKD,WACC,yBACA,wCACA,0PAIA,mBACA,kBACA,sBAED,WACC,0BACA,yCACA,+PAIA,mBACA,kBACA,sBAKD,yHACC,SACA,UACA,SACA,gBAED,KACC,gBAED,SACC,iBAKD,kCAKC,cAKD,EACC,qBACA,mBACA,MA1GY,QA4Gb,QACC,0BAKD,aAEC,cACA,cACA,UA1HkB,OA2HlB,cAzHQ,eA0HR,cAEA,4BACC,gBACA,yBACA,UAhIe,OAmIhB,gBACC,cACA,SAGD,yBAEC,WACA,YAlIgB,wBAmIhB,gBACA,kBACA,iBACA,kBACA,uBACA,qCACA,gBAEA,WAEA,+BACC,qBAGD,8BACC,MAxJU,QA2JX,+BACC,cAKF,gBACC,YA5JgB,wBA6JhB,UAhKmB,IAiKnB,kBACA,kBACA,YACA,mBACA,qBACA,MAvKe,KA+KjB,gDACC,UACA,aAGD,cACC,UApLoB,IAqLpB,YAlLiB,wBAmLjB,kBACA,WAGD,kBAMC,YA5LY,oBA6LZ,WACA,mBACA,gBAEA,8BACC,WAKF,4BAGC,gBACA,kBAGD,GACC,gBACA,kBAGD,cACC,YApNY,oBAqNZ,gBACA,iBAGD,GACC,gBACA,kBAGD,GACC,gBACA,mBAGD,GACC,gBACA,mBAGD,GACC,gBACA,oBAGD,qCAQC,UAzPoB,IA0PpB,YAvPiB,wBAwPjB,WAGD,iBAGC,eAGD,YACC,WAGD,EACC,kBACA,qBAGD,MAEC,uBAGD,MACC,kBACA,gBACA,SACA,UAGD,MACC,wBACA,gBACA,SACA,UAGD,GACC,iBAGD,WAEC,kBACA,2BACA,oBAEA,uCAEC,kBACA,kBACA,cAED,oBACC,YACA,UACA,YAED,mBACC,gBACA,kBACA,YAKF,wBAEC,MAhUgB,KAiUhB,kBAGD,SAEC,eACA,cACA,sBACA,UAvUmB,KA0UpB,iBACC,OAjVQ,eAYR,cAD+B,IAE/B,mBAF+B,IAG/B,sBAH+B,IAwU/B,cAIA,8BACC,UACA,gBACA,UApVkB,KAwVpB,OACC,eACA,UACA,SAGD,IACC,eACA,YACA,UACA,SAGD,iBACC,cACA,gBACA,mBACA,OA/WQ,eAgXR,0BACA,uBACA,sBACA,qBACA,kBAGD,cACC,cACA,eACA,eACA,kBACA,WAGD,gBACC,cACA,cACA,mBAGD,yBAEC,eACA,kBAMD,0DAEC,mBAGD,QACC,iBACA,kBACA,cAtZQ,eAyZT,kBACC,mBAGD,eACC,WACA,cAGD,qCAEC,YACA,cACA,mBAGD,YACC,MAtagB,KAuahB,YAnaiB,wBAoajB,eAGD,WACC,WACA,mBAGD,aACC,cACA,cAGD,YACC,YACA,mBAGD,MACC,gCACA,yBACA,iBACA,eACA,kBACA,iBACA,WAGD,cAGC,mBACA,gBAGD,QACC,cACA,eAGD,GACC,iBACA,yBAGD,GACC,6BACA,sBAMD,cACC,cACA,UApegB,OAuejB,cACC,UACA,iBACA,WACA,gBAGD,SACC,WACA,UACA,YACA,YAjfQ,eAmfR,eACC,kBAGD,YACC,aAQF,oBACC,iBACA,kBAEA,uBACC,WACA,gBACA,cACA,UACA,aACA,kBACA,kBACA,OA5gBO,eA+gBR,sBACC,WACA,aACA,SACA,4BAGD,+DAEC,WAthBW,QAuhBX,qBACA,WAOF,UAEC,iBACA,cAEA,aACC,gBAKF,eAEC,SACA,UACA,gBAEA,iFAGC,gBACA,mBACA,OAvjBO,eAwjBP,mBACA,UA7iBD,cAD+B,IAE/B,mBAF+B,IAG/B,sBAH+B,IAgjB9B,UArjBkB,KAsjBlB,MAxjBe,KA2jBhB,0FAGC,2BACA,UAGD,2HAGC,cAGD,qCACC,UAxkBmB,IAykBnB,mBACA,mBAGD,gDACC,mBAGD,oBACC,kBAGD,0BACC,YACA,OA5lBO,eA6lBP,uBAGD,mCACC,gBArlBD,cAD+B,IAE/B,mBAF+B,IAG/B,sBAH+B,IAwlB9B,OAnmBO,eAomBP,UA7lBgB,KA8lBhB,kBACA,WAGD,yCACC,WAxmBW,QAymBX,WACA,qBAKF,8BAEC,kBAGD,cACC,UAhnBiB,KAunBlB,sCAGC,mBACA,cAGD,kBACC,2BAGD,kBACC,aAGD,kBACC,gBAGD,4BACC,aAGD,MACC,cACA,kBACA,mBAGD,+DAIC,cACA,gBACA,kBArpBA,cAD+B,IAE/B,mBAF+B,IAG/B,sBAH+B,IAwpB/B,mBACA,OApqBQ,eAqqBR,WACA,eAGD,mCAEC,YACA,cAGD,SACC,gBACA,UACA,aAGD,4CAGC,UAlrBmB,KAmrBnB,YAjrBiB,wBAorBlB,mBACC,gBACA,gBACA,WACA,OAhsBQ,eAYR,cAD+B,IAE/B,mBAF+B,IAG/B,sBAH+B,IAurB/B,mBACA,iBAGD,yBACC,WArsBY,QAssBZ,WACA,eAGD,kCAEC,UAzsBoB,IA0sBpB,MA3sBgB,KAktBjB,cACC,YAID,sCACC,eAMD,aACC,WACA,cACA,UAvuBkB,OAwuBlB,kBACA,YA/tBiB,wBAguBjB,UAnuBoB,IAquBpB,wBACC,WA3uBO,eA4uBP,gBAQF,yBAEC,KACC,gBAKF,yBAEC,cACC,UACA,aACA,WAGD,SACC,WACA,UACA,iBAGD,SACC,eAKF,yBAIE,kCACC,WACA,cACA,cACA,gBAWF,iBACC,YACA,gBAGD,qBACC,WACA,oBAGD,mBACC,iBACA,YAGD,cACC,WACA,aApzBO,eAqzBP,iBAGD,4BACC,YAQF,aAEC,0DAKC","file":"style.min.css"}
\ No newline at end of file
diff --git a/css/style.scss b/css/style.scss
index b1bd7aa..75e1660 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -9,6 +9,7 @@ $border: 1px solid #ddd;
 $small-text: 0.8em;
 $red_colour: #d90000;
 $grey_colour: #ddd;
+$scondary_color: #333;
 $font_standard_size: 1.0em;
 $font_reduced_size: 0.9em;
 $font_small_size: 0.8em;
@@ -21,6 +22,41 @@ $font_serif: "Droid Serif", serif;
 	-webkit-border-radius: $radius;
 }
 
+/* =Screen reader only
+-------------------------------------------------------------- */
+//sr only code from bootstrap - https://github.com/twbs/bootstrap/blob/a4a04cd9ec741050390746f8056cc79a9c04c8df/scss/mixins/_screen-reader.scss
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2011-2019 Twitter, Inc.
+// Copyright (c) 2011-2019 The Bootstrap Authors
+@mixin sr-only {
+  position: absolute !important;
+  width: 1px !important;
+  height: 1px !important;
+  padding: 0 !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  clip: rect(0, 0, 0, 0) !important;
+  white-space: nowrap !important;
+  border: 0 !important;
+}
+
+@mixin sr-only-focusable {
+  &:not(:focus) {
+    @include sr-only();
+  }
+}
+
+.sr-only,
+.sr-only-focusable:not(:focus) {
+  @include sr-only();
+}
+/* #Accessiblity
+-------------------------------------------------------------- */
+div[tabindex="-1"] { //hide outline from forced tab elements
+	outline: none;
+}
 
 /* =Fonts
 -------------------------------------------------------------- */
@@ -32,7 +68,8 @@ $font_serif: "Droid Serif", serif;
 		url(../fonts/droidsans-webfont.ttf) format('truetype'),
 		url(../fonts/droidsans-webfont.svg#droid_sansregular) format('svg');
 	font-weight: normal;
-	font-style: normal;	
+	font-style: normal;
+	font-display: fallback;
 }
 @font-face {
 	font-family: 'Droid Serif';
@@ -43,6 +80,7 @@ $font_serif: "Droid Serif", serif;
 		url(../fonts/droidserif-webfont.svg#droid_serifregular) format('svg');
 	font-weight: normal;
 	font-style: normal;
+	font-display: fallback;
 }
 
 /* =Reset
@@ -51,7 +89,6 @@ body,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,a,img,dl,dt,dd,ol,ul,li,fieldset,form
 	margin: 0;
 	padding: 0;
 	border: 0;
-	outline: 0;
 	list-style: none;
 }
 body {
@@ -71,16 +108,11 @@ address {
 	display: block;
 }
 
-/* =Hidden sections
--------------------------------------------------------------- */
-.screen-reader-text {
-	display: none;
-}
-
 /* =Links
 -------------------------------------------------------------- */
 a {
 	text-decoration: none;
+	font-style: oblique;
 	color: $red_colour;
 }
 a:hover {
@@ -115,6 +147,7 @@ a:hover {
 		font-size: 2.8em;
 		line-height: 1.5em;
 		font-weight: bold;
+		font-display: swap;
 		letter-spacing: -0.05em;
 		text-shadow: 1px 1px 0 rgba(0,0,0,0.3);
 		margin: 0 0 0 2%;
@@ -143,7 +176,7 @@ a:hover {
 		float: right;
 		font-weight: normal;
 		margin: 1.5em 2% 0 2%;
-		color: #999;
+		color: $scondary_color;
 	}
 
 }
@@ -193,6 +226,7 @@ h2 {
 }
 
 .widget-title {
+	font-family: $font_serif;
 	font-size: 1.4em;
 	font-weight: bold;
 }
@@ -295,7 +329,7 @@ blockquote {
 
 blockquote,
 blockquote p {
-	color: #999;
+	color: $scondary_color;
 	font-style: italic;
 }
 
@@ -314,18 +348,11 @@ input[type=text] {
 }
 
 .search-form {
-
-	input[type=submit],
-	label {
-		display: none;
-	}
-
 	input[type=text] {
 		width: 90%;
 		max-width: 400px;
 		font-size: $font_reduced_size;
 	}
-
 }
 
 iframe {
@@ -404,7 +431,7 @@ article.last-post {
 }
 
 .entry-meta {
-	color: #888;
+	color: $scondary_color;
 	font-family: $font_sans_serif;
 	font-size: 0.8em;
 }
@@ -550,7 +577,7 @@ ol.commentlist {
 		padding: 0;
 		@include rounded_corners();
 		font-size: $font_reduced_size;
-		color: #999;
+		color: $scondary_color;
 	}
 
 	li.trackback ul,
@@ -697,7 +724,7 @@ input[type=submit]:hover {
 .comment-notes,
 .form-allowed-tags {
 	font-size: $font_standard_size;
-	color: #999;
+	color: $scondary_color;
 }
 
 /* =Third party plugins
diff --git a/footer.php b/footer.php
index d88fe37..6989ea7 100644
--- a/footer.php
+++ b/footer.php
@@ -9,8 +9,6 @@
  */
 ?>
 
-</main><!-- #main -->
-
 <footer id="site-footer" role="contentinfo">
 	<div class="site-info">
 		<?php _e( 'Copyright', 'hellish-simplicity' ); ?> &copy; <?php bloginfo( 'name' ); ?> <?php echo date( 'Y' ); ?>. 
diff --git a/functions.php b/functions.php
index b302303..39c459a 100644
--- a/functions.php
+++ b/functions.php
@@ -62,6 +62,7 @@ public function __construct() {
 
 		// Add filters
 		add_filter( 'post_class',                                            array( $this, 'add_last_post_class' ) );
+		add_filter( 'dynamic_sidebar_params',              			         array( $this, 'accessible_widgets' ) );
 	}
 
 	/**
@@ -146,6 +147,29 @@ public function widgets_init() {
 		);
 	}
 
+	/**
+	* Use widget params to try and predict the correct tag and title
+	*/
+	public function accessible_widgets($params) {
+		$id = $params[0]['widget_id'];
+		$name = $params[0]['widget_name'];
+		if (!$name) {
+			$name = $id;
+		}
+
+		// var_dump($params[0]['widget_name'], $id);
+		$params[0]['before_widget'] = substr($params[0]['before_widget'], 0, -1). ' aria-label="' . esc_attr($name) . '">';
+		if ( strpos($params[0]['before_widget'], '<aside') === 0 &&
+			(strpos($id, 'nav') !== false || strpos($id, 'posts') !== false || strpos($id, 'categories') !== false || strpos($id, 'archive') !== false)) {
+			$params[0]['before_widget'] = '<nav ' . substr($params[0]['before_widget'], 6);
+			$params[0]['after_widget'] = '</nav>';
+		} else if (strpos($id, 'search') >= 0) {
+			$params[0]['before_widget'] = substr($params[0]['before_widget'], 0, -1). ' role="search">';
+		}
+		// var_dump($params);
+		return $params;
+	}
+
 	/**
 	 * Implements Page Styler theme options into Theme Customizer.
 	 *
diff --git a/header.php b/header.php
index 7ac4181..7e4652a 100644
--- a/header.php
+++ b/header.php
@@ -18,7 +18,11 @@
 </head>
 <body <?php body_class(); ?>>
 
-<a class="skip-link screen-reader-text" href="#main"><?php esc_html_e( 'Skip to content', 'hellish-simplicity' ); ?></a>
+<?php
+if ( 'full-width.php' != basename( get_page_template() ) ) { //we don't show sidebar in full-width template ?>
+	<a class="skip-link sr-only-focusable" href="#sidebar"><?php esc_html_e( 'Skip to sidebar', 'hellish-simplicity' ); ?></a>
+<?php }
+?>
 
 <header id="site-header" role="banner">
 	<div class="site-branding">
@@ -48,5 +52,3 @@
 		<h2><?php bloginfo( 'description' ); ?></h2>
 	</div><!-- .site-branding -->
 </header><!-- #site-header -->
-
-<main id="main">
diff --git a/index.php b/index.php
index a34e900..f89fcd2 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
 get_header(); ?>
 
 <div id="content-area">
-	<div id="site-content" role="main"><?php
+	<main id="site-content"><?php
 
 // If on search page, then display what we searched for
 if ( is_search() ) { ?>
@@ -52,7 +52,7 @@
 
 				// Display full content for home page and single post pages
 				if ( is_home() || is_singular() ) {
-					the_content( esc_html__( 'Continue reading <span class="meta-nav">&rarr;</span>', 'hellish-simplicity' ) );
+					the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'hellish-simplicity' ) );
 					wp_link_pages( array( 'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'hellish-simplicity' ), 'after' => '</div>' ) );
 				} else {
 
@@ -89,7 +89,7 @@
 }
 ?>
 
-	</div><!-- #site-content --><?php
+</main><!-- #site-content --><?php
 
 	// Show sidebar if not on full width template
 	if ( 'full-width.php' != basename( get_page_template() ) ) {
diff --git a/searchform.php b/searchform.php
index 622737b..030d5b1 100644
--- a/searchform.php
+++ b/searchform.php
@@ -7,7 +7,7 @@
  */
 ?>
 <form method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
-	<label for="s" class="screen-reader-text"><?php esc_html_e( 'Search', 'hellish-simplicity' ); ?></label>
+	<label for="s" class="widget-title"><?php esc_html_e( 'Search', 'hellish-simplicity' ); ?></label>
 	<input type="text" id="s" class="field" name="s" placeholder="<?php esc_attr_e( 'Search', 'hellish-simplicity' ); ?>" />
-	<input type="submit" class="submit" name="submit" value="<?php esc_attr_e( 'Search', 'hellish-simplicity' ); ?>" />
+	<input type="submit" class="submit sr-only-focusable" name="submit" value="<?php esc_attr_e( 'Search', 'hellish-simplicity' ); ?>" />
 </form>
diff --git a/template-parts/sidebar.php b/template-parts/sidebar.php
index 977a7c0..46d2308 100644
--- a/template-parts/sidebar.php
+++ b/template-parts/sidebar.php
@@ -6,10 +6,10 @@
  * @since Hellish Simplicity 1.1
  */
 ?>
-<div id="sidebar" role="complementary"><?php
+<aside tabindex="-1" id="sidebar" aria-label="sidebar"><?php
 
 	if ( ! dynamic_sidebar( 'sidebar' ) ) { ?>
-	<aside>
+	<nav aria-label="<?php esc_attr_e( 'Recent Posts', 'hellish-simplicity' ); ?>">
 		<h2 class="widget-title"><?php esc_html_e( 'Recent Posts', 'hellish-simplicity' ); ?></h2>
 		<ul><?php
 			$recent_posts = wp_get_recent_posts();
@@ -17,18 +17,18 @@
 				echo '<li><a href="' . esc_url( get_permalink( $recent['ID'] ) ) . '" title="Look ' . esc_attr( $recent['post_title'] ) . '" >' . esc_html( $recent['post_title'] ) . '</a></li>';
 			}
 		?></ul>
-	</aside>
-	<aside>
+	</nav>
+	<nav aria-label="<?php esc_html_e( 'Archives', 'hellish-simplicity' ); ?>">
 		<h2 class="widget-title"><?php esc_html_e( 'Archives', 'hellish-simplicity' ); ?></h2>
 		<ul>
 			<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
 		</ul>
-	</aside>
-	<aside>
+	</nav>
+	<section aria-role="search">
 		<h2 class="widget-title"><?php esc_html_e( 'Search', 'hellish-simplicity' ); ?></h2>
 		<?php get_search_form(); ?>
-	</aside><?php
+	</section><?php
 	}
 	?>
 
-</div><!-- #sidebar -->
+</aside><!-- #sidebar -->