diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
new file mode 100644
index 0000000..890635b
--- /dev/null
+++ b/CONTRIBUTE.md
@@ -0,0 +1,11 @@
+# When Commit
+
+## When Push to develop
+```bash
+git update-index --assume-unchanged src/Apps/Corathing.Organizer/Resources/CorathingOrganizerLocalizationStringResources.Designer.cs
+```
+
+## When Push to main or Resource Updated
+```bash
+git update-index --no-assume-unchanged src/Apps/Corathing.Organizer/Resources/CorathingOrganizerLocalizationStringResources.Designer.cs
+```
\ No newline at end of file
diff --git a/Corathing.sln b/Corathing.sln
index 73f57ca..e1f5df1 100644
--- a/Corathing.sln
+++ b/Corathing.sln
@@ -8,6 +8,16 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{5BF1289A-1427-4306-B2E1-51E0770B6B75}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppDocs", "AppDocs", "{DC193F44-8A37-4005-947E-73F0C91C223C}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		CONTRIBUTE.md = CONTRIBUTE.md
+		LICENSE.md = LICENSE.md
+		README.md = README.md
+		README_KR.md = README_KR.md
+		version.json = version.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{89CC8AAB-466A-47B6-98B9-93EB379F55A7}"
 EndProject
diff --git a/src/Apps/Corathing.Organizer/Views/OrganizerSettingsView.xaml b/src/Apps/Corathing.Organizer/Views/OrganizerSettingsView.xaml
index 45d24b3..e2619ad 100644
--- a/src/Apps/Corathing.Organizer/Views/OrganizerSettingsView.xaml
+++ b/src/Apps/Corathing.Organizer/Views/OrganizerSettingsView.xaml
@@ -52,7 +52,7 @@
                         FocusVisualStyle="{x:Null}">
                 <ui:TextBlock Margin="0,16,0,8"
                               FontTypography="BodyStrong"
-                              Text="{localizations:Localization Corathing.Organizer.ManageCorathingAppConfigurationFile}" />
+                              Text="사용자 환경 설정" />
                 <ui:CardExpander Margin="0,0,0,8"
                                  Icon="{ui:SymbolIcon Folder24}"
                                  ContentPadding="0">
@@ -181,6 +181,9 @@
                     </StackPanel>
                 </ui:CardExpander>
 
+                <!-- Guest Mode -->
+                <!-- 1. 설정 버튼 숨기기 -->
+                <!-- 2. 유저 인증 -->
                 <ui:CardControl Margin="0,0,0,8"
                                 Icon="{ui:SymbolIcon Color24}">
                     <ui:CardControl.Header>
@@ -191,7 +194,7 @@
                             </Grid.RowDefinitions>
                             <ui:TextBlock Grid.Row="0"
                                           FontTypography="Body"
-                                          Text="트레이 아이콘" />
+                                          Text="게스트 모드 (게스트 모드, 푸는 방법)" />
                             <ui:TextBlock Grid.Row="1"
                                           Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
                                           Text="{localizations:Localization Corathing.Organizer.AppThemeDescription}" />
@@ -205,6 +208,10 @@
                     </ComboBox>
                 </ui:CardControl>
 
+                <!-- Tray Icon -->
+                <!-- 1. Tray 사용 여부 -->
+                <!-- 2. Tray Icon 을 앱 아이콘을 사용할 것인지 -->
+                <!-- 3. Tray Icon 을 사용자 커스텀 -->
                 <ui:CardControl Margin="0,0,0,8"
                                 Icon="{ui:SymbolIcon Color24}">
                     <ui:CardControl.Header>
@@ -215,7 +222,7 @@
                             </Grid.RowDefinitions>
                             <ui:TextBlock Grid.Row="0"
                                           FontTypography="Body"
-                                          Text="핫키 제어" />
+                                          Text="트레이 아이콘" />
                             <ui:TextBlock Grid.Row="1"
                                           Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
                                           Text="{localizations:Localization Corathing.Organizer.AppThemeDescription}" />
@@ -229,6 +236,8 @@
                     </ComboBox>
                 </ui:CardControl>
 
+                <!-- Hotkey Control -->
+                <!-- 1. Modifier 설정 -->
                 <ui:CardControl Margin="0,0,0,8"
                                 Icon="{ui:SymbolIcon Color24}">
                     <ui:CardControl.Header>
@@ -239,7 +248,7 @@
                             </Grid.RowDefinitions>
                             <ui:TextBlock Grid.Row="0"
                                           FontTypography="Body"
-                                          Text="게스트 모드 (게스트 모드, 푸는 방법)" />
+                                          Text="핫키 제어" />
                             <ui:TextBlock Grid.Row="1"
                                           Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
                                           Text="{localizations:Localization Corathing.Organizer.AppThemeDescription}" />
@@ -253,6 +262,7 @@
                     </ComboBox>
                 </ui:CardControl>
 
+
                 <ui:TextBlock Margin="0,16,0,8"
                               FontTypography="BodyStrong"
                               Text="Appearance &amp; behavior" />
@@ -392,6 +402,36 @@
                     </StackPanel>
                 </ui:CardExpander>
 
+                <!-- 앱 아이콘 -->
+                <!-- 1. 앱 아이콘 숨기기 (대쉬보드 최상단좌측에서) -->
+                <!-- 2. 앱 아이콘 변경 -->
+                <ui:CardControl Margin="0,0,0,8"
+                                Icon="{ui:SymbolIcon Color24}">
+                    <ui:CardControl.Header>
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <ui:TextBlock Grid.Row="0"
+                                          FontTypography="Body"
+                                          Text="최소화 및 닫기 버튼" />
+                            <ui:TextBlock Grid.Row="1"
+                                          Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
+                                          Text="Select which app theme to display" />
+                        </Grid>
+                    </ui:CardControl.Header>
+                    <ComboBox Grid.Column="1"
+                              MinWidth="200"
+                              SelectedIndex="{Binding CurrentApplicationTheme, Converter={StaticResource ThemeToIndexConverter}, Mode=TwoWay}">
+                        <ComboBoxItem Content="Light" />
+                        <ComboBoxItem Content="Dark" />
+                    </ComboBox>
+                </ui:CardControl>
+
+                <!-- 최소화 및 닫기 버튼 -->
+                <!-- 1. 최소화 및 닫기 버튼을 삭제할 것인지 -->
+                <!-- 2. 더블 클릭을 하면 드러내기? -->
                 <ui:CardControl Margin="0,0,0,8"
                                 Icon="{ui:SymbolIcon Color24}">
                     <ui:CardControl.Header>
@@ -402,7 +442,7 @@
                             </Grid.RowDefinitions>
                             <ui:TextBlock Grid.Row="0"
                                           FontTypography="Body"
-                                          Text="닫기 버튼 제거" />
+                                          Text="최소화 및 닫기 버튼" />
                             <ui:TextBlock Grid.Row="1"
                                           Foreground="{ui:ThemeResource TextFillColorSecondaryBrush}"
                                           Text="Select which app theme to display" />
diff --git a/src/Shared/Corathing.Contracts/Bases/AppPreferences.cs b/src/Shared/Corathing.Contracts/Bases/AppPreferences.cs
new file mode 100644
index 0000000..22706e2
--- /dev/null
+++ b/src/Shared/Corathing.Contracts/Bases/AppPreferences.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Corathing.Contracts.Services;
+
+namespace Corathing.Contracts.Bases;
+
+public class AppPreferences
+{
+    public ApplicationLanguage? Language { get; set; }
+    public ApplicationTheme? Theme { get; set; }
+}
diff --git a/src/Shared/Corathing.Contracts/Bases/AppState.cs b/src/Shared/Corathing.Contracts/Bases/AppState.cs
index d4124f6..c601234 100644
--- a/src/Shared/Corathing.Contracts/Bases/AppState.cs
+++ b/src/Shared/Corathing.Contracts/Bases/AppState.cs
@@ -4,8 +4,12 @@
 using System.Text;
 using System.Threading.Tasks;
 
+using Corathing.Contracts.Services;
+
 namespace Corathing.Contracts.Bases;
 
 public class AppState
 {
+    public AppPreferences? Preferences { get; set; }
+
 }