diff --git a/feature/debug/src/main/res/values/colors.xml b/feature/debug/src/main/res/values/colors.xml
index 982aed66..0b82611f 100644
--- a/feature/debug/src/main/res/values/colors.xml
+++ b/feature/debug/src/main/res/values/colors.xml
@@ -16,6 +16,8 @@
     <color name="error">#DA000E</color>
     <color name="success">#008753</color>
 
+    <color name="ui_primary">@color/colorOnErrorContainerLight</color>
+
     <!-- Launcher icon -->
     <color name="launcher_fg">@android:color/system_neutral2_700</color>
     <color name="launcher_bg">@android:color/background_light</color>
diff --git a/shared/ui/src/main/res/values-v31/base_colors.xml b/shared/ui/src/main/res/values-v31/base_colors.xml
deleted file mode 100644
index 49eb7c0c..00000000
--- a/shared/ui/src/main/res/values-v31/base_colors.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-    <color name="base_colorPrimary">@color/material_dynamic_primary40</color>
-    <color name="base_colorOnPrimary">#FFFFFF</color>
-    <color name="base_colorPrimaryContainer">@color/material_dynamic_primary90</color>
-    <color name="base_colorOnPrimaryContainer">@color/material_dynamic_primary10</color>
-    <color name="base_colorPrimaryInverse">@color/material_dynamic_primary80</color>
-    <color name="base_colorPrimaryFixed">@color/material_dynamic_primary90</color>
-    <color name="base_colorPrimaryFixedDim">@color/material_dynamic_primary80</color>
-    <color name="base_colorOnPrimaryFixed">@color/material_dynamic_primary10</color>
-    <color name="base_colorOnPrimaryFixedVariant">@color/material_dynamic_primary30</color>
-    <color name="base_colorSecondary">@color/material_dynamic_secondary40</color>
-    <color name="base_colorOnSecondary">#FFFFFF</color>
-    <color name="base_colorSecondaryContainer">@color/material_dynamic_secondary90</color>
-    <color name="base_colorOnSecondaryContainer">@color/material_dynamic_secondary10</color>
-    <color name="base_colorSecondaryFixed">@color/material_dynamic_secondary90</color>
-    <color name="base_colorSecondaryFixedDim">@color/material_dynamic_secondary80</color>
-    <color name="base_colorOnSecondaryFixed">@color/material_dynamic_secondary10</color>
-    <color name="base_colorOnSecondaryFixedVariant">@color/material_dynamic_secondary30</color>
-    <color name="base_colorTertiary">@color/material_dynamic_tertiary40</color>
-    <color name="base_colorOnTertiary">#FFFFFF</color>
-    <color name="base_colorTertiaryContainer">@color/material_dynamic_tertiary90</color>
-    <color name="base_colorOnTertiaryContainer">@color/material_dynamic_tertiary10</color>
-    <color name="base_colorTertiaryFixed">@color/material_dynamic_tertiary90</color>
-    <color name="base_colorTertiaryFixedDim">@color/material_dynamic_tertiary80</color>
-    <color name="base_colorOnTertiaryFixed">@color/material_dynamic_tertiary10</color>
-    <color name="base_colorOnTertiaryFixedVariant">@color/material_dynamic_tertiary30</color>
-    <color name="base_colorError">#B3261E</color>
-    <color name="base_colorOnError">#FFFFFF</color>
-    <color name="base_colorErrorContainer">#F9DEDC</color>
-    <color name="base_colorOnErrorContainer">#410E0B</color>
-    <color name="base_colorOutline">@color/material_dynamic_neutral_variant50</color>
-    <color name="base_colorOutlineVariant">@color/material_dynamic_neutral_variant80</color>
-
-    <color name="base_colorOnBackground">@color/material_dynamic_neutral10</color>
-    <color name="base_colorSurface">@color/material_dynamic_neutral95</color>
-    <color name="base_colorOnSurface">@color/material_dynamic_neutral10</color>
-    <color name="base_colorSurfaceVariant">@color/material_dynamic_neutral_variant90</color>
-    <color name="base_colorOnSurfaceVariant">@color/material_dynamic_neutral_variant30</color>
-    <color name="base_colorSurfaceInverse">@color/material_dynamic_neutral20</color>
-    <color name="base_colorOnSurfaceInverse">@color/material_dynamic_neutral95</color>
-    <color name="base_colorSurfaceBright">@color/material_dynamic_neutral95</color>
-    <color name="base_colorSurfaceDim">@color/material_dynamic_neutral80</color>
-    <color name="base_colorSurfaceContainer">@color/material_dynamic_neutral95</color>
-    <color name="base_colorSurfaceContainerLow">@color/material_dynamic_neutral95</color>
-    <color name="base_colorSurfaceContainerLowest">#FFFFFF</color>
-    <color name="base_colorSurfaceContainerHigh">@color/material_dynamic_neutral95</color>
-    <color name="base_colorSurfaceContainerHighest">@color/material_dynamic_neutral90</color>
-</resources>
\ No newline at end of file
diff --git a/shared/ui/src/main/res/values-v31/colors.xml b/shared/ui/src/main/res/values-v31/colors.xml
deleted file mode 100644
index 982aed66..00000000
--- a/shared/ui/src/main/res/values-v31/colors.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 暫定： AOSP Modsから借りています -->
-<resources>
-    <!-- UI -->
-    <color name="ui_bg">@android:color/system_neutral1_50</color>
-    <color name="ui_fg">@android:color/system_neutral1_900</color>
-    <color name="ui_fg_disabled">@android:color/system_neutral1_400</color>
-    <color name="ui_fg_secondary">@android:color/system_neutral2_600</color> <!-- A12 B2: 700 -->
-    <color name="ui_accent">@color/accent_dark</color>
-    <color name="ui_accent_inverse">@color/accent_light</color>
-    <color name="ui_accent_variant">@color/accent_variant_dark</color>
-    <color name="ui_surface">@android:color/system_accent1_50</color>
-    <color name="ui_primary_surface">@android:color/system_accent1_100</color>
-    <color name="changelog_bg">@android:color/system_neutral2_50</color>
-    <color name="changelog_border">@android:color/system_neutral1_400</color>
-    <color name="error">#DA000E</color>
-    <color name="success">#008753</color>
-
-    <!-- Launcher icon -->
-    <color name="launcher_fg">@android:color/system_neutral2_700</color>
-    <color name="launcher_bg">@android:color/background_light</color>
-
-    <color name="accent_light">@android:color/system_accent1_300</color>
-    <color name="accent_dark">@android:color/system_accent1_600</color>
-    <color name="accent_variant_light">@android:color/system_accent3_100</color>
-    <color name="accent_variant_dark">@android:color/system_accent3_600</color>
-
-    <!-- Material3 colors -->
-    <color name="colorPrimaryLight">@color/material_dynamic_primary40</color>
-    <color name="colorPrimaryDark">@color/material_dynamic_primary80</color>
-    <color name="colorPrimaryContainerLight">@color/material_dynamic_primary90</color>
-    <color name="colorPrimaryContainerDark">@color/material_dynamic_primary30</color>
-    <color name="colorOnPrimaryContainerLight">@color/material_dynamic_primary10</color>
-    <color name="colorOnPrimaryContainerDark">@color/material_dynamic_primary90</color>
-    <color name="colorSecondaryContainerLight">@color/material_dynamic_secondary90</color>
-    <color name="colorSecondaryContainerDark">@color/material_dynamic_secondary90</color>
-    <color name="colorOnSecondaryContainerLight">@color/material_dynamic_secondary10</color>
-    <color name="colorOnSecondaryContainerDark">@color/material_dynamic_secondary10</color>
-    <color name="colorTertiaryLight">@color/material_dynamic_tertiary40</color>
-    <color name="colorTertiaryDark">@color/material_dynamic_tertiary80</color>
-    <color name="colorOnTertiaryLight">@color/material_dynamic_primary100</color>
-    <color name="colorOnTertiaryDark">@color/material_dynamic_tertiary20</color>
-    <color name="colorTertiaryContainerLight">@color/material_dynamic_tertiary90</color>
-    <color name="colorTertiaryContainerDark">@color/material_dynamic_tertiary30</color>
-    <color name="colorOnTertiaryContainerLight">@color/material_dynamic_tertiary10</color>
-    <color name="colorOnTertiaryContainerDark">@color/material_dynamic_tertiary90</color>
-    <color name="colorSurfaceLight">@color/material_dynamic_neutral99</color>
-    <color name="colorSurfaceDark">@color/material_dynamic_neutral10</color>
-    <color name="colorOnSurfaceLight">@color/material_dynamic_neutral10</color>
-    <color name="colorOnSurfaceDark">@color/material_dynamic_neutral90</color>
-    <color name="colorSurfaceVariantLight">@color/material_dynamic_neutral_variant90</color>
-    <color name="colorSurfaceVariantDark">@color/material_dynamic_neutral_variant30</color>
-    <color name="colorOnSurfaceVariantLight">@color/material_dynamic_neutral_variant30</color>
-    <color name="colorOnSurfaceVariantDark">@color/material_dynamic_neutral_variant80</color>
-    <color name="colorOutlineLight">@color/material_dynamic_neutral_variant50</color>
-    <color name="colorOutlineDark">@color/material_dynamic_neutral_variant60</color>
-    <color name="colorErrorContainerLight">#FFF9DEDC</color>
-    <color name="colorErrorContainerDark">#FF8C1D18</color>
-    <color name="colorOnErrorContainerLight">#FF410E0B</color>
-    <color name="colorOnErrorContainerDark">#FFF9DEDC</color>
-
-</resources>
\ No newline at end of file
diff --git a/shared/ui/src/main/res/values/base_colors.xml b/shared/ui/src/main/res/values/base_colors.xml
deleted file mode 100644
index 53377351..00000000
--- a/shared/ui/src/main/res/values/base_colors.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-<resources>
-    <color name="seed">#6750A4</color>
-    <color name="md_theme_light_primary">#6750A4</color>
-    <color name="md_theme_light_onPrimary">#FFFFFF</color>
-    <color name="md_theme_light_primaryContainer">#EADDFF</color>
-    <color name="md_theme_light_onPrimaryContainer">#21005D</color>
-    <color name="md_theme_light_secondary">#625B71</color>
-    <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#E8DEF8</color>
-    <color name="md_theme_light_onSecondaryContainer">#1D192B</color>
-    <color name="md_theme_light_tertiary">#7D5260</color>
-    <color name="md_theme_light_onTertiary">#FFFFFF</color>
-    <color name="md_theme_light_tertiaryContainer">#FFD8E4</color>
-    <color name="md_theme_light_onTertiaryContainer">#31111D</color>
-    <color name="md_theme_light_error">#B3261E</color>
-    <color name="md_theme_light_onError">#FFFFFF</color>
-    <color name="md_theme_light_errorContainer">#F9DEDC</color>
-    <color name="md_theme_light_onErrorContainer">#410E0B</color>
-    <color name="md_theme_light_outline">#79747E</color>
-    <color name="md_theme_light_background">#FFFBFE</color>
-    <color name="md_theme_light_onBackground">#1C1B1F</color>
-    <color name="md_theme_light_surface">#FFFBFE</color>
-    <color name="md_theme_light_onSurface">#1C1B1F</color>
-    <color name="md_theme_light_surfaceVariant">#E7E0EC</color>
-    <color name="md_theme_light_onSurfaceVariant">#49454F</color>
-    <color name="md_theme_light_inverseSurface">#313033</color>
-    <color name="md_theme_light_inverseOnSurface">#F4EFF4</color>
-    <color name="md_theme_light_inversePrimary">#D0BCFF</color>
-    <color name="md_theme_light_shadow">#000000</color>
-    <color name="md_theme_light_surfaceTint">#6750A4</color>
-    <color name="md_theme_light_outlineVariant">#CAC4D0</color>
-    <color name="md_theme_light_scrim">#000000</color>
-    <color name="md_theme_dark_primary">#D0BCFF</color>
-    <color name="md_theme_dark_onPrimary">#381E72</color>
-    <color name="md_theme_dark_primaryContainer">#4F378B</color>
-    <color name="md_theme_dark_onPrimaryContainer">#EADDFF</color>
-    <color name="md_theme_dark_secondary">#CCC2DC</color>
-    <color name="md_theme_dark_onSecondary">#332D41</color>
-    <color name="md_theme_dark_secondaryContainer">#4A4458</color>
-    <color name="md_theme_dark_onSecondaryContainer">#E8DEF8</color>
-    <color name="md_theme_dark_tertiary">#EFB8C8</color>
-    <color name="md_theme_dark_onTertiary">#492532</color>
-    <color name="md_theme_dark_tertiaryContainer">#633B48</color>
-    <color name="md_theme_dark_onTertiaryContainer">#FFD8E4</color>
-    <color name="md_theme_dark_error">#F2B8B5</color>
-    <color name="md_theme_dark_onError">#601410</color>
-    <color name="md_theme_dark_errorContainer">#8C1D18</color>
-    <color name="md_theme_dark_onErrorContainer">#F9DEDC</color>
-    <color name="md_theme_dark_outline">#938F99</color>
-    <color name="md_theme_dark_background">#1C1B1F</color>
-    <color name="md_theme_dark_onBackground">#E6E1E5</color>
-    <color name="md_theme_dark_surface">#1C1B1F</color>
-    <color name="md_theme_dark_onSurface">#E6E1E5</color>
-    <color name="md_theme_dark_surfaceVariant">#49454F</color>
-    <color name="md_theme_dark_onSurfaceVariant">#CAC4D0</color>
-    <color name="md_theme_dark_inverseSurface">#E6E1E5</color>
-    <color name="md_theme_dark_inverseOnSurface">#313033</color>
-    <color name="md_theme_dark_inversePrimary">#6750A4</color>
-    <color name="md_theme_dark_shadow">#000000</color>
-    <color name="md_theme_dark_surfaceTint">#D0BCFF</color>
-    <color name="md_theme_dark_outlineVariant">#49454F</color>
-    <color name="md_theme_dark_scrim">#000000</color>
-</resources>
\ No newline at end of file
diff --git a/shared/ui/src/main/res/values/themes.xml b/shared/ui/src/main/res/values/themes.xml
index f68409f7..310dfc06 100644
--- a/shared/ui/src/main/res/values/themes.xml
+++ b/shared/ui/src/main/res/values/themes.xml
@@ -5,5 +5,7 @@
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
 
-    <style name="Theme.Lacerta" parent="Base.Theme.Lacerta" />
+    <style name="Theme.Lacerta" parent="Base.Theme.Lacerta" >
+
+    </style>
 </resources>
\ No newline at end of file