diff --git a/src/index.html b/src/index.html
index 7716bea..0efe38a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,6 +1,6 @@
 <extends src="./lib/html/base.html">
   <block name="content">
-    <h1 class="title head-line has-text-weight-normal is-family-monospace">
+    <h1 class="title has-text-weight-normal is-family-monospace">
       $&nbsp;<span id="typed-welcome"></span>
     </h1>
 
diff --git a/src/lib/scss/_custom-bulma.scss b/src/lib/scss/_custom-bulma.scss
index 1d5b590..fcfd52e 100644
--- a/src/lib/scss/_custom-bulma.scss
+++ b/src/lib/scss/_custom-bulma.scss
@@ -21,6 +21,9 @@ $link: $green;
 $link-hover: color.scale($green, $lightness: +10%);
 $link-active: color.scale($green, $lightness: +10%);
 $link-focus: color.scale($green, $lightness: +10%);
+$input-color: $grey-darker;
+$input-placeholder-color: $grey-darker; // Some opacity is applied to this
+$input-focus-color: $black;
 
 $weight-normal: 400;
 
@@ -31,6 +34,7 @@ $family-monospace: Hack, $family-monospace;
 
 $text: $grey-light;
 $text-strong: $primary;
+$label-color: $text;
 
 $content-heading-color: $text;
 $hr-background-color: $grey-light;
diff --git a/src/mail.html b/src/mail.html
index 06de32f..29be022 100644
--- a/src/mail.html
+++ b/src/mail.html
@@ -1,15 +1,15 @@
 <extends src="./lib/html/base.html">
   <block name="content">
-    <h1 class="head-line">Contact Me</h1>
+    <h1 class="title has-text-weight-normal">Contact Me</h1>
 
-    <div class="row">
-      <div class="col-md-6">
+    <div class="columns">
+      <div class="column">
         <form id="sendmail" role="form" action="mail.html" method="post">
-          <div class="form-group">
-            <label div="control-label" for="mail">Email address</label>
+          <div class="field">
+            <label class="label" for="mail">Email address</label>
             <input
               id="mail"
-              class="form-control"
+              class="input"
               type="email"
               placeholder="Your address"
               name="mail"
@@ -17,11 +17,11 @@
             />
           </div>
 
-          <div class="form-group">
-            <label div="control-label" for="subject">Subject</label>
+          <div class="field">
+            <label class="label" for="subject">Subject</label>
             <input
               id="subject"
-              class="form-control"
+              class="input"
               type="text"
               placeholder="E.g. There's a typo on your home page!"
               name="subject"
@@ -30,11 +30,11 @@
             />
           </div>
 
-          <div class="form-group">
-            <label div="control-label" for="message">Message</label>
+          <div class="field">
+            <label class="label" for="message">Message</label>
             <textarea
               id="message"
-              class="form-control"
+              class="textarea"
               type="text"
               rows="6"
               name="message"
@@ -43,13 +43,15 @@
             ></textarea>
           </div>
 
-          <button class="btn btn-primary" type="submit" form="sendmail">
-            Send
-          </button>
+          <div class="field">
+            <div class="control">
+              <button class="button is-link">Send</button>
+            </div>
+          </div>
         </form>
       </div>
 
-      <div class="col-md-6">
+      <div class="column content">
         <markdown>
           Any messages you enter here are directly forwarded to me. I aim to
           respond within a day.