diff --git a/package.json b/package.json
index fb47677..911957a 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "build:clean": "rm -rf dist ssr",
     "build:tokens": "style-dictionary build",
     "build:types": "tsc --emitDeclarationOnly",
-    "build": "npm run build:clean && npm run build:types && rollup -c ./config/rollup.config.js --environment NODE_ENV:production && node ./ssr/html.js",
-    "dev": "npm run build:types && rollup -c ./config/rollup.config.js -w",
+    "build": "npm run build:clean && npm run build:types && build:tokens && rollup -c ./config/rollup.config.js --environment NODE_ENV:production && node ./ssr/html.js",
+    "dev": "npm run build:types && build:tokens && rollup -c ./config/rollup.config.js -w",
     "lint": "npm run lint:style && npm run lint:js",
     "lint:js": "eslint --fix ./src --ext .js,.jsx,.ts,.tsx && echo 'JS linting complete'",
     "lint:style": "stylelint --fix '**/*.scss' && echo 'Style linting complete'",
diff --git a/src/tokens/colour/base.json b/src/tokens/colour/base.json
index edded42..eeb75a9 100644
--- a/src/tokens/colour/base.json
+++ b/src/tokens/colour/base.json
@@ -1,9 +1,7 @@
 {
   "colour": {    
-    "black":     { "value": "#000" },
-    "black-rgb": { "value": "0, 0, 0" },
-    "white":     { "value": "#fff" },
-    "white-rgb": { "value": "255, 255, 255" },
+    "black": { "value": "#000" },
+    "white": { "value": "#fff" },
     "amber": {
       "90": { "value": "#382a00" },
       "80": { "value": "#4d3900" },
@@ -57,7 +55,6 @@
       "80": { "value": "#292929" },
       "70": { "value": "#5c5c5c" },
       "60": { "value": "#767676" },
-      "60-rgb": { "value": "118, 118, 118" },
       "50": { "value": "#878787" },
       "40": { "value": "#999" },
       "30": { "value": "#b3b3b3" },