diff --git a/cirru/classes.cirru b/cirru/classes.cirru
index cac47d6..a651f64 100644
--- a/cirru/classes.cirru
+++ b/cirru/classes.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -59,8 +59,6 @@ html
           = Collections
       li
         a
-          :class
-            = selected
           :href
             = concurrency.html
           = Concurrency
diff --git a/cirru/collections.cirru b/cirru/collections.cirru
index 692cb78..da5cc26 100644
--- a/cirru/collections.cirru
+++ b/cirru/collections.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -78,26 +78,26 @@ html
             = spring-framework.html
           = Spring Framework
 
-      .section
-        .title BASICS
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/01.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/01.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/02.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/02.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/03.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/03.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/04.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/04.kt)
-        .case (.name "Collections") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/05.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/05.kt
-        .case (.name "For") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/06.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/06.kt)
-        .case (.name "For") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/07.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/07.kt)
+    .section
+      .title BASICS
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/01.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/01.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/02.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/02.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/03.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/03.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/04.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/04.kt)
+      .case (.name "Collections") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/05.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/05.kt
+      .case (.name "For") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/06.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/06.kt)
+      .case (.name "For") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/collections/07.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/collections/07.kt)
diff --git a/cirru/concurrency.cirru b/cirru/concurrency.cirru
index 6496f1b..9dbca17 100644
--- a/cirru/concurrency.cirru
+++ b/cirru/concurrency.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -78,14 +78,14 @@ html
             = spring-framework.html
           = Spring Framework
 
-      .section  
-        .title BASICS
-        .case (.name "I") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/01.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/01.kt)
-        .case (.name "II") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/02.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/02.kt)
-        .case (.name "III") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/03.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/03.kt)
\ No newline at end of file
+    .section
+      .title BASICS
+      .case (.name "I") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/01.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/01.kt)
+      .case (.name "II") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/02.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/02.kt)
+      .case (.name "III") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/concurrency/03.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/concurrency/03.kt)
\ No newline at end of file
diff --git a/cirru/delegated-properties.cirru b/cirru/delegated-properties.cirru
index 0a50dfb..f04a96e 100644
--- a/cirru/delegated-properties.cirru
+++ b/cirru/delegated-properties.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -62,7 +62,7 @@ html
           = Concurrency
       li
         a
-          :class
+         :class
             = selected
           :href
             = delegated-properties.html
@@ -78,14 +78,14 @@ html
             = spring-framework.html
           = Spring Framework
 
-      .section  
-        .title BASICS
-        .case (.name "Lazy evaluation") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/lazy.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/lazy.kt)
-        .case (.name "Map to object") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/map.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/map.kt)
-        .case (.name "Observable") $ .pair
-          .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/observable.java)
-          .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/observable.kt)
\ No newline at end of file
+    .section
+      .title BASICS
+      .case (.name "Lazy evaluation") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/lazy.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/lazy.kt)
+      .case (.name "Map to object") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/map.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/map.kt)
+      .case (.name "Observable") $ .pair
+        .card (.lang Java) $ pre.code $ code (@insert ../code/java/delegated-properties/observable.java)
+        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/delegated-properties/observable.kt)
\ No newline at end of file
diff --git a/cirru/dsl.cirru b/cirru/dsl.cirru
index 878ee80..aa32527 100644
--- a/cirru/dsl.cirru
+++ b/cirru/dsl.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -67,7 +67,7 @@ html
           = Delegated properties
       li
         a
-         :class
+          :class
             = selected
           :href
             = dsl.html
@@ -86,13 +86,13 @@ html
       .case (.name "II") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/02.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/02.kt)
-      .case (.name "II") $ .pair
+      .case (.name "III") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/03.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/03.kt)
-      .case (.name "II") $ .pair
+      .case (.name "IV") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/04.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/04.kt)
-      .case (.name "II") $ .pair
+      .case (.name "V") $ .pair
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/dsl/05.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/dsl/05.kt)
 
diff --git a/cirru/functions.cirru b/cirru/functions.cirru
index 5187434..1ba94f4 100644
--- a/cirru/functions.cirru
+++ b/cirru/functions.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -60,13 +60,13 @@ html
       li
         a
           :href
-            = delegated-properties.html
-          = Delegated properties
+            = concurrency.html
+          = Concurrency
       li
         a
           :href
-            = concurrency.html
-          = Concurrency
+            = delegated-properties.html
+          = Delegated properties
       li
         a
           :href
diff --git a/cirru/index.cirru b/cirru/index.cirru
index 085dc31..3c18375 100755
--- a/cirru/index.cirru
+++ b/cirru/index.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -42,6 +42,11 @@ html
           :href
             = functions.html
           = Functions
+      li
+        a
+          :href
+            = scoping-functions.html
+          = Scoping functions
       li
         a
           :href
@@ -62,11 +67,6 @@ html
           :href
             = delegated-properties.html
           = Delegated properties
-      li
-        a
-          :href
-            = scoping-functions.html
-          = Scoping functions
       li
         a
           :href
@@ -112,24 +112,20 @@ html
         .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/ternary-operator.java)
         .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/ternary-operator.kt)
 
-    .section
-      .title BASICS
-      .case (.name "Bits Operations") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/bits-operations.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/bits-operations.kt)
-      .case (.name "Is As In") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/operations.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/operations.kt)
-      .case (.name "Smart Cast") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/cast.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/cast.kt)
-      .case (.name "Switch / When") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/switch.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/when.kt)
-      .case (.name "Default parameters") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/default-parameters.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/default-parameters.kt)
-      .case (.name "Reading a file") $ .pair
-        .card (.lang Java) $ pre.code $ code (@insert ../code/java/basic/read-file.java)
-        .card (.lang Kotlin) $ pre.code $ code (@insert ../code/kotlin/basic/read-file.kt)
+    footer
+      div
+        :class
+          = center
+        p
+          = Created by:
+          a
+            :href
+              = https://www.driver733.com
+            = " @driver733"
+        p
+          = Based on:
+          a
+            :href
+              = https://github.com/fabiomsr/from-java-to-kotlin
+            = " fabiomsr/from-java-to-kotlin"
 
diff --git a/cirru/scoping-functions.cirru b/cirru/scoping-functions.cirru
index 64cbf0b..88b0f4e 100644
--- a/cirru/scoping-functions.cirru
+++ b/cirru/scoping-functions.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
@@ -60,13 +60,13 @@ html
       li
         a
           :href
-            = delegated-properties.html
-          = Delegated properties
+            = concurrency.html
+          = Concurrency
       li
         a
           :href
-            = concurrency.html
-          = Concurrency
+            = delegated-properties.html
+          = Delegated properties
       li
         a
           :href
diff --git a/cirru/spring-framework.cirru b/cirru/spring-framework.cirru
index fc4ee03..4ed645c 100644
--- a/cirru/spring-framework.cirru
+++ b/cirru/spring-framework.cirru
@@ -5,14 +5,14 @@ html
     title "Kotlin vs Java"
     meta (:charset utf-8)
     link (:rel stylesheet) (:href css/style.css)
-    link (:rel stylesheet) (:href css/highlightjs-github.css)
+    link (:rel stylesheet) (:href css/highlightjs-night-owl.css)
     script (:src js/highlight.9.4.0.js)
     script "hljs.initHighlightingOnLoad();"
 
   body
     a
       :href
-        = https://github.com/fabiomsr/from-java-to-kotlin
+        = https://github.com/driver733/kotlin-vs-java
       :class
         = github-corner
       :aria-label
diff --git a/css/highlightjs-github.css b/css/highlightjs-github.css
deleted file mode 100755
index c0c2fac..0000000
--- a/css/highlightjs-github.css
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  color: #333;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #998;
-  font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-subst {
-  color: #0000FF;
-
-}
-
-.hljs-number,
-.hljs-literal,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-tag .hljs-attr {
-  color: #FF0080;
-}
-
-.hljs-string,
-.hljs-doctag {
-  color: #FF845D;
-}
-
-.hljs-title,
-.hljs-section,
-.hljs-selector-id {
-  color: #900;
-  font-weight: normal;
-}
-
-.hljs-subst {
-  font-weight: normal;
-}
-
-.hljs-type,
-.hljs-class .hljs-title {
-  color: #0D90DE;
-  font-weight: normal;;
-}
-
-.hljs-tag,
-.hljs-name,
-.hljs-attribute {
-  color: #000080;
-  font-weight: normal;
-}
-
-.hljs-regexp,
-.hljs-link {
-  color: #009926;
-}
-
-.hljs-symbol,
-.hljs-bullet {
-  color: #990073;
-}
-
-.hljs-built_in,
-.hljs-builtin-name {
-  color: #0D90DE;
-}
-
-.hljs-meta {
-  color: #999;
-  font-weight: bold;
-}
-
-.hljs-deletion {
-  background: #fdd;
-}
-
-.hljs-addition {
-  background: #dfd;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
diff --git a/css/highlightjs-night-owl.css b/css/highlightjs-night-owl.css
new file mode 100644
index 0000000..45f45cd
--- /dev/null
+++ b/css/highlightjs-night-owl.css
@@ -0,0 +1,182 @@
+/*
+
+Night Owl for highlight.js (c) Carl Baxter <carl@cbax.tech>
+
+An adaptation of Sarah Drasner's Night Owl VS Code Theme 
+https://github.com/sdras/night-owl-vscode-theme 
+
+Copyright (c) 2018 Sarah Drasner
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #011627;
+  color: #d6deeb;
+}
+
+/* General Purpose */
+.hljs-keyword {
+  color: #c792ea;
+  font-style: italic;
+}
+.hljs-built_in {
+  color: #addb67;
+  font-style: italic;
+}
+.hljs-type {
+  color: #82aaff;
+}
+.hljs-literal {
+  color: #ff5874;
+}
+.hljs-number {
+  color: #F78C6C;
+}
+.hljs-regexp {
+  color: #5ca7e4;
+}
+.hljs-string {
+  color: #ecc48d;
+}
+.hljs-subst {
+  color: #d3423e;
+}
+.hljs-symbol {
+  color: #82aaff;
+}
+.hljs-class {
+  color: #ffcb8b;
+}
+.hljs-function {
+  color: #82AAFF;
+}
+.hljs-title {
+  color: #DCDCAA;
+  font-style: italic;
+}
+.hljs-params {
+  color: #7fdbca;
+}
+
+/* Meta */
+.hljs-comment {
+  color: #637777;
+  font-style: italic;
+}
+.hljs-doctag {
+  color: #7fdbca;
+}
+.hljs-meta {
+  color: #82aaff;
+}
+.hljs-meta-keyword {
+  color: #82aaff;
+}
+.hljs-meta-string {
+  color: #ecc48d;
+}
+
+/* Tags, attributes, config */
+.hljs-section {
+  color: #82b1ff;
+}
+.hljs-tag,
+.hljs-name,
+.hljs-builtin-name {
+  color: #7fdbca;
+}
+.hljs-attr {
+  color: #7fdbca;
+}
+.hljs-attribute {
+  color: #80cbc4;
+}
+.hljs-variable {
+  color: #addb67;
+}
+
+/* Markup */
+.hljs-bullet {
+  color: #d9f5dd;
+}
+.hljs-code {
+  color: #80CBC4;
+}
+.hljs-emphasis {
+  color: #c792ea;
+  font-style: italic;
+}
+.hljs-strong {
+  color: #addb67;
+  font-weight: bold;
+}
+.hljs-formula {
+  color: #c792ea;
+}
+.hljs-link {
+  color: #ff869a;
+}
+.hljs-quote {
+  color: #697098;
+  font-style: italic;
+}
+
+/* CSS */
+.hljs-selector-tag {
+  color: #ff6363;
+}
+
+.hljs-selector-id {
+  color: #fad430;
+}
+
+.hljs-selector-class {
+  color: #addb67;
+  font-style: italic;
+}
+
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #c792ea;
+  font-style: italic;
+}
+
+/* Templates */
+.hljs-template-tag {
+  color: #c792ea;
+}
+.hljs-template-variable {
+  color: #addb67;
+}
+
+/* diff */
+.hljs-addition {
+  color: #addb67ff;
+  font-style: italic;
+}
+
+.hljs-deletion {
+  color: #EF535090;
+  font-style: italic;
+}
diff --git a/css/style.css b/css/style.css
index 85b9b26..e5b4304 100755
--- a/css/style.css
+++ b/css/style.css
@@ -8,7 +8,7 @@ body * {
 }
 
 .section {
-    background-color: #f4f4f4;
+    background-color: #232323;
     padding: 4em 3em;
 }
 
@@ -16,9 +16,13 @@ body * {
     background-color: white;
 }
 
+.section:nth-child(2n) .code {
+    background-color: #f4f4f4;
+}
+
 .title {
     font-size: 2.7em;
-    color: #888;
+    color: white;
     font-weight: 100;
     letter-spacing: 0.2em;
     text-align: center;
@@ -28,7 +32,7 @@ body * {
 
 .name {
     font-size: 1.8em;
-    color: #444;
+    color: white;
     font-weight: 300;
     text-align: center;
     margin: 60px;
@@ -54,7 +58,7 @@ body * {
 
 .lang {
     font-size: 1.3em;
-    color: #666;
+    color: white;
     padding-bottom: 0;
     font-weight: 200;
     letter-spacing: 0.07em;
@@ -62,14 +66,12 @@ body * {
 
 .code {
     font-size: 1.15em;
-    background-color: white;
     margin: 0.4em 0 0 0;
     padding: 0.4em;
     line-height: 1.3em;
 }
-.section:nth-child(2n) .code {
-    background-color: #f4f4f4;
-}
+
+
 
 #fork-me {
     position: absolute;
@@ -113,3 +115,24 @@ li a:hover {
 li a.selected {
     background-color: #4e4e4e;
 }
+
+.center {
+    margin: auto;
+    width: 50%;
+    /*border: 3px solid green;*/
+    text-align: center;
+    padding: 20px;
+}
+
+footer {
+    background-color: #414141;
+}
+
+footer a {
+    color: white;
+    text-decoration: none;
+}
+
+footer p {
+    color: darkgray;
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 23ca371..eff4223 100755
--- a/package.json
+++ b/package.json
@@ -18,14 +18,14 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/fabiomsr/from-java-to-kotlin.git"
+    "url": "https://github.com/driver733/kotlin-vs-java.git"
   },
   "keywords": [
     "java",
     "kotlin"
   ],
   "bugs": {
-    "url": "https://github.com/fabiomsr/from-java-to-kotlin/issues"
+    "url": "https://github.com/driver733/kotlin-vs-java/issues"
   },
-  "homepage": "https://github.com/fabiomsr/from-java-to-kotlin"
+  "homepage": "https://github.com/driver733/kotlin-vs-java"
 }