diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 9f6d470b1..55107019c 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -4,29 +4,29 @@ $white: #ffffff;
 
 $classic-base-color: #282c37;
 $classic-primary-color: #9baec8;
-$classic-secondary-color: #d9e1e8;
-$classic-highlight-color: #2b90d9;
+$classic-secondary-color: #dcebd0;
+$classic-highlight-color: #7fd92b;
 
 // Differences
-$success-green: #3c754d;
+$success-green: #428556;
 
 $base-overlay-background: $white !default;
 $valid-value-color: $success-green !default;
 
 $ui-base-color: $classic-secondary-color !default;
-$ui-base-lighter-color: #b0c0cf;
-$ui-primary-color: #9bcbed;
+$ui-base-lighter-color: #c7d6c8;
+$ui-primary-color: #a1cc96;
 $ui-secondary-color: $classic-base-color !default;
-$ui-highlight-color: #2b5fd9;
+$ui-highlight-color: #58991c;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
 $dark-text-color: #444b5d;
-$action-button-color: #606984;
+$action-button-color: #5d6b55;
 
 $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
-$light-text-color: #444b5d;
+$light-text-color: #515f50;
 
 //Newly added colors
 $account-background-color: $white !default;
diff --git a/db/schema.rb b/db/schema.rb
index 02032c548..0214259bb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -149,9 +149,9 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.text "phrase", default: "", null: false
     t.string "context", default: [], null: false, array: true
     t.boolean "irreversible", default: false, null: false
-    t.boolean "whole_word", default: true, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "whole_word", default: true, null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
   end
 
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 04894d34d..d796c74c2 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -33,7 +33,7 @@ module Mastodon
     end
 
     def source_base_url
-      'https://github.com/tootsuite/mastodon'
+      'https://github.com/chinwagsocial/mastodon'
     end
 
     # specify git tag or commit hash here