diff --git a/source/css/include/article.styl b/include/style/article.styl
similarity index 100%
rename from source/css/include/article.styl
rename to include/style/article.styl
diff --git a/source/css/include/base.styl b/include/style/base.styl
similarity index 100%
rename from source/css/include/base.styl
rename to include/style/base.styl
diff --git a/source/css/include/button.styl b/include/style/button.styl
similarity index 100%
rename from source/css/include/button.styl
rename to include/style/button.styl
diff --git a/source/css/include/card.styl b/include/style/card.styl
similarity index 100%
rename from source/css/include/card.styl
rename to include/style/card.styl
diff --git a/source/css/include/codeblock.styl b/include/style/codeblock.styl
similarity index 100%
rename from source/css/include/codeblock.styl
rename to include/style/codeblock.styl
diff --git a/source/css/include/donate.styl b/include/style/donate.styl
similarity index 100%
rename from source/css/include/donate.styl
rename to include/style/donate.styl
diff --git a/source/css/include/footer.styl b/include/style/footer.styl
similarity index 100%
rename from source/css/include/footer.styl
rename to include/style/footer.styl
diff --git a/source/css/include/helper.styl b/include/style/helper.styl
similarity index 100%
rename from source/css/include/helper.styl
rename to include/style/helper.styl
diff --git a/source/css/include/navbar.styl b/include/style/navbar.styl
similarity index 100%
rename from source/css/include/navbar.styl
rename to include/style/navbar.styl
diff --git a/source/css/include/pagination.styl b/include/style/pagination.styl
similarity index 100%
rename from source/css/include/pagination.styl
rename to include/style/pagination.styl
diff --git a/source/css/include/plugin.styl b/include/style/plugin.styl
similarity index 100%
rename from source/css/include/plugin.styl
rename to include/style/plugin.styl
diff --git a/source/css/include/responsive.styl b/include/style/responsive.styl
similarity index 100%
rename from source/css/include/responsive.styl
rename to include/style/responsive.styl
diff --git a/source/css/include/search.styl b/include/style/search.styl
similarity index 100%
rename from source/css/include/search.styl
rename to include/style/search.styl
diff --git a/source/css/include/timeline.styl b/include/style/timeline.styl
similarity index 100%
rename from source/css/include/timeline.styl
rename to include/style/timeline.styl
diff --git a/source/css/cyberpunk.styl b/source/css/cyberpunk.styl
index 829eb0f..8861b27 100644
--- a/source/css/cyberpunk.styl
+++ b/source/css/cyberpunk.styl
@@ -16,9 +16,13 @@ $black-bis ?= #050a0e
 // derived colors
 $scheme-main ?= $black
 $primary ?= $yellow
+$link ?= $blue
+$link-hover ?= $primary
 $text ?= $white
 $text-strong ?= $yellow
 $body-background-color ?= $scheme-main
+$input-color ?= $text
+$input-placeholder-color ?= rgba($input-color, .8)
 $footer-color ?= $black
 $footer-background-color ?= $yellow
 $navbar-background-color ?= $yellow
@@ -47,20 +51,20 @@ $searchbox-bg-result-item-hover ?= $black
 
 @import 'style'
 
-cut-corner-left(size)
+cut-corner(size)
     clip-path: unquote('polygon(' + size + ' 0, 100% 0, 100% calc(100% - ' + size + '), calc(100% - ' + size + ') 100%, 0 100%, 0 ' + size + ')')
 
-cut-corner-right(size)
+cut-corner-reverse(size)
     clip-path: unquote('polygon(0 0, calc(100% - ' + size + ') 0, 100% ' + size + ', 100% 100%, ' + size + ' 100%, 0 calc(100% - ' + size + '), 0 0)')
 
-cut-corner-inner(size)
-    clip-path: unquote('polygon(1px 1px, calc(100% - ' + size + ' - 1px) 1px, calc(100% - 1px) calc(1px + ' + size + '), calc(100% - 1px) calc(100% - 1px), calc(1px + ' + size + ') calc(100% - 1px), 1px calc(100% - ' + size + ' - 1px), 1px 1px)')
+cut-corner-top-right(size)
+    clip-path: unquote('polygon(0 0, calc(100% - ' + size + ') 0, 100% ' + size + ', 100% 100%, 0 100%)')
 
-cut-corner-inner-top-right(size)
-    clip-path: unquote('polygon(1px 1px, calc(100% - ' + size + ' - 1px) 1px, calc(100% - 1px) ' + size + ', calc(100% - 1px) calc(100% + 1px), 1px calc(100% + 1px))')
+cut-corner-bottom-left(size)
+    clip-path: unquote('polygon(0 0, 100% 0, 100% 100%, ' + size + ' 100%, 0 calc(100% - ' + size + '))')
 
-cut-corner-inner-bottom-left(size)
-    clip-path: unquote('polygon(1px -1px, calc(100% - 1px) -1px, calc(100% - 1px) calc(100% - 1px), calc(1px + ' + size + ') calc(100% - 1px), 1px calc(100% - 1px - ' + size + '))')
+cut-corner-bottom-right(size)
+    clip-path: unquote('polygon(0 0, 100% 0, 100% calc(100% - ' + size + '), calc(100% - ' + size + ') 100%, 0 100%)')
 
 body
     counter-reset: card
@@ -78,12 +82,12 @@ body
 
     &:before
         content: ''
-        top: 0
-        left: 0
-        right: 0
-        bottom: 0
+        top: -1.2px
+        left: -1.2px
+        right: -1.2px
+        bottom: -1.2px
         background-color: $blue
-        cut-corner-right(16px)
+        cut-corner-reverse(16px)
 
     &:after
         content: 'R' counter(card)
@@ -95,25 +99,30 @@ body
         background: $body-background-color
 
     .card-image, .card-content
-        cut-corner-inner-top-right(16px)
+        cut-corner-top-right(16px)
 
     .card-content
         background-color: $body-background-color
-        cut-corner-inner(16px)
+        cut-corner-reverse(16px)
 
     .card-image + .card-content
-        cut-corner-inner-bottom-left(16px)
+        cut-corner-bottom-left(16px)
 
 .button
     border: none
     outline: none
-    cut-corner-left(8px)
+    cut-corner(8px)
 
     &.is-primary
         border-radius: 0 !important
 
+.field.has-addons
+    .control:not(:first-child)
+        .button
+            cut-corner-bottom-right(8px)
+
 .menu-list a
-    cut-corner-left(8px)
+    cut-corner(8px)
 
 .tags.has-addons
     .tag:first-child
@@ -123,9 +132,11 @@ body
         background: $blue !important
 
 .pagination-previous, .pagination-next, .pagination-link
-    cut-corner-left(8px)
+    cut-corner(8px)
+
     &:hover
         background-color: $blue
+
         &, a
             color: $black
 
@@ -148,8 +159,7 @@ body
                 color: $navbar-background-color
                 background-color: $body-background-color !important
 
-article.article,
-article.media
+article.article, article.media
     .title a
         background-image: linear-gradient(transparent calc(100% - 2px), $text-strong 2px)
         background-repeat: no-repeat
@@ -205,4 +215,4 @@ article.article
     color: $black
     background: $blue
     margin-top: 45px
-    cut-corner-left(8px)
+    cut-corner(8px)
diff --git a/source/css/style.styl b/source/css/style.styl
index 9fbc783..ad3a025 100644
--- a/source/css/style.styl
+++ b/source/css/style.styl
@@ -1,17 +1,17 @@
 // Base CSS framework
-@import 'include/base'
+@import '../../include/style/base'
 // Helper classes & mixins
-@import 'include/helper'
+@import '../../include/style/helper'
 // Icarus components
-@import 'include/button'
-@import 'include/card'
-@import 'include/article'
-@import 'include/navbar'
-@import 'include/footer'
-@import 'include/pagination'
-@import 'include/timeline'
-@import 'include/search'
-@import 'include/codeblock'
-@import 'include/donate'
-@import 'include/plugin'
-@import 'include/responsive'
+@import '../../include/style/button'
+@import '../../include/style/card'
+@import '../../include/style/article'
+@import '../../include/style/navbar'
+@import '../../include/style/footer'
+@import '../../include/style/pagination'
+@import '../../include/style/timeline'
+@import '../../include/style/search'
+@import '../../include/style/codeblock'
+@import '../../include/style/donate'
+@import '../../include/style/plugin'
+@import '../../include/style/responsive'