diff --git a/apps/demo/cunningham.ts b/apps/demo/cunningham.ts
index 43e9220..d1920b9 100644
--- a/apps/demo/cunningham.ts
+++ b/apps/demo/cunningham.ts
@@ -1,18 +1,14 @@
-import { DefaultTokens } from "@openfun/cunningham-react";
+import { Configuration } from "@openfun/cunningham-react";
 
-const config: DefaultTokens = {
-  theme: {
-    colors: {
-      "primary-500": "purple",
-      "success-700": "lime",
-      "greyscale-300": "#ff18e5",
-    },
-  },
-  components: {
-    button: {
-      "border-radius": "30px",
+const config: Configuration = {
+  themes: {
+    default: {
+      components: {
+        button: {
+          "border-radius": "30px",
+        },
+      },
     },
   },
 };
-
 export default config;
diff --git a/apps/demo/src/App.tsx b/apps/demo/src/App.tsx
index 569730a..e52a1b4 100644
--- a/apps/demo/src/App.tsx
+++ b/apps/demo/src/App.tsx
@@ -2,6 +2,7 @@ import {
   Button,
   CunninghamProvider,
   Pagination,
+  Select,
   SUPPORTED_LOCALES,
   Switch,
   usePagination,
@@ -9,27 +10,52 @@ import {
 import React, { useState } from "react";
 import { tokens } from "./cunningham-tokens";
 
+enum Theme {
+  DEFAULT = "default",
+  DARK = "dark",
+}
+
+const THEMES: Theme[] = [Theme.DEFAULT, Theme.DARK];
+
 export const App = () => {
   const pagination = usePagination({ defaultPage: 50, defaultPagesCount: 100 });
   const [locale, setLocale] = useState("en-US");
+  const [theme, setTheme] = useState<Theme>(Theme.DEFAULT);
   return (
-    <CunninghamProvider currentLocale={locale}>
+    <CunninghamProvider currentLocale={locale} theme={theme}>
       <div className="center">
-        <h1 className="test">Cunningham Demo.</h1>
-        <select
-          className="mb-s"
-          value={locale}
-          onChange={(e) => setLocale(e.target.value)}
-        >
-          {SUPPORTED_LOCALES.map((v) => (
-            <option key={v} value={v}>
-              {v}
-            </option>
-          ))}
-        </select>
-        <Switch defaultChecked={true} />
+        <h1 className="clr-greyscale-900">Cunningham Demo.</h1>
+
+        <div className="mb-s">
+          <Select
+            label="Locale"
+            options={SUPPORTED_LOCALES.map((v) => ({
+              label: v,
+            }))}
+            clearable={false}
+            value={locale}
+            onChange={(e) => setLocale(e.target.value as string)}
+          />
+        </div>
+
+        <Select
+          label="Theme"
+          options={THEMES.map((v) => ({
+            label: v,
+          }))}
+          clearable={false}
+          value={THEMES[0]}
+          onChange={(e) => setTheme(e.target.value as Theme)}
+        />
+
+        <div className="p-s">
+          <Switch defaultChecked={true} label="Switch" />
+        </div>
         <Button>World best button.</Button>
-        <h3>Primary-500 color is {tokens.theme.colors["primary-500"]}</h3>
+        <h3 className="clr-greyscale-900">
+          Primary-500 color is{" "}
+          {tokens.themes[theme].theme.colors["primary-500"]}
+        </h3>
         <Pagination {...pagination} />
       </div>
     </CunninghamProvider>
diff --git a/apps/demo/src/cunningham-tokens.css b/apps/demo/src/cunningham-tokens.css
index 178046f..6fd3f46 100644
--- a/apps/demo/src/cunningham-tokens.css
+++ b/apps/demo/src/cunningham-tokens.css
@@ -1,15 +1,5 @@
 :root {
-	--c--theme--colors--primary-text: #FFFFFF;
-	--c--theme--colors--primary-100: #EBF2FC;
-	--c--theme--colors--primary-200: #8CB5EA;
-	--c--theme--colors--primary-300: #5894E1;
-	--c--theme--colors--primary-400: #377FDB;
-	--c--theme--colors--primary-500: purple;
-	--c--theme--colors--primary-600: #0556BF;
-	--c--theme--colors--primary-700: #044395;
-	--c--theme--colors--primary-800: #033474;
-	--c--theme--colors--primary-900: #022858;
-	--c--theme--colors--secondary-text: #555F6B;
+	--c--theme--colors--secondary-text: var(--c--theme--colors--greyscale-700);
 	--c--theme--colors--secondary-100: #F2F7FC;
 	--c--theme--colors--secondary-200: #EBF3FA;
 	--c--theme--colors--secondary-300: #E2EEF8;
@@ -19,27 +9,7 @@
 	--c--theme--colors--secondary-700: #97A3AE;
 	--c--theme--colors--secondary-800: #757E87;
 	--c--theme--colors--secondary-900: #596067;
-	--c--theme--colors--greyscale-000: #FFFFFF;
-	--c--theme--colors--greyscale-100: #FAFAFB;
-	--c--theme--colors--greyscale-200: #F3F4F4;
-	--c--theme--colors--greyscale-300: #ff18e5;
-	--c--theme--colors--greyscale-400: #C2C6CA;
-	--c--theme--colors--greyscale-500: #9EA3AA;
-	--c--theme--colors--greyscale-600: #79818A;
-	--c--theme--colors--greyscale-700: #555F6B;
-	--c--theme--colors--greyscale-800: #303C4B;
-	--c--theme--colors--greyscale-900: #0C1A2B;
-	--c--theme--colors--success-text: #FFFFFF;
-	--c--theme--colors--success-100: #EFFCD3;
-	--c--theme--colors--success-200: #DBFAA9;
-	--c--theme--colors--success-300: #BEF27C;
-	--c--theme--colors--success-400: #A0E659;
-	--c--theme--colors--success-500: #76D628;
-	--c--theme--colors--success-600: #5AB81D;
-	--c--theme--colors--success-700: lime;
-	--c--theme--colors--success-800: #2C7C0C;
-	--c--theme--colors--success-900: #1D6607;
-	--c--theme--colors--info-text: #FFFFFF;
+	--c--theme--colors--info-text: var(--c--theme--colors--greyscale-000);
 	--c--theme--colors--info-100: #EBF2FC;
 	--c--theme--colors--info-200: #8CB5EA;
 	--c--theme--colors--info-300: #5894E1;
@@ -49,7 +19,34 @@
 	--c--theme--colors--info-700: #044395;
 	--c--theme--colors--info-800: #033474;
 	--c--theme--colors--info-900: #022858;
-	--c--theme--colors--warning-text: #FFFFFF;
+	--c--theme--colors--greyscale-100: #FAFAFB;
+	--c--theme--colors--greyscale-200: #F3F4F4;
+	--c--theme--colors--greyscale-300: #E7E8EA;
+	--c--theme--colors--greyscale-400: #C2C6CA;
+	--c--theme--colors--greyscale-500: #9EA3AA;
+	--c--theme--colors--greyscale-600: #79818A;
+	--c--theme--colors--greyscale-700: #555F6B;
+	--c--theme--colors--greyscale-800: #303C4B;
+	--c--theme--colors--greyscale-900: #0C1A2B;
+	--c--theme--colors--greyscale-000: #FFFFFF;
+	--c--theme--colors--primary-100: #EBF2FC;
+	--c--theme--colors--primary-200: #8CB5EA;
+	--c--theme--colors--primary-300: #5894E1;
+	--c--theme--colors--primary-400: #377FDB;
+	--c--theme--colors--primary-500: #055FD2;
+	--c--theme--colors--primary-600: #0556BF;
+	--c--theme--colors--primary-700: #044395;
+	--c--theme--colors--primary-800: #033474;
+	--c--theme--colors--primary-900: #022858;
+	--c--theme--colors--success-100: #EFFCD3;
+	--c--theme--colors--success-200: #DBFAA9;
+	--c--theme--colors--success-300: #BEF27C;
+	--c--theme--colors--success-400: #A0E659;
+	--c--theme--colors--success-500: #76D628;
+	--c--theme--colors--success-600: #5AB81D;
+	--c--theme--colors--success-700: #419A14;
+	--c--theme--colors--success-800: #2C7C0C;
+	--c--theme--colors--success-900: #1D6607;
 	--c--theme--colors--warning-100: #FFF8CD;
 	--c--theme--colors--warning-200: #FFEF9B;
 	--c--theme--colors--warning-300: #FFE469;
@@ -59,7 +56,6 @@
 	--c--theme--colors--warning-700: #B78702;
 	--c--theme--colors--warning-800: #936901;
 	--c--theme--colors--warning-900: #7A5400;
-	--c--theme--colors--danger-text: #FFFFFF;
 	--c--theme--colors--danger-100: #F4B0B0;
 	--c--theme--colors--danger-200: #EE8A8A;
 	--c--theme--colors--danger-300: #E65454;
@@ -69,6 +65,10 @@
 	--c--theme--colors--danger-700: #9B0000;
 	--c--theme--colors--danger-800: #780000;
 	--c--theme--colors--danger-900: #5C0000;
+	--c--theme--colors--primary-text: var(--c--theme--colors--greyscale-000);
+	--c--theme--colors--success-text: var(--c--theme--colors--greyscale-000);
+	--c--theme--colors--warning-text: var(--c--theme--colors--greyscale-000);
+	--c--theme--colors--danger-text: var(--c--theme--colors--greyscale-000);
 	--c--theme--font--sizes--h1: 1.75rem;
 	--c--theme--font--sizes--h2: 1.375rem;
 	--c--theme--font--sizes--h3: 1.125rem;
@@ -78,8 +78,24 @@
 	--c--theme--font--sizes--l: 1rem;
 	--c--theme--font--sizes--m: 0.8125rem;
 	--c--theme--font--sizes--s: 0.6875rem;
+	--c--theme--font--weights--thin: 200;
+	--c--theme--font--weights--light: 300;
+	--c--theme--font--weights--regular: 400;
+	--c--theme--font--weights--medium: 500;
+	--c--theme--font--weights--bold: 600;
+	--c--theme--font--weights--extrabold: 700;
+	--c--theme--font--weights--black: 800;
 	--c--theme--font--families--base: "Roboto Flex Variable", sans-serif;
 	--c--theme--font--families--accent: "Roboto Flex Variable", sans-serif;
+	--c--theme--font--letterspacings--h1: normal;
+	--c--theme--font--letterspacings--h2: normal;
+	--c--theme--font--letterspacings--h3: normal;
+	--c--theme--font--letterspacings--h4: normal;
+	--c--theme--font--letterspacings--h5: 1px;
+	--c--theme--font--letterspacings--h6: normal;
+	--c--theme--font--letterspacings--l: normal;
+	--c--theme--font--letterspacings--m: normal;
+	--c--theme--font--letterspacings--s: normal;
 	--c--theme--spacings--xl: 4rem;
 	--c--theme--spacings--l: 3rem;
 	--c--theme--spacings--b: 1.625rem;
@@ -92,3 +108,51 @@
 	--c--theme--transitions--duration: 250ms;
 	--c--components--button--border-radius: 30px;
 }
+.cunningham-theme--dark{
+	--c--theme--colors--greyscale-100: #182536;
+	--c--theme--colors--greyscale-200: #303C4B;
+	--c--theme--colors--greyscale-300: #555F6B;
+	--c--theme--colors--greyscale-400: #79818A;
+	--c--theme--colors--greyscale-500: #9EA3AA;
+	--c--theme--colors--greyscale-600: #C2C6CA;
+	--c--theme--colors--greyscale-700: #E7E8EA;
+	--c--theme--colors--greyscale-800: #F3F4F4;
+	--c--theme--colors--greyscale-900: #FAFAFB;
+	--c--theme--colors--greyscale-000: #0C1A2B;
+	--c--theme--colors--primary-100: #3B4C62;
+	--c--theme--colors--primary-200: #4D6481;
+	--c--theme--colors--primary-300: #6381A6;
+	--c--theme--colors--primary-400: #7FA5D5;
+	--c--theme--colors--primary-500: #8CB5EA;
+	--c--theme--colors--primary-600: #A3C4EE;
+	--c--theme--colors--primary-700: #C3D8F4;
+	--c--theme--colors--primary-800: #DDE9F8;
+	--c--theme--colors--primary-900: #F4F8FD;
+	--c--theme--colors--success-100: #EEF8D7;
+	--c--theme--colors--success-200: #D9F1B2;
+	--c--theme--colors--success-300: #BDE985;
+	--c--theme--colors--success-400: #A0E25D;
+	--c--theme--colors--success-500: #76D628;
+	--c--theme--colors--success-600: #5BB520;
+	--c--theme--colors--success-700: #43941A;
+	--c--theme--colors--success-800: #307414;
+	--c--theme--colors--success-900: #225D10;
+	--c--theme--colors--warning-100: #F7F3D5;
+	--c--theme--colors--warning-200: #F0E5AA;
+	--c--theme--colors--warning-300: #E8D680;
+	--c--theme--colors--warning-400: #E3C95F;
+	--c--theme--colors--warning-500: #D9B32B;
+	--c--theme--colors--warning-600: #BD9721;
+	--c--theme--colors--warning-700: #9D7B1C;
+	--c--theme--colors--warning-800: #7E6016;
+	--c--theme--colors--warning-900: #684D12;
+	--c--theme--colors--danger-100: #F8D0D0;
+	--c--theme--colors--danger-200: #F09898;
+	--c--theme--colors--danger-300: #F09898;
+	--c--theme--colors--danger-400: #ED8585;
+	--c--theme--colors--danger-500: #E96666;
+	--c--theme--colors--danger-600: #DD6666;
+	--c--theme--colors--danger-700: #C36666;
+	--c--theme--colors--danger-800: #AE6666;
+	--c--theme--colors--danger-900: #9D6666;
+}
diff --git a/apps/demo/src/cunningham-tokens.ts b/apps/demo/src/cunningham-tokens.ts
index 0413d6c..9ef6275 100644
--- a/apps/demo/src/cunningham-tokens.ts
+++ b/apps/demo/src/cunningham-tokens.ts
@@ -1 +1 @@
-export const tokens = {"theme":{"colors":{"primary-text":"#FFFFFF","primary-100":"#EBF2FC","primary-200":"#8CB5EA","primary-300":"#5894E1","primary-400":"#377FDB","primary-500":"purple","primary-600":"#0556BF","primary-700":"#044395","primary-800":"#033474","primary-900":"#022858","secondary-text":"#555F6B","secondary-100":"#F2F7FC","secondary-200":"#EBF3FA","secondary-300":"#E2EEF8","secondary-400":"#DDEAF7","secondary-500":"#D4E5F5","secondary-600":"#C1D0DF","secondary-700":"#97A3AE","secondary-800":"#757E87","secondary-900":"#596067","greyscale-000":"#FFFFFF","greyscale-100":"#FAFAFB","greyscale-200":"#F3F4F4","greyscale-300":"#ff18e5","greyscale-400":"#C2C6CA","greyscale-500":"#9EA3AA","greyscale-600":"#79818A","greyscale-700":"#555F6B","greyscale-800":"#303C4B","greyscale-900":"#0C1A2B","success-text":"#FFFFFF","success-100":"#EFFCD3","success-200":"#DBFAA9","success-300":"#BEF27C","success-400":"#A0E659","success-500":"#76D628","success-600":"#5AB81D","success-700":"lime","success-800":"#2C7C0C","success-900":"#1D6607","info-text":"#FFFFFF","info-100":"#EBF2FC","info-200":"#8CB5EA","info-300":"#5894E1","info-400":"#377FDB","info-500":"#055FD2","info-600":"#0556BF","info-700":"#044395","info-800":"#033474","info-900":"#022858","warning-text":"#FFFFFF","warning-100":"#FFF8CD","warning-200":"#FFEF9B","warning-300":"#FFE469","warning-400":"#FFDA43","warning-500":"#FFC805","warning-600":"#DBA603","warning-700":"#B78702","warning-800":"#936901","warning-900":"#7A5400","danger-text":"#FFFFFF","danger-100":"#F4B0B0","danger-200":"#EE8A8A","danger-300":"#E65454","danger-400":"#E13333","danger-500":"#DA0000","danger-600":"#C60000","danger-700":"#9B0000","danger-800":"#780000","danger-900":"#5C0000"},"font":{"sizes":{"h1":"1.75rem","h2":"1.375rem","h3":"1.125rem","h4":"0.8125rem","h5":"0.625rem","h6":"0.5rem","l":"1rem","m":"0.8125rem","s":"0.6875rem"},"weights":{"thin":{},"light":{},"regular":{},"medium":{},"bold":{},"extrabold":{},"black":{}},"families":{"base":"\"Roboto Flex Variable\", sans-serif","accent":"\"Roboto Flex Variable\", sans-serif"}},"spacings":{"xl":"4rem","l":"3rem","b":"1.625rem","s":"1rem","t":"0.5rem","st":"0.25rem"},"transitions":{"ease-in":"cubic-bezier(0.32, 0, 0.67, 0)","ease-out":"cubic-bezier(0.33, 1, 0.68, 1)","ease-in-out":"cubic-bezier(0.65, 0, 0.35, 1)","duration":"250ms"}},"components":{"button":{"border-radius":"30px"}}};
+export const tokens = {"themes":{"default":{"theme":{"colors":{"secondary-text":"#555F6B","secondary-100":"#F2F7FC","secondary-200":"#EBF3FA","secondary-300":"#E2EEF8","secondary-400":"#DDEAF7","secondary-500":"#D4E5F5","secondary-600":"#C1D0DF","secondary-700":"#97A3AE","secondary-800":"#757E87","secondary-900":"#596067","info-text":"#FFFFFF","info-100":"#EBF2FC","info-200":"#8CB5EA","info-300":"#5894E1","info-400":"#377FDB","info-500":"#055FD2","info-600":"#0556BF","info-700":"#044395","info-800":"#033474","info-900":"#022858","greyscale-100":"#FAFAFB","greyscale-200":"#F3F4F4","greyscale-300":"#E7E8EA","greyscale-400":"#C2C6CA","greyscale-500":"#9EA3AA","greyscale-600":"#79818A","greyscale-700":"#555F6B","greyscale-800":"#303C4B","greyscale-900":"#0C1A2B","greyscale-000":"#FFFFFF","primary-100":"#EBF2FC","primary-200":"#8CB5EA","primary-300":"#5894E1","primary-400":"#377FDB","primary-500":"#055FD2","primary-600":"#0556BF","primary-700":"#044395","primary-800":"#033474","primary-900":"#022858","success-100":"#EFFCD3","success-200":"#DBFAA9","success-300":"#BEF27C","success-400":"#A0E659","success-500":"#76D628","success-600":"#5AB81D","success-700":"#419A14","success-800":"#2C7C0C","success-900":"#1D6607","warning-100":"#FFF8CD","warning-200":"#FFEF9B","warning-300":"#FFE469","warning-400":"#FFDA43","warning-500":"#FFC805","warning-600":"#DBA603","warning-700":"#B78702","warning-800":"#936901","warning-900":"#7A5400","danger-100":"#F4B0B0","danger-200":"#EE8A8A","danger-300":"#E65454","danger-400":"#E13333","danger-500":"#DA0000","danger-600":"#C60000","danger-700":"#9B0000","danger-800":"#780000","danger-900":"#5C0000","primary-text":"#FFFFFF","success-text":"#FFFFFF","warning-text":"#FFFFFF","danger-text":"#FFFFFF"},"font":{"sizes":{"h1":"1.75rem","h2":"1.375rem","h3":"1.125rem","h4":"0.8125rem","h5":"0.625rem","h6":"0.5rem","l":"1rem","m":"0.8125rem","s":"0.6875rem"},"weights":{"thin":200,"light":300,"regular":400,"medium":500,"bold":600,"extrabold":700,"black":800},"families":{"base":"\"Roboto Flex Variable\", sans-serif","accent":"\"Roboto Flex Variable\", sans-serif"},"letterSpacings":{"h1":"normal","h2":"normal","h3":"normal","h4":"normal","h5":"1px","h6":"normal","l":"normal","m":"normal","s":"normal"}},"spacings":{"xl":"4rem","l":"3rem","b":"1.625rem","s":"1rem","t":"0.5rem","st":"0.25rem"},"transitions":{"ease-in":"cubic-bezier(0.32, 0, 0.67, 0)","ease-out":"cubic-bezier(0.33, 1, 0.68, 1)","ease-in-out":"cubic-bezier(0.65, 0, 0.35, 1)","duration":"250ms"}},"components":{"button":{"border-radius":"30px"}}},"dark":{"theme":{"colors":{"greyscale-100":"#182536","greyscale-200":"#303C4B","greyscale-300":"#555F6B","greyscale-400":"#79818A","greyscale-500":"#9EA3AA","greyscale-600":"#C2C6CA","greyscale-700":"#E7E8EA","greyscale-800":"#F3F4F4","greyscale-900":"#FAFAFB","greyscale-000":"#0C1A2B","primary-100":"#3B4C62","primary-200":"#4D6481","primary-300":"#6381A6","primary-400":"#7FA5D5","primary-500":"#8CB5EA","primary-600":"#A3C4EE","primary-700":"#C3D8F4","primary-800":"#DDE9F8","primary-900":"#F4F8FD","success-100":"#EEF8D7","success-200":"#D9F1B2","success-300":"#BDE985","success-400":"#A0E25D","success-500":"#76D628","success-600":"#5BB520","success-700":"#43941A","success-800":"#307414","success-900":"#225D10","warning-100":"#F7F3D5","warning-200":"#F0E5AA","warning-300":"#E8D680","warning-400":"#E3C95F","warning-500":"#D9B32B","warning-600":"#BD9721","warning-700":"#9D7B1C","warning-800":"#7E6016","warning-900":"#684D12","danger-100":"#F8D0D0","danger-200":"#F09898","danger-300":"#F09898","danger-400":"#ED8585","danger-500":"#E96666","danger-600":"#DD6666","danger-700":"#C36666","danger-800":"#AE6666","danger-900":"#9D6666"}}}}};
diff --git a/apps/demo/src/index.scss b/apps/demo/src/index.scss
index 601addb..0bd039a 100644
--- a/apps/demo/src/index.scss
+++ b/apps/demo/src/index.scss
@@ -8,11 +8,11 @@
   font-size: 16px;
   line-height: 24px;
   font-weight: 400;
-  background-color: #242424;
-  height: 100vh;
   display: flex;
   align-items: center;
   justify-content: center;
+  padding: 3rem;
+  background-color: var(--c--theme--colors--greyscale-000);
 }
 
 
@@ -20,9 +20,11 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding: 2rem;
+  background-color: var(--c--theme--colors--greyscale-100);
+  border-radius: 1rem;
 
   h1, h3 {
-    color: white;
     margin-bottom: 40px;
   }
-}
\ No newline at end of file
+}