diff --git a/components/themes.tsx b/components/themes.tsx
index a9cf0ab..6fd698c 100644
--- a/components/themes.tsx
+++ b/components/themes.tsx
@@ -29,7 +29,7 @@ export const lightTheme: DefaultTheme = {
   colors: {
     background: '#ffffff',
     primary: '#00aaff',
-    secondary:'#ffaa00',
+    secondary:'#ff5300',
     online: '#00ff00',
     loading: '#ff5300',
     offline: '#ff0000',
@@ -42,7 +42,7 @@ export const darkTheme: DefaultTheme = {
   colors: {
     background: '#1f1f1f',
     primary: '#00aaff',
-    secondary:'#ffaa00',
+    secondary:'#ff5300',
     online: '#00ff00',
     loading: '#ff5300',
     offline: '#ff0000',
@@ -55,7 +55,7 @@ export const amoledTheme: DefaultTheme = {
   colors: {
     background: '#000000',
     primary: '#00aaff',
-    secondary:'#ffaa00',
+    secondary:'#ff5300',
     online: '#00ff00',
     loading: '#ff5300',
     offline: '#ff0000',
diff --git a/components/themeselector.tsx b/components/themeselector.tsx
index cd1bbd4..e3e6ec1 100644
--- a/components/themeselector.tsx
+++ b/components/themeselector.tsx
@@ -16,6 +16,10 @@ export const StyleSelector = () => {
   const currentTheme = useContext(ThemeContext);
   const [selectedTheme, setSelectedTheme] = useState(themes[currentTheme.themeId]);
 
+  if(currentTheme !== selectedTheme) {
+    setSelectedTheme(currentTheme);
+  }
+
   const updateThemeWithStorage = (newTheme: DefaultTheme) => {
 
     if (newTheme.themeId === lightTheme.themeId) {