diff --git a/src/App.vue b/src/App.vue
index 76bffc39..6d159359 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-   <NavBar :title="name" :show="showUserNav" /> 
+   <NavBar :title="name" :show="showUserNav" :themeData="themeData" /> 
     <!-- <NavBar title="Fyre" :show="showUserNav" /> -->
 
     <!-- <div :class="[
@@ -59,6 +59,10 @@ export default {
   },
   data() {
     return {
+      themeData: {
+        themeColor: "",
+        logoPath: ""
+      },
       name: config.appName,
       hover: false,
       authToken: localStorage.getItem("authToken"),
@@ -98,6 +102,12 @@ export default {
               icon: "fas fa-user-plus",
               exactPath: true,
             },
+            {
+              href: "/admin/setting/org",
+              title: "Org",
+              icon: "fa fa-university",
+              exactPath: true,
+            },
             {
               href: "/admin/createapp",
               title: "Apps",
@@ -153,6 +163,11 @@ export default {
         this.isSubscribed = isSubscribed;
     })
 
+  
+    eventBus.$on("UpdateThemeEvent", (themeData) => {
+      Object.assign(this.themeData, { ...themeData })
+    })
+
     if(this.$route.meta.admin){
       this.showNavbar =
           window.location.pathname.includes("/admin/participants") ||
@@ -160,6 +175,7 @@ export default {
           window.location.pathname.includes("/admin/dashboard") ||
           window.location.pathname.includes("/admin/subscription") ||
           window.location.pathname.includes("/admin/teams") ||
+          window.location.pathname.includes("/admin/setting/org") ||
           window.location.pathname.includes("/admin/createapp") ?
           true :
           false;
@@ -175,6 +191,7 @@ export default {
           window.location.pathname.includes("/admin/dashboard") ||
           window.location.pathname.includes("/admin/subscription") ||
           window.location.pathname.includes("/admin/teams") ||
+      window.location.pathname.includes("/admin/setting/org") ||
           window.location.pathname.includes("/admin/createapp") ?
           true :
           false;
@@ -184,6 +201,7 @@ export default {
           window.location.pathname.includes("/admin/dashboard") ||
           window.location.pathname.includes("/admin/subscription") ||
           window.location.pathname.includes("/admin/teams") ||
+      window.location.pathname.includes("/admin/setting/org") ||
           window.location.pathname.includes("/admin/createapp") ?
           true :
           false;
diff --git a/src/components/participant/Action.vue b/src/components/participant/Action.vue
index 32dc9ef5..7bf0a426 100644
--- a/src/components/participant/Action.vue
+++ b/src/components/participant/Action.vue
@@ -6,7 +6,7 @@
     <template v-for="(actionItem, index) in ActionSchema">
       <component v-if="actionItem.type==='INFO_TEXT'" :is="CapitaliseString(actionItem.type)" :key="index"
         :idValue="index" :data="actionItem" :done="actionItem.isDone" :authToken="authToken"
-        @input="updateUserInfo(actionItem, $event)">
+        @input="updateUserInfo(actionItem, $event)" :themeData="themeData">
       </component>
     </template>
 
@@ -16,7 +16,7 @@
 
       <component v-if="actionItem.type!=='INFO_TEXT'" :is="CapitaliseString(actionItem.type)" :key="index"
         :idValue="index" :data="actionItem" :authToken="authToken" :done="actionItem.isDone"
-        @input="updateUserInfo(actionItem, $event)">
+        @input="updateUserInfo(actionItem, $event)"  :themeData="themeData">
       </component>
     </template>
   </div>
@@ -92,6 +92,10 @@ export default {
       required: true,
       type: Array,
     },
+    themeData:{
+      required: true,
+      type: Object,
+    }
   },
   components: {
     BinanceNetwork,
diff --git a/src/components/participant/ActionInputs/BinanceErc20.vue b/src/components/participant/ActionInputs/BinanceErc20.vue
index fc0b95d7..1f7bbf64 100644
--- a/src/components/participant/ActionInputs/BinanceErc20.vue
+++ b/src/components/participant/ActionInputs/BinanceErc20.vue
@@ -86,6 +86,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -94,8 +97,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BinanceErc721.vue b/src/components/participant/ActionInputs/BinanceErc721.vue
index 69c84276..a87d6e40 100644
--- a/src/components/participant/ActionInputs/BinanceErc721.vue
+++ b/src/components/participant/ActionInputs/BinanceErc721.vue
@@ -87,6 +87,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -95,8 +98,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BinanceNetwork.vue b/src/components/participant/ActionInputs/BinanceNetwork.vue
index 7a000bc5..2c9ad0bb 100644
--- a/src/components/participant/ActionInputs/BinanceNetwork.vue
+++ b/src/components/participant/ActionInputs/BinanceNetwork.vue
@@ -100,6 +100,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -108,8 +111,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainAvax.vue b/src/components/participant/ActionInputs/BlockchainAvax.vue
index 9c3de9ed..e1591bb4 100644
--- a/src/components/participant/ActionInputs/BlockchainAvax.vue
+++ b/src/components/participant/ActionInputs/BlockchainAvax.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainBsc.vue b/src/components/participant/ActionInputs/BlockchainBsc.vue
index 0a9db475..f34f9950 100644
--- a/src/components/participant/ActionInputs/BlockchainBsc.vue
+++ b/src/components/participant/ActionInputs/BlockchainBsc.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainCardano.vue b/src/components/participant/ActionInputs/BlockchainCardano.vue
index c8f36bd2..ca0ce0e9 100644
--- a/src/components/participant/ActionInputs/BlockchainCardano.vue
+++ b/src/components/participant/ActionInputs/BlockchainCardano.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainEth.vue b/src/components/participant/ActionInputs/BlockchainEth.vue
index d21108a3..3202c079 100644
--- a/src/components/participant/ActionInputs/BlockchainEth.vue
+++ b/src/components/participant/ActionInputs/BlockchainEth.vue
@@ -78,13 +78,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainMatic.vue b/src/components/participant/ActionInputs/BlockchainMatic.vue
index 0754d768..93cdebcd 100644
--- a/src/components/participant/ActionInputs/BlockchainMatic.vue
+++ b/src/components/participant/ActionInputs/BlockchainMatic.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainOne.vue b/src/components/participant/ActionInputs/BlockchainOne.vue
index f0968471..2eb7957a 100644
--- a/src/components/participant/ActionInputs/BlockchainOne.vue
+++ b/src/components/participant/ActionInputs/BlockchainOne.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainReef.vue b/src/components/participant/ActionInputs/BlockchainReef.vue
index 17a0490d..e6834759 100644
--- a/src/components/participant/ActionInputs/BlockchainReef.vue
+++ b/src/components/participant/ActionInputs/BlockchainReef.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/BlockchainTez.vue b/src/components/participant/ActionInputs/BlockchainTez.vue
index 274565c7..a893a77d 100644
--- a/src/components/participant/ActionInputs/BlockchainTez.vue
+++ b/src/components/participant/ActionInputs/BlockchainTez.vue
@@ -79,13 +79,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/DiscordJoin.vue b/src/components/participant/ActionInputs/DiscordJoin.vue
index a79dd2a6..23bc8459 100644
--- a/src/components/participant/ActionInputs/DiscordJoin.vue
+++ b/src/components/participant/ActionInputs/DiscordJoin.vue
@@ -91,13 +91,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/EthereumErc20.vue b/src/components/participant/ActionInputs/EthereumErc20.vue
index 61147ae4..fa680ed8 100644
--- a/src/components/participant/ActionInputs/EthereumErc20.vue
+++ b/src/components/participant/ActionInputs/EthereumErc20.vue
@@ -101,6 +101,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -109,8 +112,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/EthereumErc721.vue b/src/components/participant/ActionInputs/EthereumErc721.vue
index b8f4967d..93b06c5a 100644
--- a/src/components/participant/ActionInputs/EthereumErc721.vue
+++ b/src/components/participant/ActionInputs/EthereumErc721.vue
@@ -85,6 +85,9 @@ export default {
     },
     done: {
       required: true,
+    }, 
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -93,8 +96,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/EthereumNetwork.vue b/src/components/participant/ActionInputs/EthereumNetwork.vue
index 0cc6399b..fbbf9d14 100644
--- a/src/components/participant/ActionInputs/EthereumNetwork.vue
+++ b/src/components/participant/ActionInputs/EthereumNetwork.vue
@@ -92,6 +92,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -100,8 +103,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/HyperlinkUrl.vue b/src/components/participant/ActionInputs/HyperlinkUrl.vue
index dc640671..4d051099 100644
--- a/src/components/participant/ActionInputs/HyperlinkUrl.vue
+++ b/src/components/participant/ActionInputs/HyperlinkUrl.vue
@@ -101,12 +101,15 @@ export default {
     done: {
       required: true,
     },
+    themeData: {
+      required: true,
+    }
   },
   computed: {
     buttonThemeCss() {
       return {
-        "--button-bg-color": config.app.buttonBgColor,
-        "--button-text-color": config.app.buttonTextColor,
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       };
     },
   },
diff --git a/src/components/participant/ActionInputs/InputDate.vue b/src/components/participant/ActionInputs/InputDate.vue
index 18d464bc..cc6794d1 100644
--- a/src/components/participant/ActionInputs/InputDate.vue
+++ b/src/components/participant/ActionInputs/InputDate.vue
@@ -58,13 +58,16 @@ export default {
 		},
 		done: {
 			required: true,
+		},
+		themeData: {
+			required: true,
 		}
 	},
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+		  '--button-bg-color': this.themeData.buttonBGColor,
+		  '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/InputHyperlink.vue b/src/components/participant/ActionInputs/InputHyperlink.vue
index 6a8374e8..35bd8491 100644
--- a/src/components/participant/ActionInputs/InputHyperlink.vue
+++ b/src/components/participant/ActionInputs/InputHyperlink.vue
@@ -66,13 +66,16 @@ export default {
 		},
 		done: {
 			required: true,
+		},
+		themeData: {
+			required: true,
 		}
 	},
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+		  '--button-bg-color': this.themeData.buttonBGColor,
+		  '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/InputNumber.vue b/src/components/participant/ActionInputs/InputNumber.vue
index f09d1ac1..45e7e2c3 100644
--- a/src/components/participant/ActionInputs/InputNumber.vue
+++ b/src/components/participant/ActionInputs/InputNumber.vue
@@ -57,13 +57,16 @@ export default {
 		},
 		done: {
 			required: true,
+		},
+		themeData: {
+			required: true,
 		}
 	},
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+		  '--button-bg-color': this.themeData.buttonBGColor,
+		  '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/InputText.vue b/src/components/participant/ActionInputs/InputText.vue
index c7da9dac..5b826e49 100644
--- a/src/components/participant/ActionInputs/InputText.vue
+++ b/src/components/participant/ActionInputs/InputText.vue
@@ -77,13 +77,16 @@ export default {
     },
     done:{
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MaticErc20.vue b/src/components/participant/ActionInputs/MaticErc20.vue
index 8d44becb..b5c0b55a 100644
--- a/src/components/participant/ActionInputs/MaticErc20.vue
+++ b/src/components/participant/ActionInputs/MaticErc20.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MaticErc721.vue b/src/components/participant/ActionInputs/MaticErc721.vue
index de7963b1..7d9baaae 100644
--- a/src/components/participant/ActionInputs/MaticErc721.vue
+++ b/src/components/participant/ActionInputs/MaticErc721.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MaticNetwork.vue b/src/components/participant/ActionInputs/MaticNetwork.vue
index 1756aa02..6b3e260d 100644
--- a/src/components/participant/ActionInputs/MaticNetwork.vue
+++ b/src/components/participant/ActionInputs/MaticNetwork.vue
@@ -136,6 +136,9 @@ export default {
     done: {
       required: true,
     },
+    themeData: {
+      required: true,
+    }
   },
   components: {
     ErrorMessage,
@@ -143,8 +146,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MoonErc20.vue b/src/components/participant/ActionInputs/MoonErc20.vue
index 98ada8c0..9a40b75e 100644
--- a/src/components/participant/ActionInputs/MoonErc20.vue
+++ b/src/components/participant/ActionInputs/MoonErc20.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
    computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MoonErc721.vue b/src/components/participant/ActionInputs/MoonErc721.vue
index 7fa75281..df0c77af 100644
--- a/src/components/participant/ActionInputs/MoonErc721.vue
+++ b/src/components/participant/ActionInputs/MoonErc721.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
 
   },
@@ -93,8 +96,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MoonbeamErc20.vue b/src/components/participant/ActionInputs/MoonbeamErc20.vue
index abb70aeb..238ed99a 100644
--- a/src/components/participant/ActionInputs/MoonbeamErc20.vue
+++ b/src/components/participant/ActionInputs/MoonbeamErc20.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MoonbeamErc721.vue b/src/components/participant/ActionInputs/MoonbeamErc721.vue
index 7f03abd1..215a5d17 100644
--- a/src/components/participant/ActionInputs/MoonbeamErc721.vue
+++ b/src/components/participant/ActionInputs/MoonbeamErc721.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MoonriverErc20.vue b/src/components/participant/ActionInputs/MoonriverErc20.vue
index f06d1873..0bea9ed5 100644
--- a/src/components/participant/ActionInputs/MoonriverErc20.vue
+++ b/src/components/participant/ActionInputs/MoonriverErc20.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/MoonriverErc721.vue b/src/components/participant/ActionInputs/MoonriverErc721.vue
index 495e5116..b51eb3c6 100644
--- a/src/components/participant/ActionInputs/MoonriverErc721.vue
+++ b/src/components/participant/ActionInputs/MoonriverErc721.vue
@@ -84,6 +84,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -92,8 +95,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/PushNotification.vue b/src/components/participant/ActionInputs/PushNotification.vue
index 32292519..96a5512d 100644
--- a/src/components/participant/ActionInputs/PushNotification.vue
+++ b/src/components/participant/ActionInputs/PushNotification.vue
@@ -88,13 +88,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/ReefErc20.vue b/src/components/participant/ActionInputs/ReefErc20.vue
index 578cf839..9179bdcb 100644
--- a/src/components/participant/ActionInputs/ReefErc20.vue
+++ b/src/components/participant/ActionInputs/ReefErc20.vue
@@ -107,6 +107,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -115,8 +118,8 @@ export default {
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/ReefErc721.vue b/src/components/participant/ActionInputs/ReefErc721.vue
index ee690762..b0e1adbc 100644
--- a/src/components/participant/ActionInputs/ReefErc721.vue
+++ b/src/components/participant/ActionInputs/ReefErc721.vue
@@ -107,6 +107,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -114,10 +117,10 @@ export default {
   },
 computed:{
  buttonThemeCss() {
-      return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
-      }
+    return {
+      '--button-bg-color': this.themeData.buttonBGColor,
+      '--button-text-color': this.themeData.buttonTextColor
+    }
      }
   },
   data() {
diff --git a/src/components/participant/ActionInputs/SumsubKyc.vue b/src/components/participant/ActionInputs/SumsubKyc.vue
index b16171e0..2009e361 100644
--- a/src/components/participant/ActionInputs/SumsubKyc.vue
+++ b/src/components/participant/ActionInputs/SumsubKyc.vue
@@ -93,6 +93,9 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
   components: {
@@ -101,9 +104,9 @@ export default {
   },
 computed:{
  buttonThemeCss() {
-      return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+    return {
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/TelegramJoin.vue b/src/components/participant/ActionInputs/TelegramJoin.vue
index 83c5db06..495475fb 100644
--- a/src/components/participant/ActionInputs/TelegramJoin.vue
+++ b/src/components/participant/ActionInputs/TelegramJoin.vue
@@ -15,7 +15,7 @@
         </b-col>
         <b-col cols="2" sm="2" md="2">
           <b-badge class="btn-score" :style="buttonThemeCss" @click="update()" v-if="!done">
-            <img src="../../../assets/plus.svg" />
+            <img src="../../../assets/plus.svg"/>
             {{ data.score }}
           </b-badge>
           <img
@@ -81,13 +81,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/TwitterFollow.vue b/src/components/participant/ActionInputs/TwitterFollow.vue
index 12c3bfba..eb06790f 100644
--- a/src/components/participant/ActionInputs/TwitterFollow.vue
+++ b/src/components/participant/ActionInputs/TwitterFollow.vue
@@ -93,13 +93,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/ActionInputs/TwitterRetweet.vue b/src/components/participant/ActionInputs/TwitterRetweet.vue
index 074aea0a..dfce0ddf 100644
--- a/src/components/participant/ActionInputs/TwitterRetweet.vue
+++ b/src/components/participant/ActionInputs/TwitterRetweet.vue
@@ -99,13 +99,16 @@ export default {
     },
     done: {
       required: true,
+    },
+    themeData: {
+      required: true,
     }
   },
 computed:{
  buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData.buttonBGColor,
+        '--button-text-color': this.themeData.buttonTextColor
       }
      }
   },
diff --git a/src/components/participant/Login.vue b/src/components/participant/Login.vue
index d0b86f6b..aa4c5bc0 100644
--- a/src/components/participant/Login.vue
+++ b/src/components/participant/Login.vue
@@ -39,12 +39,13 @@ export default {
   props: {
     fontColor: String,
     themeColor: String,
+    themeData: Object
   },
   computed:{
         buttonThemeCss() {
       return {
-        '--button-bg-color': config.app.buttonBgColor,
-        '--button-text-color':config.app.buttonTextColor
+        '--button-bg-color': this.themeData && this.themeData.buttonBGColor ? this.themeData.buttonBGColor : config.app.buttonBgColor,
+        '--button-text-color': this.themeData && this.themeData.buttonTextColor ? this.themeData.buttonTextColor : config.app.buttonTextColor
       }
     }
   },
diff --git a/src/components/participant/NavBar.vue b/src/components/participant/NavBar.vue
index 9d19564b..c453901f 100644
--- a/src/components/participant/NavBar.vue
+++ b/src/components/participant/NavBar.vue
@@ -14,19 +14,19 @@ color: white !important;
 <template>
 	<b-navbar class="nav-bar" :style="themeCss" toggleable="lg" v-if="show">
 		<b-navbar-brand href="https://fyre.hypersign.id/" target="blank">
-			<img src="../../assets/Fyre_Small.png" height="50px">
+			<img v-if="themeData.logoPath" :src="themeData.logoPath" height="50px">
+			<img v-else src="../../assets/Fyre_Small.png" height="50px">
 		</b-navbar-brand>
-		<!-- <a href="#" class="menu ml-auto text-white text-decoration-none" v-if="authToken != '' && authToken != null" @click="logout">
-			<img src="../../assets/box-arrow-right.svg" height="30px">
-		</a> -->
-		<b-nav-item-dropdown size="sm" right class="btn-secondary m-2 menu ml-auto text-white text-decoration-none"
-			v-if="authToken != '' && authToken != null">
+		<b-nav-item-dropdown size="sm" right class=" m-2 menu ml-auto text-white text-decoration-none">
 			<template #button-content>
 				<b-icon style="color:white" icon="menu-button-wide"></b-icon>
 			</template>
 			<b-dropdown-item to="/user/home/">
-				Home</b-dropdown-item>
-			<b-dropdown-item @click="logout">Logout</b-dropdown-item>
+				Home
+			</b-dropdown-item>
+			<b-dropdown-item @click="logout" v-if="authToken != '' && authToken != null">
+				Logout
+			</b-dropdown-item>
 		</b-nav-item-dropdown>
 	</b-navbar>
 </template>
@@ -44,12 +44,16 @@ export default {
 		show: {
 			required: true,
 			type: Boolean
+		},
+		themeData: {
+			required: true,
+			type:Object 
 		}
 	},
 	computed: {
 		themeCss(){
 			return{
-				'--theme-bg-color':config.app.themeBgColor
+				'--theme-bg-color': this.themeData.themeColor ? this.themeData.themeColor : config.app.themeBgColor
 			}
 		}
 	},
diff --git a/src/config.js b/src/config.js
index dcf617b5..98e052b6 100644
--- a/src/config.js
+++ b/src/config.js
@@ -9,8 +9,8 @@ const config = {
         version: process.env.VUE_APP_VERSION,
         buttonBgColor: process.env.VUE_APP_BTN_BACKGROUND || "#f1b319",
         buttonTextColor: process.env.VUE_APP_BTN_TXT_COLOR || "black",
-        headerBGColor:process.env.VUE_APP_HEADER_BACKGROUND || "rgba(241, 179, 25, 0.24)",
-        headerTextColor:process.env.VUE_APP_HEADER_TEXT_COLOR || "#212529"
+        headerBGColor: process.env.VUE_APP_HEADER_BACKGROUND || "rgba(241, 179, 25, 0.24)",
+        headerTextColor: process.env.VUE_APP_HEADER_TEXT_COLOR || "#212529",
         themeBgColor: process.env.VUE_APP_THEME_BACKGROUND || "rgb(54, 55, 64)",
     },
     recaptchaSiteKey: process.env.VUE_APP_RECAPTCHA_SITE_KEY,
diff --git a/src/router.js b/src/router.js
index 8294808a..3953448d 100644
--- a/src/router.js
+++ b/src/router.js
@@ -97,6 +97,20 @@ const router = new Router({
                 title: `${config.appName} - Teams`
             },
         },
+        {
+            path: "/admin/setting/org",
+            name: "Org",
+            component: () =>
+                import (
+                    /* webpackChunkName: "dashboard" */
+                    "./views/admin/setting/OrgSetting.vue"
+                ),
+            meta: {
+                requiresAuth: true,
+                admin: true,
+                title: `${config.appName} - Org`
+            },
+        },
         {
             path: "/admin/createapp",
             name: "CreateApp",
diff --git a/src/views/admin/TeamMate.vue b/src/views/admin/TeamMate.vue
index aaedb502..8fe19280 100644
--- a/src/views/admin/TeamMate.vue
+++ b/src/views/admin/TeamMate.vue
@@ -1,36 +1,4 @@
 <style scoped>
-.addmargin {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-.vue-logo-back {
-  background-color: var(--button-text-color);
-}
-
-.logo {
-  width: 144px;
-}
-
-.fullbody {
-  width: 100%;
-}
-.floatLeft {
-  float: left;
-}
-
-.floatRight {
-  float: right;
-}
-
-.noBullet {
-  list-style-type: none;
-}
-
-.title {
-  color: grey;
-  font-size: 18px;
-}
 .button-theme{
   background-color:  var(--button-bg-color);
   border-collapse: var(--button-bg-color);
diff --git a/src/views/admin/setting/OrgSetting.vue b/src/views/admin/setting/OrgSetting.vue
new file mode 100644
index 00000000..b88fa5f6
--- /dev/null
+++ b/src/views/admin/setting/OrgSetting.vue
@@ -0,0 +1,311 @@
+<template>
+    <div class="home marginLeft marginRight">
+        <loading :active.sync="isLoading" :can-cancel="true" :is-full-page="true"></loading>
+        <h3>Org Setting</h3>
+        <div class="row">
+            <div class="col-md-10">
+
+                <div class="card">
+                    <div class="card-body">
+
+                        <div class="row g-3 align-items-center w-100 mt-4">
+                            <div class="text-left col-lg-8 col-md-8 text-left">
+                                <tool-tips infoMessage="Enter color in HEX format"></tool-tips><label for="name"
+                                    class="col-form-label">Theme Color
+                                    <span style="color: red">*</span>:
+                                </label>
+                            </div>
+                            <div class="col-lg-4 col-md-4 px-0">
+                                <input type="color" id="name" v-model="orgSetting.themeColor" class="form-control w-100"
+                                    :placeholder="themeColor" />
+                            </div>
+                        </div>
+                        <div class="row g-3 align-items-center w-100 mt-4">
+                            <div class="text-left col-lg-8 col-md-8 text-left">
+                                <tool-tips infoMessage="Enter color in HEX format"></tool-tips><label for="name"
+                                    class="col-form-label">Button Color
+                                    <span style="color: red">*</span>:
+                                </label>
+                            </div>
+                            <div class="col-lg-4 col-md-4 px-0">
+                                <input type="color" id="name" v-model="orgSetting.buttonBGColor"
+                                    class="form-control w-100" :placeholder="buttonBGColor" />
+                            </div>
+                        </div>
+                        <div class="row g-3 align-items-center w-100 mt-4">
+                            <div class="text-left col-lg-8 col-md-8 text-left">
+                                <tool-tips infoMessage="Enter color in HEX format"></tool-tips><label for="name"
+                                    class="col-form-label">Button Font Color
+                                    <span style="color: red">*</span>:
+                                </label>
+                            </div>
+                            <div class="col-lg-4 col-md-4 px-0">
+                                <input type="color" id="name" v-model="orgSetting.buttonTextColor"
+                                    class="form-control w-100" :placeholder="buttonTextColor" />
+                            </div>
+                        </div>
+                        <div class="row g-3 align-items-center w-100 mt-4">
+                            <div class="text-left col-lg-8 col-md-8 text-left">
+                                <tool-tips infoMessage="Enter logo path"></tool-tips><label for="name"
+                                    class="col-form-label">Logo Path
+                                    <span style="color: red">*</span>:
+                                </label>
+                            </div>
+                            <div class="col-lg-4 col-md-4 px-0">
+                                <input type="text" id="name" v-model="orgSetting.logoPath" class="form-control w-100" />
+                            </div>
+                        </div>
+                        <div class="row g-3 align-items-center w-100 mt-4" style="float:right; padding-right: 1.5%">
+                            <div class="text-left col-lg-6 col-md-6 text-right">
+
+                            </div>
+
+                            <div class="text-left col-lg-6 col-md-6 text-right">
+                                <button class="btn  button-theme" :style="buttonThemeCss" type="submit"
+                                    @click="update">Update</button>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import ToolTips from "../../../components/basic/toolTips";
+import config from "../../../config"
+import Loading from "vue-loading-overlay";
+import "vue-loading-overlay/dist/vue-loading.css";
+import Messages from "../../../utils/messages/admin/en"
+import PreviewConfig from "../../../components/admin/createProjectSlider/components/PreviewConfig.vue";
+import notificationMixins from "../../../mixins/notificationMixins";
+import {
+    isValidURL
+} from "../../../mixins/fieldValidationMixin";
+export default {
+    name: "OrgSetting",
+    components: { Loading, ToolTips, PreviewConfig },
+    computed: {
+        buttonThemeCss() {
+            return {
+                '--button-bg-color': config.app.buttonBgColor,
+                '--button-text-color': config.app.buttonTextColor
+            }
+        }
+    },
+    data(){
+        return{
+            orgSetting: {
+                buttonBGColor: "#f1b319",
+                buttonTextColor: "#000000",
+                themeColor: "#363740",
+                logoPath: "",
+                _id:"",
+            },
+            isLoading: false,
+            authToken: localStorage.getItem("authToken"),
+            project: {
+                "isArchived": false,
+                "investorsCount": 5,
+                "tags": [
+                    {
+                        "type": "PLAY2EARN_TAG",
+                        "id": "TAGS_0"
+                    }
+                ],
+                "_id": "62b6e0506616ed23f7dd96e1",
+                "projectName": "Kelros Test",
+                "logoUrl": "https://i.ibb.co/f8xqFj0/Screenshot-2022-07-06-122507.png",
+                "did": "did:hs:9e62dad7-ceb8-4576-ac96-551f31e8e008",
+                "fromDate": "2022-07-14 03:52:00",
+                "toDate": "2022-08-19 10:14:00",
+                "ownerDid": "vishwasbhushan001@gmail.com",
+                "projectStatus": true,
+                "slug": "kelros-test-1",
+                "isNotificaionEnabled": false,
+                "createdAt": "2022-06-25T10:15:44.515Z",
+                "updatedAt": "2022-06-25T10:15:44.515Z",
+                "refereePoint": 10,
+                "referralPoint": 5,
+                "__v": 0,
+                "actions": [
+                    {
+                        "_id": "62b6e0506616ed23f7dd96e5",
+                        "eventId": "62b6e0506616ed23f7dd96e1",
+                        "order": 1,
+                        "type": "PUSH_NOTIFICATION",
+                        "title": "Subscribe  Notification",
+                        "score": 5,
+                        "isManadatory": true,
+                        "value": "",
+                        "placeHolder": "Subscription",
+                        "__v": 0
+                    },
+                    {
+                        "_id": "62d03bad4bbeb4643547b187",
+                        "eventId": "62b6e0506616ed23f7dd96e1",
+                        "order": 3,
+                        "type": "TWITTER_FOLLOW",
+                        "title": "Follow our twitter handle",
+                        "placeHolder": "",
+                        "isManadatory": true,
+                        "value": "hypersignchain",
+                        "score": 10,
+                        "slug": "",
+                        "__v": 0
+                    },
+                    {
+                        "_id": "62d03bbc4bbeb4643547b194",
+                        "eventId": "62b6e0506616ed23f7dd96e1",
+                        "order": 4,
+                        "type": "TELEGRAM_JOIN",
+                        "title": "Join our Telegram channel",
+                        "placeHolder": "",
+                        "isManadatory": true,
+                        "value": "hypersignchain",
+                        "score": 10,
+                        "slug": "",
+                        "__v": 0
+                    },
+                    {
+                        "_id": "62d03beb4bbeb4643547b1a2",
+                        "eventId": "62b6e0506616ed23f7dd96e1",
+                        "order": 5,
+                        "type": "DISCORD_JOIN",
+                        "title": "Join our Discord server",
+                        "placeHolder": "",
+                        "isManadatory": true,
+                        "value": "https://discord.gg/SfzezRJq",
+                        "score": 10,
+                        "slug": "",
+                        "__v": 0
+                    }
+                ],
+                "whitelisting_link": "http://localhost:9002/form/kelros-test-1",
+                "investors_link": "http://localhost:9002/admin/participants?projectId=62b6e0506616ed23f7dd96e1",
+                "social": {
+                    "twitter": {
+                        "isEnabled": true,
+                        "twitterHandle": "__vue_devtool_undefined__",
+                        "twitterPostFormat": "__vue_devtool_undefined__"
+                    },
+                    "telegram": {
+                        "isEnabled": true,
+                        "telegramHandle": "__vue_devtool_undefined__",
+                        "telegramAnnouncementChannel": "__vue_devtool_undefined__"
+                    }
+                }
+            }
+        }
+    },
+    async created(){
+        try{
+            const url = `${this.$config.studioServer.BASE_URL}api/v1/admin/org`;
+
+            const resp = await fetch(url, {
+                headers: this.getHeaders(),
+                method: "GET",
+            });
+
+            if (!resp.ok) {
+                return this.notifyErr(resp.statusText);
+            } else {
+                const result = await resp.json();
+                console.log(result)
+                Object.assign(this.orgSetting, {...result})
+            }
+        }catch(e){
+
+        }
+    },
+    methods: {
+        checkIfValidHex(hex){
+            
+            if(hex){
+                if (!hex.startsWith("#")){
+                    throw new Error('Color in HEX format should start with #')
+                }
+
+                if (hex.length != 7) {
+                    throw new Error('Color is not in HEX format')
+                }
+            } else{
+                throw new Error('Color can not be empty')
+            }
+        },
+        isAllFieldsValid(){
+            if (!this.orgSetting.buttonBGColor){
+                throw new Error('Button background color can not be empty')
+            }
+            if (!this.orgSetting.buttonTextColor) {
+                throw new Error('Button font color can not be empty')
+            }
+            if (!this.orgSetting.themeColor) {
+                throw new Error('Theme color can not be empty')
+            }
+            if (!isValidURL(this.orgSetting.logoPath)){
+                throw new Error('Invalid URL')
+            }
+
+            this.checkIfValidHex(this.orgSetting.buttonBGColor)
+            this.checkIfValidHex(this.orgSetting.buttonTextColor)
+            this.checkIfValidHex(this.orgSetting.themeColor)
+        },
+        getHeaders(){
+            let headers = {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${this.authToken}`,
+            };
+
+            return headers;
+        },
+        async update(){
+            try{
+
+                this.isLoading = true;
+
+                this.isAllFieldsValid()
+                
+                const url = `${this.$config.studioServer.BASE_URL}api/v1/admin/org`;
+                const resp = await fetch(url, {
+                    method: "PUT",
+                    body: JSON.stringify({
+                        ...this.orgSetting
+                    }),
+                    headers: this.getHeaders(),
+                });
+
+                const json = await resp.json();
+                if (json) {
+                    if (!resp.ok) {
+                        return this.notifyErr(json);
+                    } else {
+                        this.notifySuccess(Messages.APP.APP_UPDATED_SUCCESSFULLY);                        
+                    }
+                } else {
+                    throw new Error("Error while updating your setting");
+                }
+            }catch(e){
+                this.notifyErr(e)
+            } finally {
+                this.isLoading = false;
+            }
+        }
+    },
+    mixins: [notificationMixins],
+
+}
+
+</script>
+
+<style scoped>
+.button-theme {
+    background-color: var(--button-bg-color);
+    border-collapse: var(--button-bg-color);
+    color: var(--button-text-color);
+    border: 0;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/participant/Event.vue b/src/views/participant/Event.vue
index 1a3d8a2b..df85c51c 100644
--- a/src/views/participant/Event.vue
+++ b/src/views/participant/Event.vue
@@ -11,17 +11,18 @@
     </b-card>
 
     <template v-if="authToken == '' || authToken == null">
-      <Login class="mx-auto overflow-hidden mt-3 border-0 mainContentWdth" :themeColor="eventData.themeColor"
-        :fontColor="eventData.fontColor" @AuthTokenUpdateEvent="updateAuthentication" />
+      <Login class="mx-auto overflow-hidden mt-3 border-0 mainContentWdth" :themeData="eventData.orgData"
+        @AuthTokenUpdateEvent="updateAuthentication" />
 
       <!-- <Action v-if="eventData.projectStatus" :userProfile="null" :ActionSchema="eventActionsToShow"
         :prizeData="prizeData" @UserUpdateEvent="updateUserData" /> -->
     </template>
 
     <template>
-      <Action v-if="eventData.projectStatus" :userProfile="Object.keys(userProfileData).length > 0 ? userProfileData : null"
+      <Action v-if="eventData.projectStatus"
+        :userProfile="Object.keys(userProfileData).length > 0 ? userProfileData : null"
         :ActionSchema="eventActionsToShow" :authToken="authToken" :prizeData="prizeData"
-        @UserUpdateEvent="updateUserData" />
+        @UserUpdateEvent="updateUserData" :themeData="eventData.orgData" />
     </template>
 
     <template v-if="authToken != '' && authToken != null">
@@ -29,7 +30,8 @@
 
       <div class="footer mx-auto overflow-hidden mainContentWdth" style="align-items:center;padding-top:20px">
         <b>Disclaimer:</b>
-        Anyone can create campaigns on {{appName}}, rewards are distributed by the campaign creator and {{appName}} is not
+        Anyone can create campaigns on {{appName}}, rewards are distributed by the campaign creator and {{appName}} is
+        not
         responsible for reward distribution.
       </div>
     </template>
@@ -216,6 +218,34 @@ export default {
         this.eventData = {
           ...resp.data
                 }
+        
+        // If it is old event then just recreating this variable using default values from config
+        if (!this.eventData['orgData']){
+          this.eventData['orgData'] = {}
+          if (!this.eventData['orgData'].buttonBGColor){
+            this.eventData['orgData'].buttonBGColor = config.app.buttonBgColor
+          }
+
+          if (!this.eventData['orgData'].buttonTextColor) {
+            this.eventData['orgData'].buttonTextColor = config.app.buttonTextColor
+          }
+
+          if (!this.eventData['orgData'].themeColor) {
+            this.eventData['orgData'].themeColor = config.app.themeBgColor
+          }
+        } 
+
+        eventBus.$emit('UpdateThemeEvent', { 
+          logoPath: this.eventData['orgData'].logoPath,
+          themeColor: this.eventData['orgData'].themeColor
+        })
+
+        ///  deleting data wich is not required.
+        delete this.eventData['orgData'].logoPath
+        delete this.eventData['orgData'].themeColor
+        delete this.eventData['orgData'].adminId
+        delete this.eventData['orgData'].subDomain
+        delete this.eventData['orgData']._id
       } else {
         this.notifyErr(Messages.EVENT.INVALID_PROJECT_SLUG)
       }