diff --git a/simple.css b/simple.css
index dcdd4df..b00ff7f 100644
--- a/simple.css
+++ b/simple.css
@@ -185,15 +185,11 @@ input[type="submit"],
 input[type="reset"],
 input[type="button"],
 label[type="button"] {
-  border: none;
-  border-radius: var(--standard-border-radius);
+  border: 1px solid var(--accent);
   background-color: var(--accent);
-  font-size: 1rem;
   color: var(--bg);
-  padding: 0.7rem 0.9rem;
-  margin: 0.5rem 0;
+  padding: 0.5rem 0.9rem;
   text-decoration: none;
-  font-family: inherit;
   line-height: normal;
 }
 
@@ -204,7 +200,8 @@ select:disabled,
 button[disabled] {
   cursor: not-allowed;
   background-color: var(--disabled);
-  color: var(--text-light)
+  border-color: var(--disabled);
+  color: var(--text-light);
 }
 
 input[type="range"] {
@@ -409,19 +406,25 @@ table caption {
 /* Format forms */
 textarea,
 select,
-input {
+input,
+button,
+.button {
   font-size: inherit;
   font-family: inherit;
   padding: 0.5rem;
   margin-bottom: 0.5rem;
-  color: var(--text);
-  background-color: var(--bg);
-  border: 1px solid var(--border);
   border-radius: var(--standard-border-radius);
   box-shadow: none;
   max-width: 100%;
   display: inline-block;
 }
+textarea,
+select,
+input {
+  color: var(--text);
+  background-color: var(--bg);
+  border: 1px solid var(--border);
+}
 label {
   display: block;
 }
@@ -675,4 +678,4 @@ sub {
   border-radius: 5px;
   padding: 1.5rem;
   margin: 2rem 0;
-}
\ No newline at end of file
+}