diff --git a/server/core/static/styles/main.scss b/server/core/static/styles/main.scss
index df906570..9cf21a94 100644
--- a/server/core/static/styles/main.scss
+++ b/server/core/static/styles/main.scss
@@ -19,8 +19,10 @@ $red-shadow: darken($red, 20%);
 $blue: #EDF7FA;
 $blue-shadow: #B6CCD4;
 
+$brand: #17a887;
+
 $text-color: $grey-9;
-$font-family: 'Arimo', Arial, sans-serif;
+$font-family: 'Montserrat', Arial, sans-serif;
 $base-font-size: 15px;
 
 $space: 10px;
@@ -85,7 +87,7 @@ input[type=text], input[type=password], select {
   border-radius: 2px;
   box-sizing: border-box;
   background-color: $light-white;
-  color: $white;
+  color: $grey-9;
 }
 
 .mt-1 {
@@ -94,4 +96,11 @@ input[type=text], input[type=password], select {
 
 .mb-1 {
   margin-bottom: $space;
+}
+
+.logo {
+  color: $brand;
+  font-size: 36px;
+  font-weight: 800;
+  font-family: Montserrat, Arial, sans-serif;
 }
\ No newline at end of file
diff --git a/server/core/templates/base.html b/server/core/templates/base.html
index 4e816015..b27fb8cc 100644
--- a/server/core/templates/base.html
+++ b/server/core/templates/base.html
@@ -12,7 +12,8 @@
     <meta name="author" content="skillBox">
 
     <link href='https://fonts.googleapis.com/css?family=Material+Icons' rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/css?family=Arimo" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,800" rel="stylesheet">
+    <link href="https://use.typekit.net/tck7ptw.css" rel="stylesheet">
 
     {% compress css %}
         <link href="{% static "styles/main.scss" %}" rel="stylesheet" type="text/x-scss"
diff --git a/server/core/templates/registration/login.html b/server/core/templates/registration/login.html
index 932e6aec..09baa1c9 100644
--- a/server/core/templates/registration/login.html
+++ b/server/core/templates/registration/login.html
@@ -1,10 +1,8 @@
 {% extends "base.html" %}
 
-{% block body_class %}dark-bg{% endblock %}
-
 {% block body %}
 
-    <h1>skillBox</h1>
+    <h1 class="logo">skillbox</h1>
 
     {% if next %}
         <div class="h4">Melde dich jetzt an.</div>
@@ -28,7 +26,7 @@
             {{ form.password }}
         </div>
 
-        <button class="btn btn-orange mt-1" type="submit" name="action">Anmelden</button>
+        <button class="btn mt-1" type="submit" name="action">Anmelden</button>
         <input type="hidden" name="next" value="{{ next }}"/>
     </form>