diff --git a/input.scss b/input.scss
index d74857d..bf181dd 100644
--- a/input.scss
+++ b/input.scss
@@ -28,19 +28,23 @@ input[type="datetime-local"] {
     background: #fff;
     width: 100%;
     min-width: 70px;
-    font-size: 1.0em;
-    height: 2em;
-    line-height: 2em;
-    padding: 0 10px 0 10px;
+    font-size: 1.0rem;
+    height: 2rem;
+    padding: 10px;
     border: solid 1px #dcdcdc;
     transition: background 0.3s, border 0.3s;
     box-shadow: inset 1px 1px 4px -2px #c5c5c5;
+
+    &:focus {
+        border-color:#0c69d6;
+    }
 }
 
 input[type="file"] {
     border: solid 1px #dcdcdc;
     width: 100%;
     color: #454545;
+    padding: 10px;
 }
 
 input[placeholder], textarea {
@@ -82,10 +86,6 @@ input[type="range"] {
     cursor: pointer;
 }
 
-input[type="password"]:focus,
-input[type="text"]:focus {
-}
-
 .input {
     width: 100%;
     min-width: 120px;
@@ -97,15 +97,14 @@ input[type="text"]:focus {
         @include box-sizing(border-box);
         display: inline-block;
         background: #fff;
-        height: 2em;
-        font-size: 1em;
-        line-height: 2em;
-        padding: 0;
+        height: 2rem;
+        font-size: 1rem;
         min-width: 40px;
         border-left: solid 1px #dcdcdc;
         border-top: solid 1px #dcdcdc;
         border-bottom: solid 1px #dcdcdc;
         border-right: none;
+        padding: 0;
 
         position: relative;
         vertical-align: middle;
diff --git a/styles.css b/styles.css
index 6cfc8d1..9ea8029 100644
--- a/styles.css
+++ b/styles.css
@@ -260,8 +260,8 @@ article {
  * Copyright (c) 2016 Daniel Eden
  */
 .animated {
-  -webkit-animation-duration: 0.2s;
-  animation-duration: 0.2s;
+  -webkit-animation-duration: 0.5s;
+  animation-duration: 0.5s;
   -webkit-animation-fill-mode: both;
   animation-fill-mode: both; }
 
@@ -3725,18 +3725,29 @@ input[type="datetime-local"] {
   background: #fff;
   width: 100%;
   min-width: 70px;
-  font-size: 1.0em;
-  height: 2em;
-  line-height: 2em;
-  padding: 0 10px 0 10px;
+  font-size: 1.0rem;
+  height: 2rem;
+  padding: 10px;
   border: solid 1px #dcdcdc;
   transition: background 0.3s, border 0.3s;
   box-shadow: inset 1px 1px 4px -2px #c5c5c5; }
+  .textarea:focus,
+  textarea:focus,
+  select:focus,
+  input[type="password"]:focus,
+  input[type="text"]:focus,
+  input[type="datetime"]:focus,
+  input[type="email"]:focus,
+  input[type="date"]:focus,
+  input[type="number"]:focus,
+  input[type="datetime-local"]:focus {
+    border-color: #0c69d6; }
 
 input[type="file"] {
   border: solid 1px #dcdcdc;
   width: 100%;
-  color: #454545; }
+  color: #454545;
+  padding: 10px; }
 
 input[placeholder], textarea {
   font-family: 'FontAwesome', serif; }
@@ -3784,15 +3795,14 @@ input[type="range"] {
     box-sizing: border-box;
     display: inline-block;
     background: #fff;
-    height: 2em;
-    font-size: 1em;
-    line-height: 2em;
-    padding: 0;
+    height: 2rem;
+    font-size: 1rem;
     min-width: 40px;
     border-left: solid 1px #dcdcdc;
     border-top: solid 1px #dcdcdc;
     border-bottom: solid 1px #dcdcdc;
     border-right: none;
+    padding: 0;
     position: relative;
     vertical-align: middle;
     flex-grow: 0;