diff --git a/app/README.md b/app/README.md
index 74e5ac54..846e8af4 100644
--- a/app/README.md
+++ b/app/README.md
@@ -79,19 +79,7 @@ Setting 'play' to null disables the sound notification.
 | title | The title to show if the logo is not specified. | `"string"` | ``"edumeet"`` |
 | supportUrl | The service & Support URL; if `null`, it will be not displayed on the about dialogs. | `"url"` | ``"https://support.example.com"`` |
 | privacyUrl | The privacy and data protection external URL or local HTML path. | `"string"` | ``"privacy/privacy.html"`` |
-| theme.palette.primary.main | The palette main color. | `"string"` | ``"#313131"`` |
-| theme.overrides.MuiAppBar.colorPrimary.backgroundColor | The app bar background color. | `"string"` | ``"#313131"`` |
-| theme.overrides.MuiButton.containedPrimary.backgroundColor | The primary buttons background color. | `"string"` | ``"#5F9B2D"`` |
-| theme.overrides.MuiButton.containedPrimary.&:hover.backgroundColor | The primary buttons background color when in hover state. | `"string"` | ``"#5F9B2D"`` |
-| theme.overrides.MuiButton.containedSecondary.backgroundColor | The secondary buttons background color. | `"string"` | ``"#f50057"`` |
-| theme.overrides.MuiButton.containedSecondary.&:hover.backgroundColor | The secondary buttons background color when in hover state. | `"string"` | ``"#f50057"`` |
-| theme.overrides.MuiFab.primary.backgroundColor | The primary Fab buttons background color. | `"string"` | ``"#5F9B2D"`` |
-| theme.overrides.MuiFab.primary.&:hover.backgroundColor | The primary Fab buttons background color when in hover state. | `"string"` | ``"#5F9B2D"`` |
-| theme.overrides.MuiFab.secondary.backgroundColor | The secondary Fab buttons background color. | `"string"` | ``"#f50057"`` |
-| theme.overrides.MuiFab.secondary.&:hover.backgroundColor | The secondary Fab buttons background color when in hover state. | `"string"` | ``"#f50057"`` |
-| theme.overrides.MuiBadge.colorPrimary.backgroundColor | The badges background color. | `"string"` | ``"#5F9B2D"`` |
-| theme.overrides.MuiBadge.colorPrimary.&:hover.backgroundColor | The badges background color when in hover state. | `"string"` | ``"#518029"`` |
-| theme.typography.useNextVariants | undefined | `"boolean"` | ``true`` |
+| theme | UI theme elements colors. | `"object"` | ``{  "palette": {    "primary": {      "main": "#313131"    }  },  "overrides": {    "MuiAppBar": {      "colorPrimary": {        "backgroundColor": "#313131"      }    },    "MuiButton": {      "containedPrimary": {        "backgroundColor": "#5F9B2D",        "&:hover": {          "backgroundColor": "#5F9B2D"        }      },      "containedSecondary": {        "backgroundColor": "#f50057",        "&:hover": {          "backgroundColor": "#f50057"        }      }    },    "MuiFab": {      "primary": {        "backgroundColor": "#5F9B2D",        "&:hover": {          "backgroundColor": "#5F9B2D"        }      },      "secondary": {        "backgroundColor": "#f50057",        "&:hover": {          "backgroundColor": "#f50057"        }      }    },    "MuiBadge": {      "colorPrimary": {        "backgroundColor": "#5F9B2D",        "&:hover": {          "backgroundColor": "#518029"        }      }    }  },  "typography": {    "useNextVariants": true  }}`` |
 
 
 ---
diff --git a/app/public/config/config.example.js b/app/public/config/config.example.js
index ebc9353f..851219a8 100644
--- a/app/public/config/config.example.js
+++ b/app/public/config/config.example.js
@@ -327,44 +327,60 @@ Setting 'play' to null disables the sound notification.
 	/* The privacy and data protection external URL or local HTML path. */
 	privacyUrl : 'privacy/privacy.html',
 
-	/* The palette main color. */
-	'theme.palette.primary.main' : '#313131',
-
-	/* The app bar background color. */
-	'theme.overrides.MuiAppBar.colorPrimary.backgroundColor' : '#313131',
-
-	/* The primary buttons background color. */
-	'theme.overrides.MuiButton.containedPrimary.backgroundColor' : '#5F9B2D',
-
-	/* The primary buttons background color when in hover state. */
-	'theme.overrides.MuiButton.containedPrimary.&:hover.backgroundColor' : '#5F9B2D',
-
-	/* The secondary buttons background color. */
-	'theme.overrides.MuiButton.containedSecondary.backgroundColor' : '#f50057',
-
-	/* The secondary buttons background color when in hover state. */
-	'theme.overrides.MuiButton.containedSecondary.&:hover.backgroundColor' : '#f50057',
-
-	/* The primary Fab buttons background color. */
-	'theme.overrides.MuiFab.primary.backgroundColor' : '#5F9B2D',
-
-	/* The primary Fab buttons background color when in hover state. */
-	'theme.overrides.MuiFab.primary.&:hover.backgroundColor' : '#5F9B2D',
-
-	/* The secondary Fab buttons background color. */
-	'theme.overrides.MuiFab.secondary.backgroundColor' : '#f50057',
-
-	/* The secondary Fab buttons background color when in hover state. */
-	'theme.overrides.MuiFab.secondary.&:hover.backgroundColor' : '#f50057',
-
-	/* The badges background color. */
-	'theme.overrides.MuiBadge.colorPrimary.backgroundColor' : '#5F9B2D',
-
-	/* The badges background color when in hover state. */
-	'theme.overrides.MuiBadge.colorPrimary.&:hover.backgroundColor' : '#518029',
-
-	/* undefined */
-	'theme.typography.useNextVariants' : true
+	/* UI theme elements colors. */
+	theme : {
+		'palette' : {
+			'primary' : {
+				'main' : '#313131'
+			}
+		},
+		'overrides' : {
+			'MuiAppBar' : {
+				'colorPrimary' : {
+					'backgroundColor' : '#313131'
+				}
+			},
+			'MuiButton' : {
+				'containedPrimary' : {
+					'backgroundColor' : '#5F9B2D',
+					'&:hover'         : {
+						'backgroundColor' : '#5F9B2D'
+					}
+				},
+				'containedSecondary' : {
+					'backgroundColor' : '#f50057',
+					'&:hover'         : {
+						'backgroundColor' : '#f50057'
+					}
+				}
+			},
+			'MuiFab' : {
+				'primary' : {
+					'backgroundColor' : '#5F9B2D',
+					'&:hover'         : {
+						'backgroundColor' : '#5F9B2D'
+					}
+				},
+				'secondary' : {
+					'backgroundColor' : '#f50057',
+					'&:hover'         : {
+						'backgroundColor' : '#f50057'
+					}
+				}
+			},
+			'MuiBadge' : {
+				'colorPrimary' : {
+					'backgroundColor' : '#5F9B2D',
+					'&:hover'         : {
+						'backgroundColor' : '#518029'
+					}
+				}
+			}
+		},
+		'typography' : {
+			'useNextVariants' : true
+		}
+	}
 };
 
 // Generated with: yarn gen-config-docs from app/src/config.ts
diff --git a/app/src/config.ts b/app/src/config.ts
index dac5f47e..fac02a69 100644
--- a/app/src/config.ts
+++ b/app/src/config.ts
@@ -532,167 +532,107 @@ Setting 'play' to null disables the sound notification.
 		nullable : true
 	},
 
-	// UI theme elements
 	theme :
 	{
-		palette :
+		doc     : 'UI theme elements colors.',
+		format  : Object,
+		default :
 		{
-			primary :
-			{
-				main :
-				{
-					doc     : 'The palette main color.',
-					format  : 'String',
-					default : '#313131'
-				}
-			}
-		},
-		overrides :
-		{
-			MuiAppBar :
-			{
-				colorPrimary :
-				{
-					backgroundColor :
-					{
-						doc     : 'The app bar background color.',
-						format  : 'String',
-						default : '#313131'
-					}
-				}
-			},
-			MuiButton :
-			{
-				containedPrimary :
-				{
-					backgroundColor :
-					{
-						doc     : 'The primary buttons background color.',
-						format  : 'String',
-						default : '#5F9B2D'
-					},
-					'&:hover' :
-					{
-						backgroundColor :
-						{
-							doc     : 'The primary buttons background color when in hover state.',
-							format  : 'String',
-							default : '#5F9B2D'
-						}
-					}
-				},
-				containedSecondary :
-				{
-					backgroundColor :
-					{
-						doc     : 'The secondary buttons background color.',
-						format  : 'String',
-						default : '#f50057'
-					},
-					'&:hover' :
-					{
-						backgroundColor :
-						{
-							doc     : 'The secondary buttons background color when in hover state.',
-							format  : 'String',
-							default : '#f50057'
-						}
-					}
-				}
-
-			},
-
-			/*
-			MuiIconButton :
-			{
-				colorPrimary :
-				{
-					backgroundColor : '#5F9B2D',
-					'&:hover'	   :
-					{
-						backgroundColor : '#5F9B2D'
-					}
-				},
-				colorSecondary :
-				{
-					backgroundColor : '#f50057',
-					'&:hover'	   :
-					{
-						backgroundColor : '#f50057'
-					}
-				}
-
-			},
-			*/
-
-			MuiFab :
+			palette :
 			{
 				primary :
 				{
-					backgroundColor :
+					main : '#313131'
+				}
+			},
+			overrides :
+			{
+				MuiAppBar :
+				{
+					colorPrimary :
 					{
-						doc     : 'The primary Fab buttons background color.',
-						format  : 'String',
-						default : '#5F9B2D'
-					},
-					'&:hover' :
-					{
-						backgroundColor :
-						{
-							doc     : 'The primary Fab buttons background color when in hover state.',
-							format  : 'String',
-							default : '#5F9B2D'
-						}
+						backgroundColor : '#313131'
 					}
 				},
-				secondary :
+				MuiButton :
 				{
-					backgroundColor :
+					containedPrimary :
 					{
-						doc     : 'The secondary Fab buttons background color.',
-						format  : 'String',
-						default : '#f50057'
-					},
-					'&:hover' :
-					{
-						backgroundColor :
+						backgroundColor : '#5F9B2D',
+						'&:hover'       :
 						{
-							doc     : 'The secondary Fab buttons background color when in hover state.',
-							format  : 'String',
-							default : '#f50057'
+							backgroundColor : '#5F9B2D'
+						}
+					},
+					containedSecondary :
+					{
+						backgroundColor : '#f50057',
+						'&:hover'       :
+						{
+							backgroundColor : '#f50057'
 						}
 					}
-				}
 
-			},
-			MuiBadge :
-			{
-				colorPrimary :
+				},
+
+				/*
+				MuiIconButton :
 				{
-					backgroundColor :
+					colorPrimary :
 					{
-						doc     : 'The badges background color.',
-						format  : 'String',
-						default : '#5F9B2D'
-					},
-					'&:hover' :
-					{
-						backgroundColor :
+						backgroundColor : '#5F9B2D',
+						'&:hover'	   :
 						{
-							doc     : 'The badges background color when in hover state.',
-							format  : 'String',
-							default : '#518029'
+							backgroundColor : '#5F9B2D'
+						}
+					},
+					colorSecondary :
+					{
+						backgroundColor : '#f50057',
+						'&:hover'	   :
+						{
+							backgroundColor : '#f50057'
+						}
+					}
+
+				},
+				*/
+
+				MuiFab :
+				{
+					primary :
+					{
+						backgroundColor : '#5F9B2D',
+						'&:hover'       :
+						{
+							backgroundColor : '#5F9B2D'
+						}
+					},
+					secondary :
+					{
+						backgroundColor : '#f50057',
+						'&:hover'       :
+						{
+							backgroundColor : '#f50057'
+						}
+					}
+
+				},
+				MuiBadge :
+				{
+					colorPrimary :
+					{
+						backgroundColor : '#5F9B2D',
+						'&:hover'       :
+						{
+							backgroundColor : '#518029'
 						}
 					}
 				}
-			}
-		},
-		typography :
-		{
-			useNextVariants :
+			},
+			typography :
 			{
-				format  : 'Boolean',
-				default : true
+				useNextVariants : true
 			}
 		}
 	}
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index b03f1c4d..7678895f 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -19,8 +19,8 @@ services:
     - ${PWD}/..:/edumeet
     - ${PWD}/config/edumeet-server-config.js:/edumeet/server/config/config.js:ro
     - ${PWD}/config/edumeet-server-config.yaml:/edumeet/server/config/config.yaml:ro
-    #- ${PWD}/config/edumeet-app-config.js:/edumeet/app/public/config/config.js:ro
-    - ${PWD}/../app/public/config/config.example.js:/edumeet/app/public/config/config.js:ro
+    - ${PWD}/config/edumeet-app-config.js:/edumeet/app/public/config/config.js:ro
+    #- ${PWD}/../app/public/config/config.example.js:/edumeet/app/public/config/config.js:ro
     network_mode: "host"
     extra_hosts:
       redis: 172.22.0.2