diff --git a/src/components/MusicAddModal/ListItem.tsx b/src/components/MusicAddModal/ListItem.tsx
index 91745d2..3a41f9b 100644
--- a/src/components/MusicAddModal/ListItem.tsx
+++ b/src/components/MusicAddModal/ListItem.tsx
@@ -51,6 +51,6 @@ export const styles = createStyle({
     width: '100%',
     alignItems: 'center',
     justifyContent: 'center',
-    borderWidth: BorderWidths.normal2,
+    borderWidth: BorderWidths.normal1,
   },
 })
diff --git a/src/components/MusicMultiAddModal/ListItem.tsx b/src/components/MusicMultiAddModal/ListItem.tsx
index 3d00535..149a61b 100644
--- a/src/components/MusicMultiAddModal/ListItem.tsx
+++ b/src/components/MusicMultiAddModal/ListItem.tsx
@@ -43,6 +43,6 @@ export const styles = createStyle({
     width: '100%',
     alignItems: 'center',
     justifyContent: 'center',
-    borderWidth: BorderWidths.normal2,
+    borderWidth: BorderWidths.normal1,
   },
 })
diff --git a/src/components/PageContent.tsx b/src/components/PageContent.tsx
index 4033041..9740767 100644
--- a/src/components/PageContent.tsx
+++ b/src/components/PageContent.tsx
@@ -44,18 +44,20 @@ export default ({ children }: Props) => {
     let isUnmounted = false
     let isDynamicBg = settingState.setting['theme.dynamicBg']
     const handlePicUpdate = () => {
-      if (playerState.musicInfo.pic && playerState.musicInfo.pic != playerState.loadErrorPicUrl) {
-        console.log('picUpdated', playerState.musicInfo.pic)
-        pic = playerState.musicInfo.pic
-        if (!isDynamicBg) return
-        void Image.prefetch(formatUri(playerState.musicInfo.pic)).then(() => {
-          if (pic != playerState.musicInfo.pic || isUnmounted) return
-          setPic(playerState.musicInfo.pic)
-        }).catch(() => {
-          if (isUnmounted) return
-          setPic(null)
-        })
-      } else if (playerState.loadErrorPicUrl == pic) {
+      if (playerState.musicInfo.pic) {
+        if (playerState.musicInfo.pic != playerState.loadErrorPicUrl) {
+          console.log('picUpdated', playerState.musicInfo.pic)
+          pic = playerState.musicInfo.pic
+          if (!isDynamicBg) return
+          void Image.prefetch(formatUri(playerState.musicInfo.pic)).then(() => {
+            if (pic != playerState.musicInfo.pic || isUnmounted) return
+            setPic(playerState.musicInfo.pic)
+          }).catch(() => {
+            if (isUnmounted) return
+            setPic(null)
+          })
+        }
+      } else {
         if (!isDynamicBg) return
         setPic(null)
       }
diff --git a/src/screens/Home/Views/Setting/settings/Theme/IsHideBgDark.tsx b/src/screens/Home/Views/Setting/settings/Theme/IsHideBgDark.tsx
index 165f297..6a8adc2 100644
--- a/src/screens/Home/Views/Setting/settings/Theme/IsHideBgDark.tsx
+++ b/src/screens/Home/Views/Setting/settings/Theme/IsHideBgDark.tsx
@@ -16,7 +16,7 @@ export default memo(() => {
   const setIsAutoTheme = (isHideBgDark: boolean) => {
     updateSetting({ 'theme.hideBgDark': isHideBgDark })
     void getTheme().then(theme => {
-      if (theme.id != 'black' && !settingState.setting['common.isAutoTheme']) return
+      if (!theme.isDark && !settingState.setting['common.isAutoTheme']) return
       applyTheme(theme)
     })
   }
diff --git a/src/theme/Typography.js b/src/theme/Typography.js
index 65049ac..8a3e6df 100644
--- a/src/theme/Typography.js
+++ b/src/theme/Typography.js
@@ -40,6 +40,7 @@ export const FontSizes = {
 
 export const BorderWidths = {
   normal: 0.4,
+  normal1: 0.6,
   normal2: 1,
   normal3: 1.4,
   normal4: 2,
diff --git a/src/theme/themes/createThemes.js b/src/theme/themes/createThemes.js
index 41f2990..201cabd 100644
--- a/src/theme/themes/createThemes.js
+++ b/src/theme/themes/createThemes.js
@@ -190,8 +190,8 @@ const defaultThemes = [
     name: '黑灯瞎火',
     isDark: true,
     config: {
-      primary: 'rgb(150, 150, 150)',
-      font: 'rgb(229, 229, 229)',
+      primary: 'rgb(190, 190, 190)',
+      font: 'rgb(255, 255, 255)',
       'c-app-background': 'rgba(0, 0, 0, 0)',
       'c-main-background': 'rgba(19, 19, 19, 0.95)',
       'bg-image': 'landingMoon.png',
diff --git a/src/theme/themes/index.ts b/src/theme/themes/index.ts
index 3814459..65f9f6f 100644
--- a/src/theme/themes/index.ts
+++ b/src/theme/themes/index.ts
@@ -5,14 +5,14 @@ import settingState from '@/store/setting/state'
 import themeState from '@/store/theme/state'
 import { isUrl } from '@/utils'
 import { externalDirectoryPath } from '@/utils/fs'
-import { type ImageSourceType } from '@/components/common/ImageBackground'
+import { type ImageSourcePropType } from 'react-native'
 
 export const BG_IMAGES = {
-  'china_ink.jpg': require('./images/china_ink.jpg') as ImageSourceType,
-  'jqbg.jpg': require('./images/jqbg.jpg') as ImageSourceType,
-  'landingMoon.png': require('./images/landingMoon2.png') as ImageSourceType,
-  'myzcbg.jpg': require('./images/myzcbg.jpg') as ImageSourceType,
-  'xnkl.png': require('./images/xnkl.png') as ImageSourceType,
+  'china_ink.jpg': require('./images/china_ink.jpg') as ImageSourcePropType,
+  'jqbg.jpg': require('./images/jqbg.jpg') as ImageSourcePropType,
+  'landingMoon.png': require('./images/landingMoon2.png') as ImageSourcePropType,
+  'myzcbg.jpg': require('./images/myzcbg.jpg') as ImageSourcePropType,
+  'xnkl.png': require('./images/xnkl.png') as ImageSourcePropType,
 } as const
 
 
@@ -46,7 +46,7 @@ type ColorsKey = keyof LX.Theme['config']['themeColors']
 type ExtInfoKey = keyof LX.Theme['config']['extInfo']
 const varColorRxp = /^var\((.+)\)$/
 export const buildActiveThemeColors = (theme: LX.Theme): LX.ActiveTheme => {
-  let bgImg: ImageSourceType | undefined
+  let bgImg: ImageSourcePropType | undefined
   if (theme.isCustom) {
     if (theme.config.extInfo['bg-image']) {
       theme.config.extInfo['bg-image'] =
@@ -57,7 +57,7 @@ export const buildActiveThemeColors = (theme: LX.Theme): LX.ActiveTheme => {
   } else {
     const extInfo = (theme as LocalTheme).config.extInfo
     if (extInfo['bg-image']) {
-      if (theme.id != 'black' || !settingState.setting['theme.hideBgDark']) bgImg = BG_IMAGES[extInfo['bg-image']]
+      if (!theme.isDark || !settingState.setting['theme.hideBgDark']) bgImg = BG_IMAGES[extInfo['bg-image']]
     }
   }
 
diff --git a/src/theme/themes/themes.ts b/src/theme/themes/themes.ts
index 4f2f850..c48ff10 100644
--- a/src/theme/themes/themes.ts
+++ b/src/theme/themes/themes.ts
@@ -2529,238 +2529,238 @@ export default [
     "isCustom": false,
     "config": {
       "themeColors": {
-        "c-primary": "rgb(150, 150, 150)",
-        "c-primary-dark-100": "rgb(171,171,171)",
-        "c-primary-dark-100-alpha-100": "rgba(171, 171, 171, 0.90)",
-        "c-primary-alpha-100": "rgba(150, 150, 150, 0.90)",
-        "c-primary-dark-100-alpha-200": "rgba(171, 171, 171, 0.80)",
-        "c-primary-alpha-200": "rgba(150, 150, 150, 0.80)",
-        "c-primary-dark-100-alpha-300": "rgba(171, 171, 171, 0.70)",
-        "c-primary-alpha-300": "rgba(150, 150, 150, 0.70)",
-        "c-primary-dark-100-alpha-400": "rgba(171, 171, 171, 0.60)",
-        "c-primary-alpha-400": "rgba(150, 150, 150, 0.60)",
-        "c-primary-dark-100-alpha-500": "rgba(171, 171, 171, 0.50)",
-        "c-primary-alpha-500": "rgba(150, 150, 150, 0.50)",
-        "c-primary-dark-100-alpha-600": "rgba(171, 171, 171, 0.40)",
-        "c-primary-alpha-600": "rgba(150, 150, 150, 0.40)",
-        "c-primary-dark-100-alpha-700": "rgba(171, 171, 171, 0.30)",
-        "c-primary-alpha-700": "rgba(150, 150, 150, 0.30)",
-        "c-primary-dark-100-alpha-800": "rgba(171, 171, 171, 0.20)",
-        "c-primary-alpha-800": "rgba(150, 150, 150, 0.20)",
-        "c-primary-dark-100-alpha-900": "rgba(171, 171, 171, 0.10)",
-        "c-primary-alpha-900": "rgba(150, 150, 150, 0.10)",
-        "c-primary-dark-200": "rgb(188,188,188)",
-        "c-primary-dark-200-alpha-100": "rgba(188, 188, 188, 0.90)",
-        "c-primary-dark-200-alpha-200": "rgba(188, 188, 188, 0.80)",
-        "c-primary-dark-200-alpha-300": "rgba(188, 188, 188, 0.70)",
-        "c-primary-dark-200-alpha-400": "rgba(188, 188, 188, 0.60)",
-        "c-primary-dark-200-alpha-500": "rgba(188, 188, 188, 0.50)",
-        "c-primary-dark-200-alpha-600": "rgba(188, 188, 188, 0.40)",
-        "c-primary-dark-200-alpha-700": "rgba(188, 188, 188, 0.30)",
-        "c-primary-dark-200-alpha-800": "rgba(188, 188, 188, 0.20)",
-        "c-primary-dark-200-alpha-900": "rgba(188, 188, 188, 0.10)",
-        "c-primary-dark-300": "rgb(201,201,201)",
-        "c-primary-dark-300-alpha-100": "rgba(201, 201, 201, 0.90)",
-        "c-primary-dark-300-alpha-200": "rgba(201, 201, 201, 0.80)",
-        "c-primary-dark-300-alpha-300": "rgba(201, 201, 201, 0.70)",
-        "c-primary-dark-300-alpha-400": "rgba(201, 201, 201, 0.60)",
-        "c-primary-dark-300-alpha-500": "rgba(201, 201, 201, 0.50)",
-        "c-primary-dark-300-alpha-600": "rgba(201, 201, 201, 0.40)",
-        "c-primary-dark-300-alpha-700": "rgba(201, 201, 201, 0.30)",
-        "c-primary-dark-300-alpha-800": "rgba(201, 201, 201, 0.20)",
-        "c-primary-dark-300-alpha-900": "rgba(201, 201, 201, 0.10)",
-        "c-primary-dark-400": "rgb(212,212,212)",
-        "c-primary-dark-400-alpha-100": "rgba(212, 212, 212, 0.90)",
-        "c-primary-dark-400-alpha-200": "rgba(212, 212, 212, 0.80)",
-        "c-primary-dark-400-alpha-300": "rgba(212, 212, 212, 0.70)",
-        "c-primary-dark-400-alpha-400": "rgba(212, 212, 212, 0.60)",
-        "c-primary-dark-400-alpha-500": "rgba(212, 212, 212, 0.50)",
-        "c-primary-dark-400-alpha-600": "rgba(212, 212, 212, 0.40)",
-        "c-primary-dark-400-alpha-700": "rgba(212, 212, 212, 0.30)",
-        "c-primary-dark-400-alpha-800": "rgba(212, 212, 212, 0.20)",
-        "c-primary-dark-400-alpha-900": "rgba(212, 212, 212, 0.10)",
-        "c-primary-dark-500": "rgb(221,221,221)",
-        "c-primary-dark-500-alpha-100": "rgba(221, 221, 221, 0.90)",
-        "c-primary-dark-500-alpha-200": "rgba(221, 221, 221, 0.80)",
-        "c-primary-dark-500-alpha-300": "rgba(221, 221, 221, 0.70)",
-        "c-primary-dark-500-alpha-400": "rgba(221, 221, 221, 0.60)",
-        "c-primary-dark-500-alpha-500": "rgba(221, 221, 221, 0.50)",
-        "c-primary-dark-500-alpha-600": "rgba(221, 221, 221, 0.40)",
-        "c-primary-dark-500-alpha-700": "rgba(221, 221, 221, 0.30)",
-        "c-primary-dark-500-alpha-800": "rgba(221, 221, 221, 0.20)",
-        "c-primary-dark-500-alpha-900": "rgba(221, 221, 221, 0.10)",
-        "c-primary-dark-600": "rgb(228,228,228)",
-        "c-primary-dark-600-alpha-100": "rgba(228, 228, 228, 0.90)",
-        "c-primary-dark-600-alpha-200": "rgba(228, 228, 228, 0.80)",
-        "c-primary-dark-600-alpha-300": "rgba(228, 228, 228, 0.70)",
-        "c-primary-dark-600-alpha-400": "rgba(228, 228, 228, 0.60)",
-        "c-primary-dark-600-alpha-500": "rgba(228, 228, 228, 0.50)",
-        "c-primary-dark-600-alpha-600": "rgba(228, 228, 228, 0.40)",
-        "c-primary-dark-600-alpha-700": "rgba(228, 228, 228, 0.30)",
-        "c-primary-dark-600-alpha-800": "rgba(228, 228, 228, 0.20)",
-        "c-primary-dark-600-alpha-900": "rgba(228, 228, 228, 0.10)",
-        "c-primary-dark-700": "rgb(233,233,233)",
-        "c-primary-dark-700-alpha-100": "rgba(233, 233, 233, 0.90)",
-        "c-primary-dark-700-alpha-200": "rgba(233, 233, 233, 0.80)",
-        "c-primary-dark-700-alpha-300": "rgba(233, 233, 233, 0.70)",
-        "c-primary-dark-700-alpha-400": "rgba(233, 233, 233, 0.60)",
-        "c-primary-dark-700-alpha-500": "rgba(233, 233, 233, 0.50)",
-        "c-primary-dark-700-alpha-600": "rgba(233, 233, 233, 0.40)",
-        "c-primary-dark-700-alpha-700": "rgba(233, 233, 233, 0.30)",
-        "c-primary-dark-700-alpha-800": "rgba(233, 233, 233, 0.20)",
-        "c-primary-dark-700-alpha-900": "rgba(233, 233, 233, 0.10)",
-        "c-primary-dark-800": "rgb(237,237,237)",
-        "c-primary-dark-800-alpha-100": "rgba(237, 237, 237, 0.90)",
-        "c-primary-dark-800-alpha-200": "rgba(237, 237, 237, 0.80)",
-        "c-primary-dark-800-alpha-300": "rgba(237, 237, 237, 0.70)",
-        "c-primary-dark-800-alpha-400": "rgba(237, 237, 237, 0.60)",
-        "c-primary-dark-800-alpha-500": "rgba(237, 237, 237, 0.50)",
-        "c-primary-dark-800-alpha-600": "rgba(237, 237, 237, 0.40)",
-        "c-primary-dark-800-alpha-700": "rgba(237, 237, 237, 0.30)",
-        "c-primary-dark-800-alpha-800": "rgba(237, 237, 237, 0.20)",
-        "c-primary-dark-800-alpha-900": "rgba(237, 237, 237, 0.10)",
-        "c-primary-dark-900": "rgb(241,241,241)",
-        "c-primary-dark-900-alpha-100": "rgba(241, 241, 241, 0.90)",
-        "c-primary-dark-900-alpha-200": "rgba(241, 241, 241, 0.80)",
-        "c-primary-dark-900-alpha-300": "rgba(241, 241, 241, 0.70)",
-        "c-primary-dark-900-alpha-400": "rgba(241, 241, 241, 0.60)",
-        "c-primary-dark-900-alpha-500": "rgba(241, 241, 241, 0.50)",
-        "c-primary-dark-900-alpha-600": "rgba(241, 241, 241, 0.40)",
-        "c-primary-dark-900-alpha-700": "rgba(241, 241, 241, 0.30)",
-        "c-primary-dark-900-alpha-800": "rgba(241, 241, 241, 0.20)",
-        "c-primary-dark-900-alpha-900": "rgba(241, 241, 241, 0.10)",
-        "c-primary-dark-1000": "rgb(244,244,244)",
-        "c-primary-dark-1000-alpha-100": "rgba(244, 244, 244, 0.90)",
-        "c-primary-dark-1000-alpha-200": "rgba(244, 244, 244, 0.80)",
-        "c-primary-dark-1000-alpha-300": "rgba(244, 244, 244, 0.70)",
-        "c-primary-dark-1000-alpha-400": "rgba(244, 244, 244, 0.60)",
-        "c-primary-dark-1000-alpha-500": "rgba(244, 244, 244, 0.50)",
-        "c-primary-dark-1000-alpha-600": "rgba(244, 244, 244, 0.40)",
-        "c-primary-dark-1000-alpha-700": "rgba(244, 244, 244, 0.30)",
-        "c-primary-dark-1000-alpha-800": "rgba(244, 244, 244, 0.20)",
-        "c-primary-dark-1000-alpha-900": "rgba(244, 244, 244, 0.10)",
-        "c-primary-light-100": "rgb(135,135,135)",
-        "c-primary-light-100-alpha-100": "rgba(135, 135, 135, 0.90)",
-        "c-primary-light-100-alpha-200": "rgba(135, 135, 135, 0.80)",
-        "c-primary-light-100-alpha-300": "rgba(135, 135, 135, 0.70)",
-        "c-primary-light-100-alpha-400": "rgba(135, 135, 135, 0.60)",
-        "c-primary-light-100-alpha-500": "rgba(135, 135, 135, 0.50)",
-        "c-primary-light-100-alpha-600": "rgba(135, 135, 135, 0.40)",
-        "c-primary-light-100-alpha-700": "rgba(135, 135, 135, 0.30)",
-        "c-primary-light-100-alpha-800": "rgba(135, 135, 135, 0.20)",
-        "c-primary-light-100-alpha-900": "rgba(135, 135, 135, 0.10)",
-        "c-primary-light-200": "rgb(122,122,122)",
-        "c-primary-light-200-alpha-100": "rgba(122, 122, 122, 0.90)",
-        "c-primary-light-200-alpha-200": "rgba(122, 122, 122, 0.80)",
-        "c-primary-light-200-alpha-300": "rgba(122, 122, 122, 0.70)",
-        "c-primary-light-200-alpha-400": "rgba(122, 122, 122, 0.60)",
-        "c-primary-light-200-alpha-500": "rgba(122, 122, 122, 0.50)",
-        "c-primary-light-200-alpha-600": "rgba(122, 122, 122, 0.40)",
-        "c-primary-light-200-alpha-700": "rgba(122, 122, 122, 0.30)",
-        "c-primary-light-200-alpha-800": "rgba(122, 122, 122, 0.20)",
-        "c-primary-light-200-alpha-900": "rgba(122, 122, 122, 0.10)",
-        "c-primary-light-300": "rgb(110,110,110)",
-        "c-primary-light-300-alpha-100": "rgba(110, 110, 110, 0.90)",
-        "c-primary-light-300-alpha-200": "rgba(110, 110, 110, 0.80)",
-        "c-primary-light-300-alpha-300": "rgba(110, 110, 110, 0.70)",
-        "c-primary-light-300-alpha-400": "rgba(110, 110, 110, 0.60)",
-        "c-primary-light-300-alpha-500": "rgba(110, 110, 110, 0.50)",
-        "c-primary-light-300-alpha-600": "rgba(110, 110, 110, 0.40)",
-        "c-primary-light-300-alpha-700": "rgba(110, 110, 110, 0.30)",
-        "c-primary-light-300-alpha-800": "rgba(110, 110, 110, 0.20)",
-        "c-primary-light-300-alpha-900": "rgba(110, 110, 110, 0.10)",
-        "c-primary-light-400": "rgb(99,99,99)",
-        "c-primary-light-400-alpha-100": "rgba(99, 99, 99, 0.90)",
-        "c-primary-light-400-alpha-200": "rgba(99, 99, 99, 0.80)",
-        "c-primary-light-400-alpha-300": "rgba(99, 99, 99, 0.70)",
-        "c-primary-light-400-alpha-400": "rgba(99, 99, 99, 0.60)",
-        "c-primary-light-400-alpha-500": "rgba(99, 99, 99, 0.50)",
-        "c-primary-light-400-alpha-600": "rgba(99, 99, 99, 0.40)",
-        "c-primary-light-400-alpha-700": "rgba(99, 99, 99, 0.30)",
-        "c-primary-light-400-alpha-800": "rgba(99, 99, 99, 0.20)",
-        "c-primary-light-400-alpha-900": "rgba(99, 99, 99, 0.10)",
-        "c-primary-light-500": "rgb(89,89,89)",
-        "c-primary-light-500-alpha-100": "rgba(89, 89, 89, 0.90)",
-        "c-primary-light-500-alpha-200": "rgba(89, 89, 89, 0.80)",
-        "c-primary-light-500-alpha-300": "rgba(89, 89, 89, 0.70)",
-        "c-primary-light-500-alpha-400": "rgba(89, 89, 89, 0.60)",
-        "c-primary-light-500-alpha-500": "rgba(89, 89, 89, 0.50)",
-        "c-primary-light-500-alpha-600": "rgba(89, 89, 89, 0.40)",
-        "c-primary-light-500-alpha-700": "rgba(89, 89, 89, 0.30)",
-        "c-primary-light-500-alpha-800": "rgba(89, 89, 89, 0.20)",
-        "c-primary-light-500-alpha-900": "rgba(89, 89, 89, 0.10)",
-        "c-primary-light-600": "rgb(80,80,80)",
-        "c-primary-light-600-alpha-100": "rgba(80, 80, 80, 0.90)",
-        "c-primary-light-600-alpha-200": "rgba(80, 80, 80, 0.80)",
-        "c-primary-light-600-alpha-300": "rgba(80, 80, 80, 0.70)",
-        "c-primary-light-600-alpha-400": "rgba(80, 80, 80, 0.60)",
-        "c-primary-light-600-alpha-500": "rgba(80, 80, 80, 0.50)",
-        "c-primary-light-600-alpha-600": "rgba(80, 80, 80, 0.40)",
-        "c-primary-light-600-alpha-700": "rgba(80, 80, 80, 0.30)",
-        "c-primary-light-600-alpha-800": "rgba(80, 80, 80, 0.20)",
-        "c-primary-light-600-alpha-900": "rgba(80, 80, 80, 0.10)",
-        "c-primary-light-700": "rgb(72,72,72)",
-        "c-primary-light-700-alpha-100": "rgba(72, 72, 72, 0.90)",
-        "c-primary-light-700-alpha-200": "rgba(72, 72, 72, 0.80)",
-        "c-primary-light-700-alpha-300": "rgba(72, 72, 72, 0.70)",
-        "c-primary-light-700-alpha-400": "rgba(72, 72, 72, 0.60)",
-        "c-primary-light-700-alpha-500": "rgba(72, 72, 72, 0.50)",
-        "c-primary-light-700-alpha-600": "rgba(72, 72, 72, 0.40)",
-        "c-primary-light-700-alpha-700": "rgba(72, 72, 72, 0.30)",
-        "c-primary-light-700-alpha-800": "rgba(72, 72, 72, 0.20)",
-        "c-primary-light-700-alpha-900": "rgba(72, 72, 72, 0.10)",
-        "c-primary-light-800": "rgb(65,65,65)",
-        "c-primary-light-800-alpha-100": "rgba(65, 65, 65, 0.90)",
-        "c-primary-light-800-alpha-200": "rgba(65, 65, 65, 0.80)",
-        "c-primary-light-800-alpha-300": "rgba(65, 65, 65, 0.70)",
-        "c-primary-light-800-alpha-400": "rgba(65, 65, 65, 0.60)",
-        "c-primary-light-800-alpha-500": "rgba(65, 65, 65, 0.50)",
-        "c-primary-light-800-alpha-600": "rgba(65, 65, 65, 0.40)",
-        "c-primary-light-800-alpha-700": "rgba(65, 65, 65, 0.30)",
-        "c-primary-light-800-alpha-800": "rgba(65, 65, 65, 0.20)",
-        "c-primary-light-800-alpha-900": "rgba(65, 65, 65, 0.10)",
-        "c-primary-light-900": "rgb(59,59,59)",
-        "c-primary-light-900-alpha-100": "rgba(59, 59, 59, 0.90)",
-        "c-primary-light-900-alpha-200": "rgba(59, 59, 59, 0.80)",
-        "c-primary-light-900-alpha-300": "rgba(59, 59, 59, 0.70)",
-        "c-primary-light-900-alpha-400": "rgba(59, 59, 59, 0.60)",
-        "c-primary-light-900-alpha-500": "rgba(59, 59, 59, 0.50)",
-        "c-primary-light-900-alpha-600": "rgba(59, 59, 59, 0.40)",
-        "c-primary-light-900-alpha-700": "rgba(59, 59, 59, 0.30)",
-        "c-primary-light-900-alpha-800": "rgba(59, 59, 59, 0.20)",
-        "c-primary-light-900-alpha-900": "rgba(59, 59, 59, 0.10)",
-        "c-primary-light-1000": "rgb(47,47,47)",
-        "c-primary-light-1000-alpha-100": "rgba(47, 47, 47, 0.90)",
-        "c-primary-light-1000-alpha-200": "rgba(47, 47, 47, 0.80)",
-        "c-primary-light-1000-alpha-300": "rgba(47, 47, 47, 0.70)",
-        "c-primary-light-1000-alpha-400": "rgba(47, 47, 47, 0.60)",
-        "c-primary-light-1000-alpha-500": "rgba(47, 47, 47, 0.50)",
-        "c-primary-light-1000-alpha-600": "rgba(47, 47, 47, 0.40)",
-        "c-primary-light-1000-alpha-700": "rgba(47, 47, 47, 0.30)",
-        "c-primary-light-1000-alpha-800": "rgba(47, 47, 47, 0.20)",
-        "c-primary-light-1000-alpha-900": "rgba(47, 47, 47, 0.10)",
-        "c-theme": "rgb(59,59,59)",
-        "c-1000": "rgb(229, 229, 229)",
-        "c-950": "rgb(218,218,218)",
-        "c-900": "rgb(207,207,207)",
-        "c-850": "rgb(197,197,197)",
-        "c-800": "rgb(187,187,187)",
-        "c-750": "rgb(178,178,178)",
-        "c-700": "rgb(169,169,169)",
-        "c-650": "rgb(161,161,161)",
-        "c-600": "rgb(153,153,153)",
-        "c-550": "rgb(145,145,145)",
-        "c-500": "rgb(138,138,138)",
-        "c-450": "rgb(131,131,131)",
-        "c-400": "rgb(124,124,124)",
-        "c-350": "rgb(118,118,118)",
-        "c-300": "rgb(112,112,112)",
-        "c-250": "rgb(106,106,106)",
-        "c-200": "rgb(101,101,101)",
-        "c-150": "rgb(96,96,96)",
-        "c-100": "rgb(91,91,91)",
-        "c-050": "rgb(86,86,86)",
-        "c-000": "rgb(82,82,82)"
+        "c-primary": "rgb(190, 190, 190)",
+        "c-primary-dark-100": "rgb(203,203,203)",
+        "c-primary-dark-100-alpha-100": "rgba(203, 203, 203, 0.90)",
+        "c-primary-alpha-100": "rgba(190, 190, 190, 0.90)",
+        "c-primary-dark-100-alpha-200": "rgba(203, 203, 203, 0.80)",
+        "c-primary-alpha-200": "rgba(190, 190, 190, 0.80)",
+        "c-primary-dark-100-alpha-300": "rgba(203, 203, 203, 0.70)",
+        "c-primary-alpha-300": "rgba(190, 190, 190, 0.70)",
+        "c-primary-dark-100-alpha-400": "rgba(203, 203, 203, 0.60)",
+        "c-primary-alpha-400": "rgba(190, 190, 190, 0.60)",
+        "c-primary-dark-100-alpha-500": "rgba(203, 203, 203, 0.50)",
+        "c-primary-alpha-500": "rgba(190, 190, 190, 0.50)",
+        "c-primary-dark-100-alpha-600": "rgba(203, 203, 203, 0.40)",
+        "c-primary-alpha-600": "rgba(190, 190, 190, 0.40)",
+        "c-primary-dark-100-alpha-700": "rgba(203, 203, 203, 0.30)",
+        "c-primary-alpha-700": "rgba(190, 190, 190, 0.30)",
+        "c-primary-dark-100-alpha-800": "rgba(203, 203, 203, 0.20)",
+        "c-primary-alpha-800": "rgba(190, 190, 190, 0.20)",
+        "c-primary-dark-100-alpha-900": "rgba(203, 203, 203, 0.10)",
+        "c-primary-alpha-900": "rgba(190, 190, 190, 0.10)",
+        "c-primary-dark-200": "rgb(213,213,213)",
+        "c-primary-dark-200-alpha-100": "rgba(213, 213, 213, 0.90)",
+        "c-primary-dark-200-alpha-200": "rgba(213, 213, 213, 0.80)",
+        "c-primary-dark-200-alpha-300": "rgba(213, 213, 213, 0.70)",
+        "c-primary-dark-200-alpha-400": "rgba(213, 213, 213, 0.60)",
+        "c-primary-dark-200-alpha-500": "rgba(213, 213, 213, 0.50)",
+        "c-primary-dark-200-alpha-600": "rgba(213, 213, 213, 0.40)",
+        "c-primary-dark-200-alpha-700": "rgba(213, 213, 213, 0.30)",
+        "c-primary-dark-200-alpha-800": "rgba(213, 213, 213, 0.20)",
+        "c-primary-dark-200-alpha-900": "rgba(213, 213, 213, 0.10)",
+        "c-primary-dark-300": "rgb(221,221,221)",
+        "c-primary-dark-300-alpha-100": "rgba(221, 221, 221, 0.90)",
+        "c-primary-dark-300-alpha-200": "rgba(221, 221, 221, 0.80)",
+        "c-primary-dark-300-alpha-300": "rgba(221, 221, 221, 0.70)",
+        "c-primary-dark-300-alpha-400": "rgba(221, 221, 221, 0.60)",
+        "c-primary-dark-300-alpha-500": "rgba(221, 221, 221, 0.50)",
+        "c-primary-dark-300-alpha-600": "rgba(221, 221, 221, 0.40)",
+        "c-primary-dark-300-alpha-700": "rgba(221, 221, 221, 0.30)",
+        "c-primary-dark-300-alpha-800": "rgba(221, 221, 221, 0.20)",
+        "c-primary-dark-300-alpha-900": "rgba(221, 221, 221, 0.10)",
+        "c-primary-dark-400": "rgb(228,228,228)",
+        "c-primary-dark-400-alpha-100": "rgba(228, 228, 228, 0.90)",
+        "c-primary-dark-400-alpha-200": "rgba(228, 228, 228, 0.80)",
+        "c-primary-dark-400-alpha-300": "rgba(228, 228, 228, 0.70)",
+        "c-primary-dark-400-alpha-400": "rgba(228, 228, 228, 0.60)",
+        "c-primary-dark-400-alpha-500": "rgba(228, 228, 228, 0.50)",
+        "c-primary-dark-400-alpha-600": "rgba(228, 228, 228, 0.40)",
+        "c-primary-dark-400-alpha-700": "rgba(228, 228, 228, 0.30)",
+        "c-primary-dark-400-alpha-800": "rgba(228, 228, 228, 0.20)",
+        "c-primary-dark-400-alpha-900": "rgba(228, 228, 228, 0.10)",
+        "c-primary-dark-500": "rgb(233,233,233)",
+        "c-primary-dark-500-alpha-100": "rgba(233, 233, 233, 0.90)",
+        "c-primary-dark-500-alpha-200": "rgba(233, 233, 233, 0.80)",
+        "c-primary-dark-500-alpha-300": "rgba(233, 233, 233, 0.70)",
+        "c-primary-dark-500-alpha-400": "rgba(233, 233, 233, 0.60)",
+        "c-primary-dark-500-alpha-500": "rgba(233, 233, 233, 0.50)",
+        "c-primary-dark-500-alpha-600": "rgba(233, 233, 233, 0.40)",
+        "c-primary-dark-500-alpha-700": "rgba(233, 233, 233, 0.30)",
+        "c-primary-dark-500-alpha-800": "rgba(233, 233, 233, 0.20)",
+        "c-primary-dark-500-alpha-900": "rgba(233, 233, 233, 0.10)",
+        "c-primary-dark-600": "rgb(237,237,237)",
+        "c-primary-dark-600-alpha-100": "rgba(237, 237, 237, 0.90)",
+        "c-primary-dark-600-alpha-200": "rgba(237, 237, 237, 0.80)",
+        "c-primary-dark-600-alpha-300": "rgba(237, 237, 237, 0.70)",
+        "c-primary-dark-600-alpha-400": "rgba(237, 237, 237, 0.60)",
+        "c-primary-dark-600-alpha-500": "rgba(237, 237, 237, 0.50)",
+        "c-primary-dark-600-alpha-600": "rgba(237, 237, 237, 0.40)",
+        "c-primary-dark-600-alpha-700": "rgba(237, 237, 237, 0.30)",
+        "c-primary-dark-600-alpha-800": "rgba(237, 237, 237, 0.20)",
+        "c-primary-dark-600-alpha-900": "rgba(237, 237, 237, 0.10)",
+        "c-primary-dark-700": "rgb(241,241,241)",
+        "c-primary-dark-700-alpha-100": "rgba(241, 241, 241, 0.90)",
+        "c-primary-dark-700-alpha-200": "rgba(241, 241, 241, 0.80)",
+        "c-primary-dark-700-alpha-300": "rgba(241, 241, 241, 0.70)",
+        "c-primary-dark-700-alpha-400": "rgba(241, 241, 241, 0.60)",
+        "c-primary-dark-700-alpha-500": "rgba(241, 241, 241, 0.50)",
+        "c-primary-dark-700-alpha-600": "rgba(241, 241, 241, 0.40)",
+        "c-primary-dark-700-alpha-700": "rgba(241, 241, 241, 0.30)",
+        "c-primary-dark-700-alpha-800": "rgba(241, 241, 241, 0.20)",
+        "c-primary-dark-700-alpha-900": "rgba(241, 241, 241, 0.10)",
+        "c-primary-dark-800": "rgb(244,244,244)",
+        "c-primary-dark-800-alpha-100": "rgba(244, 244, 244, 0.90)",
+        "c-primary-dark-800-alpha-200": "rgba(244, 244, 244, 0.80)",
+        "c-primary-dark-800-alpha-300": "rgba(244, 244, 244, 0.70)",
+        "c-primary-dark-800-alpha-400": "rgba(244, 244, 244, 0.60)",
+        "c-primary-dark-800-alpha-500": "rgba(244, 244, 244, 0.50)",
+        "c-primary-dark-800-alpha-600": "rgba(244, 244, 244, 0.40)",
+        "c-primary-dark-800-alpha-700": "rgba(244, 244, 244, 0.30)",
+        "c-primary-dark-800-alpha-800": "rgba(244, 244, 244, 0.20)",
+        "c-primary-dark-800-alpha-900": "rgba(244, 244, 244, 0.10)",
+        "c-primary-dark-900": "rgb(246,246,246)",
+        "c-primary-dark-900-alpha-100": "rgba(246, 246, 246, 0.90)",
+        "c-primary-dark-900-alpha-200": "rgba(246, 246, 246, 0.80)",
+        "c-primary-dark-900-alpha-300": "rgba(246, 246, 246, 0.70)",
+        "c-primary-dark-900-alpha-400": "rgba(246, 246, 246, 0.60)",
+        "c-primary-dark-900-alpha-500": "rgba(246, 246, 246, 0.50)",
+        "c-primary-dark-900-alpha-600": "rgba(246, 246, 246, 0.40)",
+        "c-primary-dark-900-alpha-700": "rgba(246, 246, 246, 0.30)",
+        "c-primary-dark-900-alpha-800": "rgba(246, 246, 246, 0.20)",
+        "c-primary-dark-900-alpha-900": "rgba(246, 246, 246, 0.10)",
+        "c-primary-dark-1000": "rgb(248,248,248)",
+        "c-primary-dark-1000-alpha-100": "rgba(248, 248, 248, 0.90)",
+        "c-primary-dark-1000-alpha-200": "rgba(248, 248, 248, 0.80)",
+        "c-primary-dark-1000-alpha-300": "rgba(248, 248, 248, 0.70)",
+        "c-primary-dark-1000-alpha-400": "rgba(248, 248, 248, 0.60)",
+        "c-primary-dark-1000-alpha-500": "rgba(248, 248, 248, 0.50)",
+        "c-primary-dark-1000-alpha-600": "rgba(248, 248, 248, 0.40)",
+        "c-primary-dark-1000-alpha-700": "rgba(248, 248, 248, 0.30)",
+        "c-primary-dark-1000-alpha-800": "rgba(248, 248, 248, 0.20)",
+        "c-primary-dark-1000-alpha-900": "rgba(248, 248, 248, 0.10)",
+        "c-primary-light-100": "rgb(171,171,171)",
+        "c-primary-light-100-alpha-100": "rgba(171, 171, 171, 0.90)",
+        "c-primary-light-100-alpha-200": "rgba(171, 171, 171, 0.80)",
+        "c-primary-light-100-alpha-300": "rgba(171, 171, 171, 0.70)",
+        "c-primary-light-100-alpha-400": "rgba(171, 171, 171, 0.60)",
+        "c-primary-light-100-alpha-500": "rgba(171, 171, 171, 0.50)",
+        "c-primary-light-100-alpha-600": "rgba(171, 171, 171, 0.40)",
+        "c-primary-light-100-alpha-700": "rgba(171, 171, 171, 0.30)",
+        "c-primary-light-100-alpha-800": "rgba(171, 171, 171, 0.20)",
+        "c-primary-light-100-alpha-900": "rgba(171, 171, 171, 0.10)",
+        "c-primary-light-200": "rgb(154,154,154)",
+        "c-primary-light-200-alpha-100": "rgba(154, 154, 154, 0.90)",
+        "c-primary-light-200-alpha-200": "rgba(154, 154, 154, 0.80)",
+        "c-primary-light-200-alpha-300": "rgba(154, 154, 154, 0.70)",
+        "c-primary-light-200-alpha-400": "rgba(154, 154, 154, 0.60)",
+        "c-primary-light-200-alpha-500": "rgba(154, 154, 154, 0.50)",
+        "c-primary-light-200-alpha-600": "rgba(154, 154, 154, 0.40)",
+        "c-primary-light-200-alpha-700": "rgba(154, 154, 154, 0.30)",
+        "c-primary-light-200-alpha-800": "rgba(154, 154, 154, 0.20)",
+        "c-primary-light-200-alpha-900": "rgba(154, 154, 154, 0.10)",
+        "c-primary-light-300": "rgb(139,139,139)",
+        "c-primary-light-300-alpha-100": "rgba(139, 139, 139, 0.90)",
+        "c-primary-light-300-alpha-200": "rgba(139, 139, 139, 0.80)",
+        "c-primary-light-300-alpha-300": "rgba(139, 139, 139, 0.70)",
+        "c-primary-light-300-alpha-400": "rgba(139, 139, 139, 0.60)",
+        "c-primary-light-300-alpha-500": "rgba(139, 139, 139, 0.50)",
+        "c-primary-light-300-alpha-600": "rgba(139, 139, 139, 0.40)",
+        "c-primary-light-300-alpha-700": "rgba(139, 139, 139, 0.30)",
+        "c-primary-light-300-alpha-800": "rgba(139, 139, 139, 0.20)",
+        "c-primary-light-300-alpha-900": "rgba(139, 139, 139, 0.10)",
+        "c-primary-light-400": "rgb(125,125,125)",
+        "c-primary-light-400-alpha-100": "rgba(125, 125, 125, 0.90)",
+        "c-primary-light-400-alpha-200": "rgba(125, 125, 125, 0.80)",
+        "c-primary-light-400-alpha-300": "rgba(125, 125, 125, 0.70)",
+        "c-primary-light-400-alpha-400": "rgba(125, 125, 125, 0.60)",
+        "c-primary-light-400-alpha-500": "rgba(125, 125, 125, 0.50)",
+        "c-primary-light-400-alpha-600": "rgba(125, 125, 125, 0.40)",
+        "c-primary-light-400-alpha-700": "rgba(125, 125, 125, 0.30)",
+        "c-primary-light-400-alpha-800": "rgba(125, 125, 125, 0.20)",
+        "c-primary-light-400-alpha-900": "rgba(125, 125, 125, 0.10)",
+        "c-primary-light-500": "rgb(113,113,113)",
+        "c-primary-light-500-alpha-100": "rgba(113, 113, 113, 0.90)",
+        "c-primary-light-500-alpha-200": "rgba(113, 113, 113, 0.80)",
+        "c-primary-light-500-alpha-300": "rgba(113, 113, 113, 0.70)",
+        "c-primary-light-500-alpha-400": "rgba(113, 113, 113, 0.60)",
+        "c-primary-light-500-alpha-500": "rgba(113, 113, 113, 0.50)",
+        "c-primary-light-500-alpha-600": "rgba(113, 113, 113, 0.40)",
+        "c-primary-light-500-alpha-700": "rgba(113, 113, 113, 0.30)",
+        "c-primary-light-500-alpha-800": "rgba(113, 113, 113, 0.20)",
+        "c-primary-light-500-alpha-900": "rgba(113, 113, 113, 0.10)",
+        "c-primary-light-600": "rgb(102,102,102)",
+        "c-primary-light-600-alpha-100": "rgba(102, 102, 102, 0.90)",
+        "c-primary-light-600-alpha-200": "rgba(102, 102, 102, 0.80)",
+        "c-primary-light-600-alpha-300": "rgba(102, 102, 102, 0.70)",
+        "c-primary-light-600-alpha-400": "rgba(102, 102, 102, 0.60)",
+        "c-primary-light-600-alpha-500": "rgba(102, 102, 102, 0.50)",
+        "c-primary-light-600-alpha-600": "rgba(102, 102, 102, 0.40)",
+        "c-primary-light-600-alpha-700": "rgba(102, 102, 102, 0.30)",
+        "c-primary-light-600-alpha-800": "rgba(102, 102, 102, 0.20)",
+        "c-primary-light-600-alpha-900": "rgba(102, 102, 102, 0.10)",
+        "c-primary-light-700": "rgb(92,92,92)",
+        "c-primary-light-700-alpha-100": "rgba(92, 92, 92, 0.90)",
+        "c-primary-light-700-alpha-200": "rgba(92, 92, 92, 0.80)",
+        "c-primary-light-700-alpha-300": "rgba(92, 92, 92, 0.70)",
+        "c-primary-light-700-alpha-400": "rgba(92, 92, 92, 0.60)",
+        "c-primary-light-700-alpha-500": "rgba(92, 92, 92, 0.50)",
+        "c-primary-light-700-alpha-600": "rgba(92, 92, 92, 0.40)",
+        "c-primary-light-700-alpha-700": "rgba(92, 92, 92, 0.30)",
+        "c-primary-light-700-alpha-800": "rgba(92, 92, 92, 0.20)",
+        "c-primary-light-700-alpha-900": "rgba(92, 92, 92, 0.10)",
+        "c-primary-light-800": "rgb(83,83,83)",
+        "c-primary-light-800-alpha-100": "rgba(83, 83, 83, 0.90)",
+        "c-primary-light-800-alpha-200": "rgba(83, 83, 83, 0.80)",
+        "c-primary-light-800-alpha-300": "rgba(83, 83, 83, 0.70)",
+        "c-primary-light-800-alpha-400": "rgba(83, 83, 83, 0.60)",
+        "c-primary-light-800-alpha-500": "rgba(83, 83, 83, 0.50)",
+        "c-primary-light-800-alpha-600": "rgba(83, 83, 83, 0.40)",
+        "c-primary-light-800-alpha-700": "rgba(83, 83, 83, 0.30)",
+        "c-primary-light-800-alpha-800": "rgba(83, 83, 83, 0.20)",
+        "c-primary-light-800-alpha-900": "rgba(83, 83, 83, 0.10)",
+        "c-primary-light-900": "rgb(75,75,75)",
+        "c-primary-light-900-alpha-100": "rgba(75, 75, 75, 0.90)",
+        "c-primary-light-900-alpha-200": "rgba(75, 75, 75, 0.80)",
+        "c-primary-light-900-alpha-300": "rgba(75, 75, 75, 0.70)",
+        "c-primary-light-900-alpha-400": "rgba(75, 75, 75, 0.60)",
+        "c-primary-light-900-alpha-500": "rgba(75, 75, 75, 0.50)",
+        "c-primary-light-900-alpha-600": "rgba(75, 75, 75, 0.40)",
+        "c-primary-light-900-alpha-700": "rgba(75, 75, 75, 0.30)",
+        "c-primary-light-900-alpha-800": "rgba(75, 75, 75, 0.20)",
+        "c-primary-light-900-alpha-900": "rgba(75, 75, 75, 0.10)",
+        "c-primary-light-1000": "rgb(49,49,49)",
+        "c-primary-light-1000-alpha-100": "rgba(49, 49, 49, 0.90)",
+        "c-primary-light-1000-alpha-200": "rgba(49, 49, 49, 0.80)",
+        "c-primary-light-1000-alpha-300": "rgba(49, 49, 49, 0.70)",
+        "c-primary-light-1000-alpha-400": "rgba(49, 49, 49, 0.60)",
+        "c-primary-light-1000-alpha-500": "rgba(49, 49, 49, 0.50)",
+        "c-primary-light-1000-alpha-600": "rgba(49, 49, 49, 0.40)",
+        "c-primary-light-1000-alpha-700": "rgba(49, 49, 49, 0.30)",
+        "c-primary-light-1000-alpha-800": "rgba(49, 49, 49, 0.20)",
+        "c-primary-light-1000-alpha-900": "rgba(49, 49, 49, 0.10)",
+        "c-theme": "rgb(75,75,75)",
+        "c-1000": "rgb(255, 255, 255)",
+        "c-950": "rgb(242,242,242)",
+        "c-900": "rgb(230,230,230)",
+        "c-850": "rgb(219,219,219)",
+        "c-800": "rgb(208,208,208)",
+        "c-750": "rgb(198,198,198)",
+        "c-700": "rgb(188,188,188)",
+        "c-650": "rgb(179,179,179)",
+        "c-600": "rgb(170,170,170)",
+        "c-550": "rgb(162,162,162)",
+        "c-500": "rgb(154,154,154)",
+        "c-450": "rgb(146,146,146)",
+        "c-400": "rgb(139,139,139)",
+        "c-350": "rgb(132,132,132)",
+        "c-300": "rgb(125,125,125)",
+        "c-250": "rgb(119,119,119)",
+        "c-200": "rgb(113,113,113)",
+        "c-150": "rgb(107,107,107)",
+        "c-100": "rgb(102,102,102)",
+        "c-050": "rgb(97,97,97)",
+        "c-000": "rgb(92,92,92)"
       },
       "extInfo": {
         "c-app-background": "rgba(0, 0, 0, 0)",
diff --git a/src/theme/themes/utils.js b/src/theme/themes/utils.js
index 93a4a63..ebd8205 100644
--- a/src/theme/themes/utils.js
+++ b/src/theme/themes/utils.js
@@ -22,7 +22,7 @@ exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark) => {
       colors[`c-primary-light-${i * 100}-alpha-${j * 100}`] = RGB_Alpha_Shade(0.1 * j, preColor)
     }
   }
-  preColor = RGB_Linear_Shade(isDark ? -0.2 : 1, preColor)
+  preColor = RGB_Linear_Shade(isDark ? -0.35 : 1, preColor)
   colors[`c-primary-light-${1000}`] = preColor
   for (let j = 1; j < 10; j += 1) {
     colors[`c-primary-light-${1000}-alpha-${j * 100}`] = RGB_Alpha_Shade(0.1 * j, preColor)