diff --git a/config.toml b/config.toml
index 1d988fe..e4b2ad3 100644
--- a/config.toml
+++ b/config.toml
@@ -19,16 +19,16 @@ paginate = 10
 	url  = "/contributing"
 	weight = 2
 
-[[menu.main]]
-	name = "Source Code"
-	pre = "<div class='fa fa-codepen'></div> "
-	url  = "/source-code"
-	weight = 3
-
 [[menu.main]]
 	name = "Download"
 	pre = "<div class='fa fa-cubes'></div> "
 	url  = "/download"
+	weight = 3
+
+[[menu.main]]
+	name = "Source Code"
+	pre = "<div class='fa fa-codepen'></div> "
+	url  = "/source-code"
 	weight = 4
 
 [[menu.main]]
diff --git a/themes/exectos/layouts/partials/header.html b/themes/exectos/layouts/partials/header.html
index 114ae29..aadab88 100644
--- a/themes/exectos/layouts/partials/header.html
+++ b/themes/exectos/layouts/partials/header.html
@@ -1,6 +1,6 @@
 <div class="wrapper_header">
 	<div class="header">
-		<h1><a href="{{ .Site.BaseURL }}"><img src="" alt="{{ .Site.Title }}" /></a></h1>
+		<h1><a href="{{ .Site.BaseURL }}"><img src="images/exectos_logo.png" alt="LOGO" width="50px" /> {{ .Site.Title }}</a></h1>
 		<ul>
 			{{ range .Site.Menus.main }}
 			{{ if .HasChildren }}
diff --git a/themes/exectos/static/css/style.css b/themes/exectos/static/css/style.css
index 5ef1964..152f8eb 100644
--- a/themes/exectos/static/css/style.css
+++ b/themes/exectos/static/css/style.css
@@ -1,151 +1,207 @@
 @import url("/css/fontawesome-min.css");
 
+@font-face {
+    font-family      : 'Source Sans Pro';
+    font-style       : normal;
+    font-weight      : 400;
+    src              : url('/fonts/source-sans-pro-v9-latin-regular.eot');
+    src              : local('Source Sans Pro'), local('SourceSansPro-Regular'),
+                       url('/fonts/source-sans-pro-v9-latin-regular.eot?#iefix') format('embedded-opentype'),
+                       url('/fonts/source-sans-pro-v9-latin-regular.woff2') format('woff2'),
+                       url('/fonts/source-sans-pro-v9-latin-regular.woff') format('woff'),
+                       url('/fonts/source-sans-pro-v9-latin-regular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family      : 'Source Sans Pro';
+    font-style       : italic;
+    font-weight      : 400;
+    src              : url('/fonts/source-sans-pro-v9-latin-italic.eot');
+    src              : local('Source Sans Pro Italic'), local('SourceSansPro-It'),
+                       url('/fonts/source-sans-pro-v9-latin-italic.eot?#iefix') format('embedded-opentype'),
+                       url('/fonts/source-sans-pro-v9-latin-italic.woff2') format('woff2'),
+                       url('/fonts/source-sans-pro-v9-latin-italic.woff') format('woff'),
+                       url('/fonts/source-sans-pro-v9-latin-italic.ttf') format('truetype');
+}
+
+@font-face {
+    font-family      : 'Source Sans Pro';
+    font-style       : normal;
+    font-weight      : 700;
+    src              : url('/fonts/source-sans-pro-v9-latin-700.eot');
+    src              : local('Source Sans Pro Bold'), local('SourceSansPro-Bold'),
+                       url('/fonts/source-sans-pro-v9-latin-700.eot?#iefix') format('embedded-opentype'),
+                       url('/fonts/source-sans-pro-v9-latin-700.woff2') format('woff2'),
+                       url('/fonts/source-sans-pro-v9-latin-700.woff') format('woff'),
+                       url('/fonts/source-sans-pro-v9-latin-700.ttf') format('truetype');
+}
+
+:root {
+    color-scheme     : light;
+}
+
 html {
-    color		: #333333;
-    background-color	: #FFFFFF;
-    margin		: 0;
-    padding		: 0;
+    color            : light-dark(#333333, #FFFFFF);
+    background-color : light-dark(#FFFFFF, #030C12);
+    margin           : 0;
+    padding          : 0;
 }
 
 body {
-    font-family		: "trebuchet ms", "verdana", sans-serif;
-    margin		: 0;
-    padding		: 0;
+    font-family      : "Source Sans Pro", "Trebuchet MS", "Verdana", sans-serif;
+    margin           : 0;
+    padding          : 0;
 }
 
 h1 {
-    margin-top		: 8px;
-    padding		: 1px;
+    font-size        : 28px;
+    margin-top       : 8px;
+    padding          : 1px;
+    vertical-align   : middle;
 }
 
 h2 {
-    border-bottom	: 1px solid #8877FF;
-    margin-left		: -1em;
-    margin-right	: -1em;
+    border-bottom    : 1px solid #DDDDDD;
+    font-size        : 30px;
+    margin-left      : -1em;
+    margin-right     : -1em;
+    text-decoration  : bold;
+}
+
+h3 {
+    border-bottom    : 1px solid #CCCCCC;
+    font-size        : 18px;
+    margin-left      : -1em;
+    margin-right     : -1em;
+    text-decoration  : bold;
 }
 
 img {
-    border		: 0px;
+    border           : 0px;
+    vertical-align   : middle;
 }
 
 .content {
-    margin-left		: 25%;
-    margin-right	: 25%;
-    margin-top		: 2.5em;
+    font-size        : 14px;
+    margin-left      : 30%;
+    margin-right     : 30%;
+    margin-top       : 1.5em;
 }
 
 .content li {
-    list-style-type	: square;
+    list-style-type  : square;
 }
 
 .copyright {
-    color		: #404040;
-    font-family		: sans-serif, Verdana, Arial, Helvetica;
-    font-size		: 10px;
-    text-align		: center;
-    text-decoration	: none;
+    color            : #404040;
+    font-family      : "Source Sans Pro", "Trebuchet MS", "Verdana", sans-serif;
+    font-size        : 10px;
+    text-align       : center;
+    text-decoration  : none;
 }
 
 .copyright a {
-    color		: #404040;
-    text-decoration	: none;
+    color            : #404040;
+    text-decoration  : none;
 }
 
 .copyright a:hover {
-    color		: #404040;
-    text-decoration	: none;
-}
-
-.header {
-    background		: #bee0ff;
-    border-bottom	: 2px solid #186196;
-    color		: #186196;
-    clear		: both;
-    padding-left	: 1em;
-    padding-top		: 0.5em;
-}
-
-.header a {
-    border		: 2px solid transparent;
-    color		: #186196;
-    padding-left	: 10px;
-    padding-right	: 10px;
-    padding-top		: 1px;
-    text-decoration	: none;
-}
-
-.header li a:before {
-    content: "\00BB       ";
-    color: #186196;
-}
-
-.header a:hover {
-    color		: #000055;
-    padding-left	: 10px;
-    padding-right	: 10px;
-    padding-top		: 1px;
-}
-
-.header li {
-    display		: inline;
-    margin-left		: 2em;
-}
-
-.header ul {
-    margin		: 0px;
-    padding		: 0px;
-    text-align		: left;
+    color            : #404040;
+    text-decoration  : none;
 }
 
 .footer {
-    background		: #FFFFFF;
-    color		: #000000;
-    clear		: both;
-    font-family		: sans-serif, verdana, Helvetica;
-    font-size		: 12px;
-    margin-left		: 10px;
-    margin-top		: 0.4em;
-    padding		: 0;
-    width		: 100%
+    background       : light-dark(#FFFFFF, #030C12);
+    color            : light-dark(#000000, #FFFFFF);
+    clear            : both;
+    font-family      : sans-serif, verdana, Helvetica;
+    font-size        : 12px;
+    margin-left      : 10px;
+    margin-top       : 0.4em;
+    padding          : 0;
+    width            : 100%
 }
 
 .footer-left {
-    position		: absolute;
-    text-align		: left;
-    width		: 50%;
+    position         : absolute;
+    text-align       : left;
+    width            : 50%;
 }
 
 .footer-right {
-    left		: 50%;
-    position		: absolute;
-    text-align		: right;
-    width		: 50%;
+    left             : 50%;
+    position         : absolute;
+    text-align       : right;
+    width            : 50%;
+}
+
+.header {
+    background       : light-dark(#BEE0FF, #2185D0);
+    border-bottom    : 2px solid #186196;
+    color            : #186196;
+    clear            : both;
+    font-size        : 14px;
+    padding-left     : 1em;
+    padding-top      : 1px;
+    text-align       : center;
+    vertical-align   : middle;
+}
+
+.header a {
+    color            : light-dark(#186196, #CCCCCC);
+    padding-left     : 5px;
+    padding-right    : 5px;
+    padding-top      : 1px;
+    text-decoration  : none;
+}
+
+.header a:hover {
+    color            : light-dark(#000055, #FFFFFF);
+    padding-left     : 5px;
+    padding-right    : 5px;
+    padding-top      : 1px;
+}
+
+.header img {
+    margin           : 0px;
+    padding          : 0px;
+}
+
+.header li {
+    display          : inline;
+    margin-left      : 2em;
+}
+
+.header ul {
+    margin           : 0px;
+    padding          : 0px;
+    text-align       : center;
 }
 
 .wrapper_content {
-	margin-bottom		: 2.5em;
-	padding				: 6em 0 0 0;
+	margin-bottom    : 2.5em;
+	padding          : 6em 0 0 0;
 }
 
 .wrapper_header {
-	background			: #FFFFFF;
-	color				: #000000;
-	height				: 6em;
-	left				: 0;
-	position			: absolute;
-	position			: fixed;
-	top					: 0;
-	width				: 100%;
+	background       : light-dark(#FFFFFF, #030C12);
+	color            : light-dark(#000000, #FFFFFF);
+	height           : 6em;
+	left             : 0;
+	position         : absolute;
+	position         : fixed;
+	top              : 0;
+	width            : 100%;
 }
 
 .wrapper_footer {
-    background		: #FFFFFF;
-    border-top		: 2px solid #186196;
-    bottom		: 0;
-    color		: #000000;
-    height		: 1.5em;
-    left		: 0;
-    position		: absolute;
-    position		: fixed;
-    width		: 100%
+    background       : light-dark(#FFFFFF, #030C12);
+    border-top       : 2px solid #186196;
+    bottom           : 0;
+    color            : #000000;
+    height           : 1.5em;
+    left             : 0;
+    position         : absolute;
+    position         : fixed;
+    width            : 100%
 }
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.eot b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.eot
new file mode 100644
index 0000000..dc9f857
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.eot differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.ttf b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.ttf
new file mode 100644
index 0000000..cfe7065
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.ttf differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.woff b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.woff
new file mode 100644
index 0000000..600751c
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.woff differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.woff2 b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.woff2
new file mode 100644
index 0000000..2486c1d
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-700.woff2 differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.eot b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.eot
new file mode 100644
index 0000000..63f9eb2
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.eot differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.ttf b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.ttf
new file mode 100644
index 0000000..0cf2e43
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.ttf differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.woff b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.woff
new file mode 100644
index 0000000..5878fc6
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.woff differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.woff2 b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.woff2
new file mode 100644
index 0000000..90428c7
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-italic.woff2 differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.eot b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.eot
new file mode 100644
index 0000000..5dd59e7
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.eot differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.ttf b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.ttf
new file mode 100644
index 0000000..950ff8b
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.ttf differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.woff b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.woff
new file mode 100644
index 0000000..dbdec39
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.woff differ
diff --git a/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.woff2 b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.woff2
new file mode 100644
index 0000000..da49c62
Binary files /dev/null and b/themes/exectos/static/fonts/source-sans-pro-v9-latin-regular.woff2 differ
diff --git a/themes/exectos/static/images/exectos_logo.png b/themes/exectos/static/images/exectos_logo.png
new file mode 100644
index 0000000..12eed44
Binary files /dev/null and b/themes/exectos/static/images/exectos_logo.png differ