diff --git a/build/native/colors.d.ts b/build/native/colors.d.ts
index 1ef33685..c6da607c 100644
--- a/build/native/colors.d.ts
+++ b/build/native/colors.d.ts
@@ -1,12 +1,12 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-export const green : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const blue : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const red : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const purple : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const orange : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const grey : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const shades : {white : string,black : string,transparent : string};
\ No newline at end of file
+export const green : { green100 : string,green200 : string,green300 : string,green400 : string,green500 : string,green600 : string,green700 : string,green800 : string};
+export const blue : { blue100 : string,blue200 : string,blue300 : string,blue400 : string,blue500 : string,blue600 : string,blue700 : string,blue800 : string};
+export const red : { red100 : string,red200 : string,red300 : string,red400 : string,red500 : string,red600 : string,red700 : string,red800 : string};
+export const purple : { purple100 : string,purple200 : string,purple300 : string,purple400 : string,purple500 : string,purple600 : string,purple700 : string,purple800 : string};
+export const orange : { orange100 : string,orange200 : string,orange300 : string,orange400 : string,orange500 : string,orange600 : string,orange700 : string,orange800 : string};
+export const grey : { grey100 : string,grey200 : string,grey300 : string,grey400 : string,grey500 : string,grey600 : string,grey700 : string,grey800 : string};
+export const shades : { white : string,black : string,transparent : string};
\ No newline at end of file
diff --git a/build/native/colors.js b/build/native/colors.js
index d67cc987..3fee8e5d 100644
--- a/build/native/colors.js
+++ b/build/native/colors.js
@@ -1,58 +1,12 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-module.exports = {
-  "green100": "#FAFFFC",
-  "green200": "#EBF2EF",
-  "green300": "#D1E0D9",
-  "green400": "#B6CFC2",
-  "green500": "#86B09B",
-  "green600": "#307553",
-  "green700": "#275E43",
-  "green800": "#244C38",
-  "blue100": "#F5FAFF",
-  "blue200": "#E6F1FC",
-  "blue300": "#C0D8F0",
-  "blue400": "#88B1D9",
-  "blue500": "#5D96CF",
-  "blue600": "#3971A8",
-  "blue700": "#21588F",
-  "blue800": "#194673",
-  "red100": "#FFF7F9",
-  "red200": "#FEEEF2",
-  "red300": "#F0C4CD",
-  "red400": "#E296A6",
-  "red500": "#C6516A",
-  "red600": "#AF2645",
-  "red700": "#980B29",
-  "red800": "#800D25",
-  "purple100": "#FCFAFF",
-  "purple200": "#F2ECFE",
-  "purple300": "#D7CEE9",
-  "purple400": "#B9ABD5",
-  "purple500": "#8471AB",
-  "purple600": "#533E7D",
-  "purple700": "#3B2566",
-  "purple800": "#2A174F",
-  "orange100": "#FFFAF5",
-  "orange200": "#FFF3E8",
-  "orange300": "#F3D8C0",
-  "orange400": "#E7B88F",
-  "orange500": "#CF8545",
-  "orange600": "#B4631D",
-  "orange700": "#8E4D14",
-  "orange800": "#784213",
-  "grey100": "#FCFEFF",
-  "grey200": "#F5F7FA",
-  "grey300": "#E6EDF5",
-  "grey400": "#C8D3E0",
-  "grey500": "#596D84",
-  "grey600": "#475A70",
-  "grey700": "#36485C",
-  "grey800": "#2E3A47",
-  "white": "#FFFFFF",
-  "black": "#000000",
-  "transparent": "transparent"
-};
\ No newline at end of file
+module.exports = {green : { green100 : "#FAFFFC",green200 : "#EBF2EF",green300 : "#D1E0D9",green400 : "#B6CFC2",green500 : "#86B09B",green600 : "#307553",green700 : "#275E43",green800 : "#244C38"},
+blue : { blue100 : "#F5FAFF",blue200 : "#E6F1FC",blue300 : "#C0D8F0",blue400 : "#88B1D9",blue500 : "#5D96CF",blue600 : "#3971A8",blue700 : "#21588F",blue800 : "#194673"},
+red : { red100 : "#FFF7F9",red200 : "#FEEEF2",red300 : "#F0C4CD",red400 : "#E296A6",red500 : "#C6516A",red600 : "#AF2645",red700 : "#980B29",red800 : "#800D25"},
+purple : { purple100 : "#FCFAFF",purple200 : "#F2ECFE",purple300 : "#D7CEE9",purple400 : "#B9ABD5",purple500 : "#8471AB",purple600 : "#533E7D",purple700 : "#3B2566",purple800 : "#2A174F"},
+orange : { orange100 : "#FFFAF5",orange200 : "#FFF3E8",orange300 : "#F3D8C0",orange400 : "#E7B88F",orange500 : "#CF8545",orange600 : "#B4631D",orange700 : "#8E4D14",orange800 : "#784213"},
+grey : { grey100 : "#FCFEFF",grey200 : "#F5F7FA",grey300 : "#E6EDF5",grey400 : "#C8D3E0",grey500 : "#596D84",grey600 : "#475A70",grey700 : "#36485C",grey800 : "#2E3A47"},
+shades : { white : "#FFFFFF",black : "#000000",transparent : "transparent"},};
\ No newline at end of file
diff --git a/build/native/themes/light.d.ts b/build/native/themes/light.d.ts
index 65e7fde4..60eb752b 100644
--- a/build/native/themes/light.d.ts
+++ b/build/native/themes/light.d.ts
@@ -1,14 +1,14 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-export const text : {base : string,emphasis : string,subdued : string};
-export const surface : {level0 : string,level1 : string,level2 : string,level3 : string};
-export const primary : {text : any,background : any,border : any};
-export const info : {text : any,background : any,border : any};
-export const warning : {text : any,background : any,border : any};
-export const danger : {text : any,background : any,border : any};
-export const highlight : {text : any,background : any,border : any};
-export const disabled : {text : string,background : string,nakedContent : string,nakedBackground : string,border : string,input : any};
-export const input : {background : any,text : any,border : any};
\ No newline at end of file
+export const text : { textBase : string,textEmphasis : string,textSubdued : string};
+export const surface : { surfaceLevel0 : string,surfaceLevel1 : string,surfaceLevel2 : string,surfaceLevel3 : string};
+export const primary : { primaryTextBase : string,primaryTextHover : string,primaryTextActive : string,primaryBackgroundBase : string,primaryBackgroundHover : string,primaryBackgroundActive : string,primaryBackgroundMuted : string,primaryBackgroundMutedHover : string,primaryBackgroundMutedActive : string,primaryBackgroundBox : string,primaryBorderBase : string,primaryBorderHover : string,primaryBorderActive : string};
+export const info : { infoTextBase : string,infoTextHover : string,infoTextActive : string,infoBackgroundBase : string,infoBackgroundHover : string,infoBackgroundActive : string,infoBackgroundMuted : string,infoBackgroundMutedHover : string,infoBackgroundMutedActive : string,infoBackgroundBox : string,infoBorderBase : string,infoBorderHover : string,infoBorderActive : string};
+export const warning : { warningTextBase : string,warningTextHover : string,warningTextActive : string,warningBackgroundBase : string,warningBackgroundHover : string,warningBackgroundActive : string,warningBackgroundMuted : string,warningBackgroundMutedHover : string,warningBackgroundMutedActive : string,warningBackgroundBox : string,warningBorderBase : string,warningBorderHover : string,warningBorderActive : string};
+export const danger : { dangerTextBase : string,dangerTextHover : string,dangerTextActive : string,dangerBackgroundBase : string,dangerBackgroundHover : string,dangerBackgroundActive : string,dangerBackgroundMuted : string,dangerBackgroundMutedHover : string,dangerBackgroundMutedActive : string,dangerBackgroundBox : string,dangerBorderBase : string,dangerBorderHover : string,dangerBorderActive : string};
+export const highlight : { highlightTextBase : string,highlightTextHover : string,highlightTextActive : string,highlightBackgroundBase : string,highlightBackgroundHover : string,highlightBackgroundActive : string,highlightBackgroundMuted : string,highlightBackgroundMutedHover : string,highlightBackgroundMutedActive : string,highlightBackgroundBox : string,highlightBorderBase : string,highlightBorderHover : string,highlightBorderActive : string};
+export const disabled : { disabledText : string,disabledBackground : string,disabledNakedContent : string,disabledNakedBackground : string,disabledBorder : string,disabledInputBackground : string,disabledInputLabelText : string};
+export const input : { inputBackgroundBase : string,inputBackgroundHover : string,inputBackgroundInformation : string,inputTextBase : string,inputTextInformation : string,inputTextInformationError : string,inputTextLabel : string,inputTextFloatingLabel : string,inputTextFloatingLabelError : string,inputTextPlaceholder : string,inputBorderBase : string,inputBorderError : string};
\ No newline at end of file
diff --git a/build/native/themes/light.js b/build/native/themes/light.js
index 3d9fc325..4c61de3c 100644
--- a/build/native/themes/light.js
+++ b/build/native/themes/light.js
@@ -1,98 +1,14 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-module.exports = {
-  "textBase": "#2E3A47",
-  "textEmphasis": "#36485C",
-  "textSubdued": "#596D84",
-  "surfaceLevel0": "#F5F7FA",
-  "surfaceLevel1": "#FFFFFF",
-  "surfaceLevel2": "#FCFEFF",
-  "surfaceLevel3": "#FFFFFF",
-  "primaryTextBase": "#307553",
-  "primaryTextHover": "#275E43",
-  "primaryTextActive": "#244C38",
-  "primaryBackgroundBase": "#307553",
-  "primaryBackgroundHover": "#275E43",
-  "primaryBackgroundActive": "#244C38",
-  "primaryBackgroundMuted": "#EBF2EF",
-  "primaryBackgroundMutedHover": "#D1E0D9",
-  "primaryBackgroundMutedActive": "#B6CFC2",
-  "primaryBackgroundBox": "#FAFFFC",
-  "primaryBorderBase": "#307553",
-  "primaryBorderHover": "#275E43",
-  "primaryBorderActive": "#244C38",
-  "infoTextBase": "#3971A8",
-  "infoTextHover": "#21588F",
-  "infoTextActive": "#194673",
-  "infoBackgroundBase": "#3971A8",
-  "infoBackgroundHover": "#21588F",
-  "infoBackgroundActive": "#194673",
-  "infoBackgroundMuted": "#E6F1FC",
-  "infoBackgroundMutedHover": "#C0D8F0",
-  "infoBackgroundMutedActive": "#88B1D9",
-  "infoBackgroundBox": "#F5FAFF",
-  "infoBorderBase": "#3971A8",
-  "infoBorderHover": "#21588F",
-  "infoBorderActive": "#194673",
-  "warningTextBase": "#B4631D",
-  "warningTextHover": "#8E4D14",
-  "warningTextActive": "#784213",
-  "warningBackgroundBase": "#B4631D",
-  "warningBackgroundHover": "#8E4D14",
-  "warningBackgroundActive": "#784213",
-  "warningBackgroundMuted": "#FFF3E8",
-  "warningBackgroundMutedHover": "#F3D8C0",
-  "warningBackgroundMutedActive": "#E7B88F",
-  "warningBackgroundBox": "#FFFAF5",
-  "warningBorderBase": "#B4631D",
-  "warningBorderHover": "#8E4D14",
-  "warningBorderActive": "#784213",
-  "dangerTextBase": "#AF2645",
-  "dangerTextHover": "#980B29",
-  "dangerTextActive": "#800D25",
-  "dangerBackgroundBase": "#AF2645",
-  "dangerBackgroundHover": "#980B29",
-  "dangerBackgroundActive": "#800D25",
-  "dangerBackgroundMuted": "#FEEEF2",
-  "dangerBackgroundMutedHover": "#F0C4CD",
-  "dangerBackgroundMutedActive": "#E296A6",
-  "dangerBackgroundBox": "#FFF7F9",
-  "dangerBorderBase": "#AF2645",
-  "dangerBorderHover": "#980B29",
-  "dangerBorderActive": "#800D25",
-  "highlightTextBase": "#533E7D",
-  "highlightTextHover": "#3B2566",
-  "highlightTextActive": "#2A174F",
-  "highlightBackgroundBase": "#533E7D",
-  "highlightBackgroundHover": "#3B2566",
-  "highlightBackgroundActive": "#2A174F",
-  "highlightBackgroundMuted": "#F2ECFE",
-  "highlightBackgroundMutedHover": "#D7CEE9",
-  "highlightBackgroundMutedActive": "#B9ABD5",
-  "highlightBackgroundBox": "#FCFAFF",
-  "highlightBorderBase": "#533E7D",
-  "highlightBorderHover": "#3B2566",
-  "highlightBorderActive": "#2A174F",
-  "disabledText": "#596D84",
-  "disabledBackground": "#F5F7FA",
-  "disabledNakedContent": "#F5F7FA",
-  "disabledNakedBackground": "transparent",
-  "disabledBorder": "#C8D3E0",
-  "disabledInputBackground": "#E6EDF5",
-  "disabledInputLabelText": "#596D84",
-  "inputBackgroundBase": "#F5F7FA",
-  "inputBackgroundHover": "#F5F7FA",
-  "inputBackgroundInformation": "#FFFFFF",
-  "inputTextBase": "#475A70",
-  "inputTextInformation": "#475A70",
-  "inputTextInformationError": "#AF2645",
-  "inputTextLabel": "#475A70",
-  "inputTextFloatingLabel": "#3971A8",
-  "inputTextFloatingLabelError": "#AF2645",
-  "inputTextPlaceholder": "#596D84",
-  "inputBorderBase": "#E6EDF5",
-  "inputBorderError": "#AF2645"
-};
\ No newline at end of file
+module.exports = {text : { textBase : "#2E3A47",textEmphasis : "#36485C",textSubdued : "#596D84"},
+surface : { surfaceLevel0 : "#F5F7FA",surfaceLevel1 : "#FFFFFF",surfaceLevel2 : "#FCFEFF",surfaceLevel3 : "#FFFFFF"},
+primary : { primaryTextBase : "#307553",primaryTextHover : "#275E43",primaryTextActive : "#244C38",primaryBackgroundBase : "#307553",primaryBackgroundHover : "#275E43",primaryBackgroundActive : "#244C38",primaryBackgroundMuted : "#EBF2EF",primaryBackgroundMutedHover : "#D1E0D9",primaryBackgroundMutedActive : "#B6CFC2",primaryBackgroundBox : "#FAFFFC",primaryBorderBase : "#307553",primaryBorderHover : "#275E43",primaryBorderActive : "#244C38"},
+info : { infoTextBase : "#3971A8",infoTextHover : "#21588F",infoTextActive : "#194673",infoBackgroundBase : "#3971A8",infoBackgroundHover : "#21588F",infoBackgroundActive : "#194673",infoBackgroundMuted : "#E6F1FC",infoBackgroundMutedHover : "#C0D8F0",infoBackgroundMutedActive : "#88B1D9",infoBackgroundBox : "#F5FAFF",infoBorderBase : "#3971A8",infoBorderHover : "#21588F",infoBorderActive : "#194673"},
+warning : { warningTextBase : "#B4631D",warningTextHover : "#8E4D14",warningTextActive : "#784213",warningBackgroundBase : "#B4631D",warningBackgroundHover : "#8E4D14",warningBackgroundActive : "#784213",warningBackgroundMuted : "#FFF3E8",warningBackgroundMutedHover : "#F3D8C0",warningBackgroundMutedActive : "#E7B88F",warningBackgroundBox : "#FFFAF5",warningBorderBase : "#B4631D",warningBorderHover : "#8E4D14",warningBorderActive : "#784213"},
+danger : { dangerTextBase : "#AF2645",dangerTextHover : "#980B29",dangerTextActive : "#800D25",dangerBackgroundBase : "#AF2645",dangerBackgroundHover : "#980B29",dangerBackgroundActive : "#800D25",dangerBackgroundMuted : "#FEEEF2",dangerBackgroundMutedHover : "#F0C4CD",dangerBackgroundMutedActive : "#E296A6",dangerBackgroundBox : "#FFF7F9",dangerBorderBase : "#AF2645",dangerBorderHover : "#980B29",dangerBorderActive : "#800D25"},
+highlight : { highlightTextBase : "#533E7D",highlightTextHover : "#3B2566",highlightTextActive : "#2A174F",highlightBackgroundBase : "#533E7D",highlightBackgroundHover : "#3B2566",highlightBackgroundActive : "#2A174F",highlightBackgroundMuted : "#F2ECFE",highlightBackgroundMutedHover : "#D7CEE9",highlightBackgroundMutedActive : "#B9ABD5",highlightBackgroundBox : "#FCFAFF",highlightBorderBase : "#533E7D",highlightBorderHover : "#3B2566",highlightBorderActive : "#2A174F"},
+disabled : { disabledText : "#596D84",disabledBackground : "#F5F7FA",disabledNakedContent : "#F5F7FA",disabledNakedBackground : "transparent",disabledBorder : "#C8D3E0",disabledInputBackground : "#E6EDF5",disabledInputLabelText : "#596D84"},
+input : { inputBackgroundBase : "#F5F7FA",inputBackgroundHover : "#F5F7FA",inputBackgroundInformation : "#FFFFFF",inputTextBase : "#475A70",inputTextInformation : "#475A70",inputTextInformationError : "#AF2645",inputTextLabel : "#475A70",inputTextFloatingLabel : "#3971A8",inputTextFloatingLabelError : "#AF2645",inputTextPlaceholder : "#596D84",inputBorderBase : "#E6EDF5",inputBorderError : "#AF2645"},};
\ No newline at end of file
diff --git a/build/native/typography.d.ts b/build/native/typography.d.ts
index 345ef8dd..2c0118e8 100644
--- a/build/native/typography.d.ts
+++ b/build/native/typography.d.ts
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
 export const letterSpacingBase : number;
diff --git a/build/native/typography.js b/build/native/typography.js
index a6463a90..5d5d11bb 100644
--- a/build/native/typography.js
+++ b/build/native/typography.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
 module.exports = {
diff --git a/build/scss/colors.scss b/build/scss/colors.scss
index e8068e2a..2ca8469b 100644
--- a/build/scss/colors.scss
+++ b/build/scss/colors.scss
@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Thu, 11 Aug 2022 19:08:03 GMT
+// Generated on Mon, 15 Aug 2022 15:21:29 GMT
 
 $green100: #FAFFFC;
 $green200: #EBF2EF;
diff --git a/build/scss/themes/light.scss b/build/scss/themes/light.scss
index 0f2519a8..f36d79dd 100644
--- a/build/scss/themes/light.scss
+++ b/build/scss/themes/light.scss
@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Thu, 11 Aug 2022 19:08:03 GMT
+// Generated on Mon, 15 Aug 2022 15:21:29 GMT
 
 $textBase: #2E3A47;
 $textEmphasis: #36485C;
diff --git a/build/scss/typography.scss b/build/scss/typography.scss
index 5b3370ae..e8beff17 100644
--- a/build/scss/typography.scss
+++ b/build/scss/typography.scss
@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Thu, 11 Aug 2022 19:08:03 GMT
+// Generated on Mon, 15 Aug 2022 15:21:29 GMT
 
 $letterSpacingBase: 0;
 $paragraphSpacingBase: 0;
diff --git a/build/ts/colors.d.ts b/build/ts/colors.d.ts
index 1ef33685..c6da607c 100644
--- a/build/ts/colors.d.ts
+++ b/build/ts/colors.d.ts
@@ -1,12 +1,12 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-export const green : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const blue : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const red : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const purple : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const orange : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const grey : {100 : string,200 : string,300 : string,400 : string,500 : string,600 : string,700 : string,800 : string};
-export const shades : {white : string,black : string,transparent : string};
\ No newline at end of file
+export const green : { green100 : string,green200 : string,green300 : string,green400 : string,green500 : string,green600 : string,green700 : string,green800 : string};
+export const blue : { blue100 : string,blue200 : string,blue300 : string,blue400 : string,blue500 : string,blue600 : string,blue700 : string,blue800 : string};
+export const red : { red100 : string,red200 : string,red300 : string,red400 : string,red500 : string,red600 : string,red700 : string,red800 : string};
+export const purple : { purple100 : string,purple200 : string,purple300 : string,purple400 : string,purple500 : string,purple600 : string,purple700 : string,purple800 : string};
+export const orange : { orange100 : string,orange200 : string,orange300 : string,orange400 : string,orange500 : string,orange600 : string,orange700 : string,orange800 : string};
+export const grey : { grey100 : string,grey200 : string,grey300 : string,grey400 : string,grey500 : string,grey600 : string,grey700 : string,grey800 : string};
+export const shades : { white : string,black : string,transparent : string};
\ No newline at end of file
diff --git a/build/ts/colors.js b/build/ts/colors.js
index d67cc987..3fee8e5d 100644
--- a/build/ts/colors.js
+++ b/build/ts/colors.js
@@ -1,58 +1,12 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-module.exports = {
-  "green100": "#FAFFFC",
-  "green200": "#EBF2EF",
-  "green300": "#D1E0D9",
-  "green400": "#B6CFC2",
-  "green500": "#86B09B",
-  "green600": "#307553",
-  "green700": "#275E43",
-  "green800": "#244C38",
-  "blue100": "#F5FAFF",
-  "blue200": "#E6F1FC",
-  "blue300": "#C0D8F0",
-  "blue400": "#88B1D9",
-  "blue500": "#5D96CF",
-  "blue600": "#3971A8",
-  "blue700": "#21588F",
-  "blue800": "#194673",
-  "red100": "#FFF7F9",
-  "red200": "#FEEEF2",
-  "red300": "#F0C4CD",
-  "red400": "#E296A6",
-  "red500": "#C6516A",
-  "red600": "#AF2645",
-  "red700": "#980B29",
-  "red800": "#800D25",
-  "purple100": "#FCFAFF",
-  "purple200": "#F2ECFE",
-  "purple300": "#D7CEE9",
-  "purple400": "#B9ABD5",
-  "purple500": "#8471AB",
-  "purple600": "#533E7D",
-  "purple700": "#3B2566",
-  "purple800": "#2A174F",
-  "orange100": "#FFFAF5",
-  "orange200": "#FFF3E8",
-  "orange300": "#F3D8C0",
-  "orange400": "#E7B88F",
-  "orange500": "#CF8545",
-  "orange600": "#B4631D",
-  "orange700": "#8E4D14",
-  "orange800": "#784213",
-  "grey100": "#FCFEFF",
-  "grey200": "#F5F7FA",
-  "grey300": "#E6EDF5",
-  "grey400": "#C8D3E0",
-  "grey500": "#596D84",
-  "grey600": "#475A70",
-  "grey700": "#36485C",
-  "grey800": "#2E3A47",
-  "white": "#FFFFFF",
-  "black": "#000000",
-  "transparent": "transparent"
-};
\ No newline at end of file
+module.exports = {green : { green100 : "#FAFFFC",green200 : "#EBF2EF",green300 : "#D1E0D9",green400 : "#B6CFC2",green500 : "#86B09B",green600 : "#307553",green700 : "#275E43",green800 : "#244C38"},
+blue : { blue100 : "#F5FAFF",blue200 : "#E6F1FC",blue300 : "#C0D8F0",blue400 : "#88B1D9",blue500 : "#5D96CF",blue600 : "#3971A8",blue700 : "#21588F",blue800 : "#194673"},
+red : { red100 : "#FFF7F9",red200 : "#FEEEF2",red300 : "#F0C4CD",red400 : "#E296A6",red500 : "#C6516A",red600 : "#AF2645",red700 : "#980B29",red800 : "#800D25"},
+purple : { purple100 : "#FCFAFF",purple200 : "#F2ECFE",purple300 : "#D7CEE9",purple400 : "#B9ABD5",purple500 : "#8471AB",purple600 : "#533E7D",purple700 : "#3B2566",purple800 : "#2A174F"},
+orange : { orange100 : "#FFFAF5",orange200 : "#FFF3E8",orange300 : "#F3D8C0",orange400 : "#E7B88F",orange500 : "#CF8545",orange600 : "#B4631D",orange700 : "#8E4D14",orange800 : "#784213"},
+grey : { grey100 : "#FCFEFF",grey200 : "#F5F7FA",grey300 : "#E6EDF5",grey400 : "#C8D3E0",grey500 : "#596D84",grey600 : "#475A70",grey700 : "#36485C",grey800 : "#2E3A47"},
+shades : { white : "#FFFFFF",black : "#000000",transparent : "transparent"},};
\ No newline at end of file
diff --git a/build/ts/themes/light.d.ts b/build/ts/themes/light.d.ts
index 65e7fde4..60eb752b 100644
--- a/build/ts/themes/light.d.ts
+++ b/build/ts/themes/light.d.ts
@@ -1,14 +1,14 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-export const text : {base : string,emphasis : string,subdued : string};
-export const surface : {level0 : string,level1 : string,level2 : string,level3 : string};
-export const primary : {text : any,background : any,border : any};
-export const info : {text : any,background : any,border : any};
-export const warning : {text : any,background : any,border : any};
-export const danger : {text : any,background : any,border : any};
-export const highlight : {text : any,background : any,border : any};
-export const disabled : {text : string,background : string,nakedContent : string,nakedBackground : string,border : string,input : any};
-export const input : {background : any,text : any,border : any};
\ No newline at end of file
+export const text : { textBase : string,textEmphasis : string,textSubdued : string};
+export const surface : { surfaceLevel0 : string,surfaceLevel1 : string,surfaceLevel2 : string,surfaceLevel3 : string};
+export const primary : { primaryTextBase : string,primaryTextHover : string,primaryTextActive : string,primaryBackgroundBase : string,primaryBackgroundHover : string,primaryBackgroundActive : string,primaryBackgroundMuted : string,primaryBackgroundMutedHover : string,primaryBackgroundMutedActive : string,primaryBackgroundBox : string,primaryBorderBase : string,primaryBorderHover : string,primaryBorderActive : string};
+export const info : { infoTextBase : string,infoTextHover : string,infoTextActive : string,infoBackgroundBase : string,infoBackgroundHover : string,infoBackgroundActive : string,infoBackgroundMuted : string,infoBackgroundMutedHover : string,infoBackgroundMutedActive : string,infoBackgroundBox : string,infoBorderBase : string,infoBorderHover : string,infoBorderActive : string};
+export const warning : { warningTextBase : string,warningTextHover : string,warningTextActive : string,warningBackgroundBase : string,warningBackgroundHover : string,warningBackgroundActive : string,warningBackgroundMuted : string,warningBackgroundMutedHover : string,warningBackgroundMutedActive : string,warningBackgroundBox : string,warningBorderBase : string,warningBorderHover : string,warningBorderActive : string};
+export const danger : { dangerTextBase : string,dangerTextHover : string,dangerTextActive : string,dangerBackgroundBase : string,dangerBackgroundHover : string,dangerBackgroundActive : string,dangerBackgroundMuted : string,dangerBackgroundMutedHover : string,dangerBackgroundMutedActive : string,dangerBackgroundBox : string,dangerBorderBase : string,dangerBorderHover : string,dangerBorderActive : string};
+export const highlight : { highlightTextBase : string,highlightTextHover : string,highlightTextActive : string,highlightBackgroundBase : string,highlightBackgroundHover : string,highlightBackgroundActive : string,highlightBackgroundMuted : string,highlightBackgroundMutedHover : string,highlightBackgroundMutedActive : string,highlightBackgroundBox : string,highlightBorderBase : string,highlightBorderHover : string,highlightBorderActive : string};
+export const disabled : { disabledText : string,disabledBackground : string,disabledNakedContent : string,disabledNakedBackground : string,disabledBorder : string,disabledInputBackground : string,disabledInputLabelText : string};
+export const input : { inputBackgroundBase : string,inputBackgroundHover : string,inputBackgroundInformation : string,inputTextBase : string,inputTextInformation : string,inputTextInformationError : string,inputTextLabel : string,inputTextFloatingLabel : string,inputTextFloatingLabelError : string,inputTextPlaceholder : string,inputBorderBase : string,inputBorderError : string};
\ No newline at end of file
diff --git a/build/ts/themes/light.js b/build/ts/themes/light.js
index 3d9fc325..4c61de3c 100644
--- a/build/ts/themes/light.js
+++ b/build/ts/themes/light.js
@@ -1,98 +1,14 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
-module.exports = {
-  "textBase": "#2E3A47",
-  "textEmphasis": "#36485C",
-  "textSubdued": "#596D84",
-  "surfaceLevel0": "#F5F7FA",
-  "surfaceLevel1": "#FFFFFF",
-  "surfaceLevel2": "#FCFEFF",
-  "surfaceLevel3": "#FFFFFF",
-  "primaryTextBase": "#307553",
-  "primaryTextHover": "#275E43",
-  "primaryTextActive": "#244C38",
-  "primaryBackgroundBase": "#307553",
-  "primaryBackgroundHover": "#275E43",
-  "primaryBackgroundActive": "#244C38",
-  "primaryBackgroundMuted": "#EBF2EF",
-  "primaryBackgroundMutedHover": "#D1E0D9",
-  "primaryBackgroundMutedActive": "#B6CFC2",
-  "primaryBackgroundBox": "#FAFFFC",
-  "primaryBorderBase": "#307553",
-  "primaryBorderHover": "#275E43",
-  "primaryBorderActive": "#244C38",
-  "infoTextBase": "#3971A8",
-  "infoTextHover": "#21588F",
-  "infoTextActive": "#194673",
-  "infoBackgroundBase": "#3971A8",
-  "infoBackgroundHover": "#21588F",
-  "infoBackgroundActive": "#194673",
-  "infoBackgroundMuted": "#E6F1FC",
-  "infoBackgroundMutedHover": "#C0D8F0",
-  "infoBackgroundMutedActive": "#88B1D9",
-  "infoBackgroundBox": "#F5FAFF",
-  "infoBorderBase": "#3971A8",
-  "infoBorderHover": "#21588F",
-  "infoBorderActive": "#194673",
-  "warningTextBase": "#B4631D",
-  "warningTextHover": "#8E4D14",
-  "warningTextActive": "#784213",
-  "warningBackgroundBase": "#B4631D",
-  "warningBackgroundHover": "#8E4D14",
-  "warningBackgroundActive": "#784213",
-  "warningBackgroundMuted": "#FFF3E8",
-  "warningBackgroundMutedHover": "#F3D8C0",
-  "warningBackgroundMutedActive": "#E7B88F",
-  "warningBackgroundBox": "#FFFAF5",
-  "warningBorderBase": "#B4631D",
-  "warningBorderHover": "#8E4D14",
-  "warningBorderActive": "#784213",
-  "dangerTextBase": "#AF2645",
-  "dangerTextHover": "#980B29",
-  "dangerTextActive": "#800D25",
-  "dangerBackgroundBase": "#AF2645",
-  "dangerBackgroundHover": "#980B29",
-  "dangerBackgroundActive": "#800D25",
-  "dangerBackgroundMuted": "#FEEEF2",
-  "dangerBackgroundMutedHover": "#F0C4CD",
-  "dangerBackgroundMutedActive": "#E296A6",
-  "dangerBackgroundBox": "#FFF7F9",
-  "dangerBorderBase": "#AF2645",
-  "dangerBorderHover": "#980B29",
-  "dangerBorderActive": "#800D25",
-  "highlightTextBase": "#533E7D",
-  "highlightTextHover": "#3B2566",
-  "highlightTextActive": "#2A174F",
-  "highlightBackgroundBase": "#533E7D",
-  "highlightBackgroundHover": "#3B2566",
-  "highlightBackgroundActive": "#2A174F",
-  "highlightBackgroundMuted": "#F2ECFE",
-  "highlightBackgroundMutedHover": "#D7CEE9",
-  "highlightBackgroundMutedActive": "#B9ABD5",
-  "highlightBackgroundBox": "#FCFAFF",
-  "highlightBorderBase": "#533E7D",
-  "highlightBorderHover": "#3B2566",
-  "highlightBorderActive": "#2A174F",
-  "disabledText": "#596D84",
-  "disabledBackground": "#F5F7FA",
-  "disabledNakedContent": "#F5F7FA",
-  "disabledNakedBackground": "transparent",
-  "disabledBorder": "#C8D3E0",
-  "disabledInputBackground": "#E6EDF5",
-  "disabledInputLabelText": "#596D84",
-  "inputBackgroundBase": "#F5F7FA",
-  "inputBackgroundHover": "#F5F7FA",
-  "inputBackgroundInformation": "#FFFFFF",
-  "inputTextBase": "#475A70",
-  "inputTextInformation": "#475A70",
-  "inputTextInformationError": "#AF2645",
-  "inputTextLabel": "#475A70",
-  "inputTextFloatingLabel": "#3971A8",
-  "inputTextFloatingLabelError": "#AF2645",
-  "inputTextPlaceholder": "#596D84",
-  "inputBorderBase": "#E6EDF5",
-  "inputBorderError": "#AF2645"
-};
\ No newline at end of file
+module.exports = {text : { textBase : "#2E3A47",textEmphasis : "#36485C",textSubdued : "#596D84"},
+surface : { surfaceLevel0 : "#F5F7FA",surfaceLevel1 : "#FFFFFF",surfaceLevel2 : "#FCFEFF",surfaceLevel3 : "#FFFFFF"},
+primary : { primaryTextBase : "#307553",primaryTextHover : "#275E43",primaryTextActive : "#244C38",primaryBackgroundBase : "#307553",primaryBackgroundHover : "#275E43",primaryBackgroundActive : "#244C38",primaryBackgroundMuted : "#EBF2EF",primaryBackgroundMutedHover : "#D1E0D9",primaryBackgroundMutedActive : "#B6CFC2",primaryBackgroundBox : "#FAFFFC",primaryBorderBase : "#307553",primaryBorderHover : "#275E43",primaryBorderActive : "#244C38"},
+info : { infoTextBase : "#3971A8",infoTextHover : "#21588F",infoTextActive : "#194673",infoBackgroundBase : "#3971A8",infoBackgroundHover : "#21588F",infoBackgroundActive : "#194673",infoBackgroundMuted : "#E6F1FC",infoBackgroundMutedHover : "#C0D8F0",infoBackgroundMutedActive : "#88B1D9",infoBackgroundBox : "#F5FAFF",infoBorderBase : "#3971A8",infoBorderHover : "#21588F",infoBorderActive : "#194673"},
+warning : { warningTextBase : "#B4631D",warningTextHover : "#8E4D14",warningTextActive : "#784213",warningBackgroundBase : "#B4631D",warningBackgroundHover : "#8E4D14",warningBackgroundActive : "#784213",warningBackgroundMuted : "#FFF3E8",warningBackgroundMutedHover : "#F3D8C0",warningBackgroundMutedActive : "#E7B88F",warningBackgroundBox : "#FFFAF5",warningBorderBase : "#B4631D",warningBorderHover : "#8E4D14",warningBorderActive : "#784213"},
+danger : { dangerTextBase : "#AF2645",dangerTextHover : "#980B29",dangerTextActive : "#800D25",dangerBackgroundBase : "#AF2645",dangerBackgroundHover : "#980B29",dangerBackgroundActive : "#800D25",dangerBackgroundMuted : "#FEEEF2",dangerBackgroundMutedHover : "#F0C4CD",dangerBackgroundMutedActive : "#E296A6",dangerBackgroundBox : "#FFF7F9",dangerBorderBase : "#AF2645",dangerBorderHover : "#980B29",dangerBorderActive : "#800D25"},
+highlight : { highlightTextBase : "#533E7D",highlightTextHover : "#3B2566",highlightTextActive : "#2A174F",highlightBackgroundBase : "#533E7D",highlightBackgroundHover : "#3B2566",highlightBackgroundActive : "#2A174F",highlightBackgroundMuted : "#F2ECFE",highlightBackgroundMutedHover : "#D7CEE9",highlightBackgroundMutedActive : "#B9ABD5",highlightBackgroundBox : "#FCFAFF",highlightBorderBase : "#533E7D",highlightBorderHover : "#3B2566",highlightBorderActive : "#2A174F"},
+disabled : { disabledText : "#596D84",disabledBackground : "#F5F7FA",disabledNakedContent : "#F5F7FA",disabledNakedBackground : "transparent",disabledBorder : "#C8D3E0",disabledInputBackground : "#E6EDF5",disabledInputLabelText : "#596D84"},
+input : { inputBackgroundBase : "#F5F7FA",inputBackgroundHover : "#F5F7FA",inputBackgroundInformation : "#FFFFFF",inputTextBase : "#475A70",inputTextInformation : "#475A70",inputTextInformationError : "#AF2645",inputTextLabel : "#475A70",inputTextFloatingLabel : "#3971A8",inputTextFloatingLabelError : "#AF2645",inputTextPlaceholder : "#596D84",inputBorderBase : "#E6EDF5",inputBorderError : "#AF2645"},};
\ No newline at end of file
diff --git a/build/ts/typography.d.ts b/build/ts/typography.d.ts
index c24357b2..ac64400c 100644
--- a/build/ts/typography.d.ts
+++ b/build/ts/typography.d.ts
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
 export const letterSpacingBase : number;
diff --git a/build/ts/typography.js b/build/ts/typography.js
index 30741be2..6dbb33a6 100644
--- a/build/ts/typography.js
+++ b/build/ts/typography.js
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Thu, 11 Aug 2022 19:08:03 GMT
+ * Generated on Mon, 15 Aug 2022 15:21:29 GMT
  */
 
 module.exports = {