diff --git a/assets/scss/global/_settings.scss b/assets/scss/global/_settings.scss
index b9a275062..bcdee507e 100755
--- a/assets/scss/global/_settings.scss
+++ b/assets/scss/global/_settings.scss
@@ -44,8 +44,8 @@
 // 1. Global
 // ---------
 
-$global-width: rem-calc(1200);
 $global-font-size: 100%;
+$global-width: rem-calc(1200);
 $global-lineheight: 1.5;
 $primary-color: #2199e8;
 $secondary-color: #777;
@@ -63,12 +63,10 @@ $body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
 $body-antialiased: true;
 $global-margin: 1rem;
 $global-padding: 1rem;
-$global-margin: 1rem;
 $global-weight-normal: normal;
 $global-weight-bold: bold;
 $global-radius: 0;
 $global-text-direction: ltr;
-$rem-base: 16px;
 
 // 2. Breakpoints
 // --------------
@@ -87,7 +85,10 @@ $breakpoint-classes: (small medium large);
 
 $grid-row-width: $global-width;
 $grid-column-count: 12;
-$grid-column-gutter: 30px;
+$grid-column-responsive-gutter: (
+  small: 20px,
+  medium: 30px,
+);
 $grid-column-align-edge: true;
 $block-grid-max: 8;
 
@@ -199,6 +200,7 @@ $accordion-content-padding: 1rem;
 // -----------------
 
 $accordionmenu-arrows: true;
+$accordionmenu-arrow-color: $primary-color;
 
 // 9. Badge
 // --------
@@ -225,7 +227,7 @@ $breadcrumbs-item-slash: true;
 // ----------
 
 $button-padding: 0.85em 1em;
-$button-margin: 0 $global-margin $global-margin 0;
+$button-margin: 0 0 $global-margin 0;
 $button-fill: solid;
 $button-background: $primary-color;
 $button-background-hover: scale-color($button-background, $lightness: -15%);
@@ -277,6 +279,7 @@ $closebutton-color-hover: $black;
 
 $drilldown-transition: transform 0.15s linear;
 $drilldown-arrows: true;
+$drilldown-arrow-color: $primary-color;
 $drilldown-background: $white;
 
 // 16. Dropdown
@@ -297,6 +300,7 @@ $dropdown-sizes: (
 // -----------------
 
 $dropdownmenu-arrows: true;
+$dropdownmenu-arrow-color: $anchor-color;
 $dropdownmenu-min-width: 200px;
 $dropdownmenu-background: $white;
 $dropdownmenu-border: 1px solid $medium-gray;
@@ -304,7 +308,6 @@ $dropdownmenu-border: 1px solid $medium-gray;
 // 18. Flex Video
 // --------------
 
-$flexvideo-padding-top: rem-calc(25);
 $flexvideo-margin-bottom: rem-calc(16);
 $flexvideo-ratio: 4 by 3;
 $flexvideo-ratio-widescreen: 16 by 9;
@@ -328,7 +331,7 @@ $form-label-color: $black;
 $form-label-font-size: rem-calc(14);
 $form-label-font-weight: $global-weight-normal;
 $form-label-line-height: 1.8;
-$select-background: #fafafa;
+$select-background: $white;
 $select-triangle-color: #333;
 $select-radius: $global-radius;
 $input-color: $black;
@@ -539,5 +542,5 @@ $tooltip-radius: $global-radius;
 
 $topbar-padding: 0;
 $topbar-background: #121212;
-$topbar-link-color: #fff;
+$topbar-link-color: #ffffff;
 $topbar-input-width: 200px;
diff --git a/bower.json b/bower.json
index c9e33b156..0821bb7ce 100755
--- a/bower.json
+++ b/bower.json
@@ -6,7 +6,7 @@
   ],
   "ignore": [],
   "dependencies": {
-    "foundation-sites": "~6.0.5",
+    "foundation-sites": "~6.1.0",
     "motion-ui" : "~1.1.0",
     "fontawesome": "~4.4.0"
   }
diff --git a/gulpfile.js b/gulpfile.js
index eb8d56231..70908d604 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -59,9 +59,6 @@ var PATHS = {
     // Motion UI
     'assets/components/motion-ui/motion-ui.js',
 
-    // What-input
-    'assets/components/what-input/what-input.js',
-
     // Include your own custom scripts (located in the custom folder)
     'assets/javascript/custom/*.js'
   ],
diff --git a/library/cleanup.php b/library/cleanup.php
index e4f869481..f7d0354b1 100755
--- a/library/cleanup.php
+++ b/library/cleanup.php
@@ -244,7 +244,7 @@ public function img_caption_shortcode( $output, $attr, $content ) {
 	  }
 	}
 
-	$Foundationpress_img_rebuilder = new Foundationpress_img_rebuilder;
+	$foundationpress_img_rebuilder = new Foundationpress_img_rebuilder;
 
 endif;
 
diff --git a/library/protocol-relative-theme-assets.php b/library/protocol-relative-theme-assets.php
index bfdee08bc..7f5415127 100755
--- a/library/protocol-relative-theme-assets.php
+++ b/library/protocol-relative-theme-assets.php
@@ -87,7 +87,7 @@ public function stylesheet_directory_uri( $stylesheet_dir_uri, $stylesheet, $the
 		}
 	}
 
-	$Foundationpress_protocol_relative_theme_assets = new Foundationpress_protocol_relative_theme_assets;
+	$foundationpress_protocol_relative_theme_assets = new Foundationpress_protocol_relative_theme_assets;
 endif;
 
 ?>