Update words

11 files changed, 23 insertions, 24 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d89a6ef4..211bc9a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -269,7 +269,7 @@ jobs:
           name: github gh-pages docs publish
           command: >
             git config --global user.name "metamaskbot" &&
-            git config --global user.email "admin@metamask.io" &&
+            git config --global user.email "hsuan@dexon.org" &&
             npm run publish-docs
 
   test-unit:
diff --git a/.github/ISSUE_TEMPLATE/support-request-or-question.md b/.github/ISSUE_TEMPLATE/support-request-or-question.md
index 7b20a3a0..5a596f4a 100644
--- a/.github/ISSUE_TEMPLATE/support-request-or-question.md
+++ b/.github/ISSUE_TEMPLATE/support-request-or-question.md
@@ -6,4 +6,4 @@ about: Have a question about how to use DekuSan?
 
 FOR USER QUESTIONS, PLEASE DO NOT OPEN A GITHUB ISSUE - IT WILL NOT BE HANDLED HERE.
 
-INSTEAD, PLEASE EMAIL SUPPORT@METAMASK.IO WITH A DESCRIPTION OF YOUR PROBLEM.
+INSTEAD, PLEASE EMAIL SUPPORT@DEXON.ORG WITH A DESCRIPTION OF YOUR PROBLEM.
diff --git a/app/images/copy-to-clipboard.svg b/app/images/copy-to-clipboard.svg
index c67c2aa8..a87de70f 100644
--- a/app/images/copy-to-clipboard.svg
+++ b/app/images/copy-to-clipboard.svg
@@ -11,9 +11,9 @@
                     <g id="Group-6" transform="translate(23.336478, 120.000000)">
                         <g id="Group-5" transform="translate(0.408805, 11.000000)">
                             <g id="copy-to-clipboard">
-                                <rect id="Rectangle-18" stroke="#3098DC" stroke-width="2" x="1" y="1" width="12.0220126" height="12"></rect>
-                                <rect id="Rectangle-18-Copy-2" fill="#FFFFFF" x="2.1572327" y="2" width="14.0220126" height="14"></rect>
-                                <rect id="Rectangle-18-Copy" stroke="#3098DC" stroke-width="2" x="4.23584906" y="4" width="12.0220126" height="12"></rect>
+                                <rect id="Rectangle-18" stroke="#954A97" stroke-width="2" x="1" y="1" width="12.0220126" height="12"></rect>
+                                <rect id="Rectangle-18-Copy-2" fill="#222222" x="2.1572327" y="2" width="14.0220126" height="14"></rect>
+                                <rect id="Rectangle-18-Copy" stroke="#954A97" stroke-width="2" x="4.23584906" y="4" width="12.0220126" height="12"></rect>
                             </g>
                         </g>
                     </g>
diff --git a/app/images/download.svg b/app/images/download.svg
index b5506641..16cfd38e 100644
--- a/app/images/download.svg
+++ b/app/images/download.svg
@@ -5,7 +5,7 @@
     <desc>Created with sketchtool.</desc>
     <defs></defs>
     <g id="Reveal-Seedphrase" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Seed-phrase-2" transform="translate(-212.000000, -379.000000)" stroke="#259DE5" stroke-width="2">
+        <g id="Seed-phrase-2" transform="translate(-212.000000, -379.000000)" stroke="#954a97" stroke-width="2">
             <g id="Group-2">
                 <g id="Group-8" transform="translate(16.000000, 248.000000)">
                     <g id="Group-6" transform="translate(23.336478, 120.000000)">
diff --git a/app/images/webcam.svg b/app/images/webcam.svg
index 4b9b5814..fc0f7b4c 100644
--- a/app/images/webcam.svg
+++ b/app/images/webcam.svg
@@ -8,7 +8,7 @@
         <g id="Group-4-Copy" transform="translate(-482.000000, -218.000000)">
             <g id="webcam" transform="translate(482.000000, 218.000000)">
                 <circle id="Oval" fill="#D5ECFA" cx="26.5" cy="26.5" r="26.5"></circle>
-                <g id="Group" transform="translate(14.000000, 19.000000)" fill="#259DE5">
+                <g id="Group" transform="translate(14.000000, 19.000000)" fill="#954a97">
                     <rect id="Rectangle" x="0" y="0" width="18" height="16"></rect>
                     <polygon id="Triangle" points="19 6.57142857 26 3 26 13 19 9.42857143"></polygon>
                 </g>
diff --git a/notices/archive/notice_0.md b/notices/archive/notice_0.md
index 3d1c04b2..97e8a3d7 100644
--- a/notices/archive/notice_0.md
+++ b/notices/archive/notice_0.md
@@ -138,7 +138,7 @@ Notwithstanding the parties' decision to resolve all disputes through arbitratio
 
 ### 13.6 30-Day Right to Opt Out ###
 
-You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: DekuSan ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at support@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, DekuSan also will not be bound by them.
+You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: DekuSan ℅ COBINHOOD, 39F, Taipei 101, Taiwan and via email at support@dexon.org. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, DekuSan also will not be bound by them.
 
 ### 13.7 Changes to This Section ###
 
@@ -168,7 +168,7 @@ The section titles in the Terms are for convenience only and have no legal or co
 
 ### 14.5 Communications ###
 
-Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io.
+Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at support@dexon.org.
 
 ## 15 Related Links ##
 
diff --git a/notices/archive/notice_4.md b/notices/archive/notice_4.md
index c8e3bcdf..e08bda72 100644
--- a/notices/archive/notice_4.md
+++ b/notices/archive/notice_4.md
@@ -1,6 +1,6 @@
 Dear DekuSan Users,
 
-There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake DekuSan window on the page asking for user's seed phrases. DekuSan will never open itself in this way and users are encouraged to report these instances immediately to either [our phishing blacklist](https://github.com/DekuSan/eth-phishing-detect/issues) or our support email at [support@metamask.io](mailto:support@metamask.io).
+There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake DekuSan window on the page asking for user's seed phrases. DekuSan will never open itself in this way and users are encouraged to report these instances immediately to either [our phishing blacklist](https://github.com/dexon-foundation/dekusan/issues) or our support email at [support@dexon.org](mailto:support@dexon.org).
 
-Please read our full article on this ongoing issue at [https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168](https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168). 
+Please read the full article on this ongoing issue at [https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168](https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168). 
 
diff --git a/ui/app/components/export-text-container/index.scss b/ui/app/components/export-text-container/index.scss
index 1da79c2d..05f4010a 100644
--- a/ui/app/components/export-text-container/index.scss
+++ b/ui/app/components/export-text-container/index.scss
@@ -3,7 +3,7 @@
   justify-content: center;
   flex-direction: column;
   align-items: center;
-  border: 1px solid $alto;
+  border: 1px solid $geyser;
   border-radius: 4px;
   font-weight: 400;
 
@@ -13,13 +13,13 @@
     justify-content: center;
     padding: 20px;
     border-radius: 4px;
-    background: $alabaster;
+    background: $muddy-gray;
   }
 
   &__text {
     resize: none;
     border: none;
-    background: $alabaster;
+    background: $muddy-gray;
     font-size: 20px;
     text-align: center;
   }
@@ -27,7 +27,7 @@
   &__buttons-container {
     display: flex;
     flex-direction: row;
-    border-top: 1px solid $alto;
+    border-top: 1px solid $geyser;
     width: 100%;
   }
 
@@ -42,7 +42,7 @@
     color: $dexon-purple;
 
     &--copy {
-      border-right: 1px solid $alto;
+      border-right: 1px solid $geyser;
     }
   }
 
diff --git a/ui/app/components/info-box/index.scss b/ui/app/components/info-box/index.scss
index 8b5626d7..87262355 100644
--- a/ui/app/components/info-box/index.scss
+++ b/ui/app/components/info-box/index.scss
@@ -1,6 +1,6 @@
 .info-box {
   border-radius: 4px;
-  background-color: $alabaster;
+  background-color: $muddy-gray;
   position: relative;
   padding: 16px;
   display: flex;
diff --git a/ui/app/components/pages/settings/info-tab/info-tab.component.js b/ui/app/components/pages/settings/info-tab/info-tab.component.js
index ac6705d5..b57b4cc3 100644
--- a/ui/app/components/pages/settings/info-tab/info-tab.component.js
+++ b/ui/app/components/pages/settings/info-tab/info-tab.component.js
@@ -32,7 +32,7 @@ export default class InfoTab extends PureComponent {
         </div>
         <div className="info-tab__link-item">
           <a
-            href="https://metamask.io/privacy.html"
+            href="https://dexon.org/dekusan/privacy.html"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -43,7 +43,7 @@ export default class InfoTab extends PureComponent {
         </div>
         <div className="info-tab__link-item">
           <a
-            href="https://metamask.io/terms.html"
+            href="https://dexon.org/dekusan/terms.html"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -66,7 +66,7 @@ export default class InfoTab extends PureComponent {
         <hr className="info-tab__separator" />
         <div className="info-tab__link-item">
           <a
-            href="https://support.metamask.io"
+            href="https://dexon.org"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -77,7 +77,7 @@ export default class InfoTab extends PureComponent {
         </div>
         <div className="info-tab__link-item">
           <a
-            href="https://metamask.io/"
+            href="https://dexon.org/"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -88,7 +88,7 @@ export default class InfoTab extends PureComponent {
         </div>
         <div className="info-tab__link-item">
           <a
-            href="mailto:help@metamask.io?subject=Feedback"
+            href="mailto:help@dexon.org?subject=Feedback"
             target="_blank"
             rel="noopener noreferrer"
           >
diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss
index 3464a810..102e46b4 100644
--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@@ -20,13 +20,12 @@ $rajah: #f5c26d; // formerly 'light orange (button shades)'
 $buttercup: #f5a623; // formerly 'dark orange (text)'
 $tundora: #4a4a4a; // formerly 'borders/font/any gray'
 $gallery: #efefef;
-$alabaster: #f7f7f7;
 $shark: #22232c;
 $wild-sand: #f6f6f6;
 $white: #fff;
 $dusty-gray: #777777;
 $alto: #dedede;
-$alabaster: #fafafa;
+$muddy-gray: #fafafa;
 $silver-chalice: #aeaeae;
 $concrete: #f3f3f3;
 $nile-blue: #1b344d;