diff --git a/src/res/drawable/ic_add.xml b/src/res/drawable/ic_add.xml
new file mode 100644
index 0000000..937e7ff
--- /dev/null
+++ b/src/res/drawable/ic_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/on_primary"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
\ No newline at end of file
diff --git a/src/res/drawable/ic_alarm.xml b/src/res/drawable/ic_alarm.xml
new file mode 100644
index 0000000..a5f498b
--- /dev/null
+++ b/src/res/drawable/ic_alarm.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/text_secondary"
+        android:pathData="M12.5,20C17.2,20 21,16.2 21,11.5S17.2,3 12.5,3 4,6.8 4,11.5 7.8,20 12.5,20zM13,13h5v-2h-5V8h-2v3H6v2h5v3h2v-3z" />
+</vector>
\ No newline at end of file
diff --git a/src/res/drawable/ic_lock.xml b/src/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..02c610f
--- /dev/null
+++ b/src/res/drawable/ic_lock.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#309760" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    
+</vector>
diff --git a/src/res/drawable/ic_lock_open.xml b/src/res/drawable/ic_lock_open.xml
new file mode 100644
index 0000000..eea5538
--- /dev/null
+++ b/src/res/drawable/ic_lock_open.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#309760" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+    
+</vector>
diff --git a/src/res/layout/activity_login.xml b/src/res/layout/activity_login.xml
new file mode 100644
index 0000000..bd69481
--- /dev/null
+++ b/src/res/layout/activity_login.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/background">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/surface"
+        android:elevation="4dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="24dp"
+        android:gravity="center">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_login"
+            android:textSize="24sp"
+            android:textColor="@color/text_primary"
+            android:layout_marginBottom="32dp" />
+
+        <EditText
+            android:id="@+id/et_login_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/hint_username"
+            android:inputType="text"
+            android:maxLines="1"
+            android:layout_marginBottom="16dp"
+            android:padding="12dp"
+            android:background="@drawable/edit_white" />
+
+        <EditText
+            android:id="@+id/et_login_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/hint_login_password"
+            android:inputType="textPassword"
+            android:maxLines="1"
+            android:layout_marginBottom="24dp"
+            android:padding="12dp"
+            android:background="@drawable/edit_white" />
+
+        <Button
+            android:id="@+id/btn_login"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/btn_login"
+            android:layout_marginBottom="16dp"
+            android:backgroundTint="@color/primary"
+            style="?android:attr/buttonBarButtonStyle" />
+
+        <Button
+            android:id="@+id/btn_login_cancel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@android:string/cancel"
+            android:backgroundTint="@color/primary"
+            style="?android:attr/buttonBarButtonStyle" />
+
+        <TextView
+            android:id="@+id/tv_login_register"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/text_register_account"
+            android:textColor="@color/text_link"
+            android:layout_marginTop="24dp"
+            android:padding="8dp" />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/src/res/layout/activity_register.xml b/src/res/layout/activity_register.xml
new file mode 100644
index 0000000..4dc45ef
--- /dev/null
+++ b/src/res/layout/activity_register.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/background">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/surface"
+        android:elevation="4dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="24dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_register"
+            android:textSize="24sp"
+            android:textColor="@color/text_primary"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="32dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:gravity="center_vertical">
+
+            <EditText
+                android:id="@+id/et_register_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_username"
+                android:inputType="text"
+                android:maxLines="1"
+                android:layout_marginBottom="16dp"
+                android:padding="12dp"
+                android:background="@drawable/edit_white" />
+
+            <EditText
+                android:id="@+id/et_register_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_login_password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:layout_marginBottom="16dp"
+                android:padding="12dp"
+                android:background="@drawable/edit_white" />
+
+            <EditText
+                android:id="@+id/et_register_confirm_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_confirm_password"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:layout_marginBottom="24dp"
+                android:padding="12dp"
+                android:background="@drawable/edit_white" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="8dp">
+
+            <Button
+                android:id="@+id/btn_register_cancel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@android:string/cancel"
+                android:layout_marginEnd="8dp"
+                android:backgroundTint="@color/primary"
+                style="?android:attr/buttonBarButtonStyle" />
+
+            <Button
+                android:id="@+id/btn_register"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/btn_register"
+                android:layout_marginStart="8dp"
+                android:backgroundTint="@color/primary"
+                style="?android:attr/buttonBarButtonStyle" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/src/res/layout/add_account_text.xml b/src/res/layout/add_account_text.xml
deleted file mode 100644
index c799178..0000000
--- a/src/res/layout/add_account_text.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="50dip"
-    android:gravity="center_vertical"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/preferences_add_account" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/res/layout/dialog_camera_preview.xml b/src/res/layout/dialog_camera_preview.xml
new file mode 100644
index 0000000..bc5348c
--- /dev/null
+++ b/src/res/layout/dialog_camera_preview.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/camera_preview_title"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:layout_marginBottom="16dp" />
+
+    <ImageView
+        android:id="@+id/preview_image"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:scaleType="centerCrop"
+        android:adjustViewBounds="true"
+        android:layout_marginBottom="16dp"
+        android:contentDescription="@string/camera_preview_image" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center">
+
+        <Button
+            android:id="@+id/btn_retake"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/camera_retake"
+            android:layout_marginEnd="8dp" />
+
+        <Button
+            android:id="@+id/btn_confirm"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/camera_confirm"
+            android:layout_marginStart="8dp" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/res/layout/dialog_image_insert.xml b/src/res/layout/dialog_image_insert.xml
new file mode 100644
index 0000000..6a035a4
--- /dev/null
+++ b/src/res/layout/dialog_image_insert.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="280dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    app:cardCornerRadius="20dp"
+    app:cardElevation="8dp"
+    app:cardBackgroundColor="@color/surface"
+    app:strokeColor="@color/outline"
+    app:strokeWidth="1dp"
+    app:cardPreventCornerOverlap="true"
+    app:contentPadding="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="0dp">
+
+        <!-- 标题区域 -->
+        <TextView
+            android:id="@+id/title_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:text="@string/image_insert_title"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:gravity="center"
+            android:textColor="@color/text_primary"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <!-- 图库选项卡片 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/btn_gallery"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:padding="16dp"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintTop_toBottomOf="@+id/title_text"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <ImageView
+                android:id="@+id/gallery_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@android:drawable/ic_menu_gallery"
+                app:tint="@color/primary"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                android:id="@+id/gallery_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/image_insert_gallery"
+                android:textSize="16sp"
+                android:textColor="@color/text_primary"
+                android:layout_marginStart="16dp"
+                app:layout_constraintStart_toEndOf="@id/gallery_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <!-- 分隔线 -->
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@color/divider"
+            app:layout_constraintTop_toBottomOf="@+id/btn_gallery"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <!-- 相机选项卡片 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/btn_camera"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:padding="16dp"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            app:layout_constraintTop_toBottomOf="@+id/divider1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <ImageView
+                android:id="@+id/camera_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@android:drawable/ic_menu_camera"
+                app:tint="@color/primary"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+            <TextView
+                android:id="@+id/camera_text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:text="@string/image_insert_camera"
+                android:textSize="16sp"
+                android:textColor="@color/text_primary"
+                android:layout_marginStart="16dp"
+                app:layout_constraintStart_toEndOf="@id/camera_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <!-- 分隔线 -->
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@color/divider"
+            app:layout_constraintTop_toBottomOf="@+id/btn_camera"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <!-- 取消按钮 -->
+        <TextView
+            android:id="@+id/btn_cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:padding="16dp"
+            android:text="@android:string/cancel"
+            android:textSize="16sp"
+            android:textColor="@color/primary"
+            android:gravity="center"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackground"
+            app:layout_constraintTop_toBottomOf="@+id/divider2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/src/res/layout/image_item.xml b/src/res/layout/image_item.xml
new file mode 100644
index 0000000..4518ee9
--- /dev/null
+++ b/src/res/layout/image_item.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="12dp"
+    android:background="@android:color/white"
+    android:padding="4dp">
+
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:maxHeight="400dp"
+        android:scaleType="fitCenter"
+        android:contentDescription="@string/image_content_description" />
+
+    <ImageButton
+        android:id="@+id/btn_delete"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="8dp"
+        android:background="@android:drawable/ic_menu_delete"
+        android:contentDescription="@string/delete_image" />
+
+    <TextView
+        android:id="@+id/tv_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|start"
+        android:layout_margin="8dp"
+        android:background="@android:color/holo_blue_light"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="4dp"
+        android:textColor="@android:color/white"
+        android:textSize="12sp"
+        android:visibility="gone" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/res/layout/note_edit.xml b/src/res/layout/note_edit.xml
index 10b2aa7..7617d43 100644
--- a/src/res/layout/note_edit.xml
+++ b/src/res/layout/note_edit.xml
@@ -15,81 +15,90 @@
      limitations under the License.
 -->
 
-<FrameLayout
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/list_background"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/surface"
+            android:elevation="4dp" />
+
         <LinearLayout
             android:id="@+id/note_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
 
             <TextView
                 android:id="@+id/tv_modified_date"
-                android:layout_width="0dip"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_gravity="left|center_vertical"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+                android:textAppearance="@style/TextAppearanceSecondaryItem"
+                android:gravity="center_vertical" />
 
             <ImageView
                 android:id="@+id/iv_alert_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:background="@drawable/title_alert" />
 
             <TextView
                 android:id="@+id/tv_alert_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="2dip"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
+                android:textAppearance="@style/TextAppearanceSecondaryItem"
+                android:layout_marginStart="2dp"
+                android:layout_marginEnd="8dp" />
 
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/bg_btn_set_color" />
+            <!-- 移除无功能的ImageButton -->
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/sv_note_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             android:orientation="vertical">
 
             <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
+                android:layout_width="match_parent"
+                android:layout_height="7dp"
                 android:background="@drawable/bg_color_btn_mask" />
 
             <ScrollView
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
                 android:layout_weight="1"
                 android:scrollbars="none"
                 android:overScrollMode="never"
                 android:layout_gravity="left|top"
-                android:fadingEdgeLength="0dip">
+                android:fadingEdgeLength="0dp">
 
                 <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
                     <net.micode.notes.ui.NoteEditText
                         android:id="@+id/note_edit_view"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="left|top"
                         android:background="@null"
@@ -99,29 +108,41 @@
                         android:textAppearance="@style/TextAppearancePrimaryItem"
                         android:lineSpacingMultiplier="1.2" />
 
+                    <LinearLayout
+                        android:id="@+id/note_attachment_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginTop="16dp"
+                        android:visibility="gone" />
+
                     <LinearLayout
                         android:id="@+id/note_edit_list"
-                        android:layout_width="fill_parent"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:layout_marginLeft="-10dip"
+                        android:layout_marginLeft="-10dp"
                         android:visibility="gone" />
                 </LinearLayout>
             </ScrollView>
 
             <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
+                android:layout_width="match_parent"
+                android:layout_height="7dp"
                 android:background="@drawable/bg_color_btn_mask" />
         </LinearLayout>
     </LinearLayout>
 
     <ImageView
         android:id="@+id/btn_set_bg_color"
-        android:layout_height="43dip"
-        android:layout_width="wrap_content"
-        android:background="@drawable/bg_color_btn_mask"
-        android:layout_gravity="top|right" />
+        android:layout_height="43dp"
+        android:layout_width="43dp"
+        android:src="@android:drawable/ic_menu_edit"
+        app:tint="@color/text_primary"
+        android:layout_gravity="top|right"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:contentDescription="@string/change_background_color"
+        android:background="?attr/selectableItemBackgroundBorderless" />
 
     <LinearLayout
         android:id="@+id/note_bg_color_selector"
@@ -397,4 +418,4 @@
                 android:src="@drawable/selected" />
         </FrameLayout>
     </LinearLayout>
-</FrameLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/src/res/layout/note_item.xml b/src/res/layout/note_item.xml
index d541f6a..9a080c7 100644
--- a/src/res/layout/note_item.xml
+++ b/src/res/layout/note_item.xml
@@ -15,64 +15,116 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/note_item"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    app:cardCornerRadius="12dp"
+    app:cardElevation="2dp"
+    app:cardBackgroundColor="@color/surface"
+    app:strokeWidth="0dp"
+    app:rippleColor="@color/ripple">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical">
+        android:padding="16dp">
 
         <LinearLayout
-            android:layout_width="0dip"
+            android:id="@+id/content_container"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/alert_container"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
             <TextView
                 android:id="@+id/tv_name"
                 android:layout_width="wrap_content"
-                android:layout_height="0dip"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearancePrimaryItem"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:layout_marginBottom="4dp" />
 
             <LinearLayout
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical">
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/iv_lock_icon"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/ic_lock"
+                    android:tint="@color/text_secondary"
+                    android:visibility="gone"
+                    android:layout_marginEnd="4dp" />
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dip"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:singleLine="true" />
+                    android:singleLine="true"
+                    android:textAppearance="@style/TextAppearancePrimaryItem"
+                    android:textColor="@color/text_primary"
+                    android:ellipsize="end"
+                    android:layout_marginEnd="8dp" />
 
                 <TextView
                     android:id="@+id/tv_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="@style/TextAppearanceSecondaryItem" />
+                    android:textAppearance="@style/TextAppearanceSecondaryItem"
+                    android:textColor="@color/text_secondary" />
             </LinearLayout>
         </LinearLayout>
 
-        <CheckBox
-            android:id="@android:id/checkbox"
+        <LinearLayout
+            android:id="@+id/alert_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:focusable="false"
-            android:clickable="false"
-            android:visibility="gone" />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/iv_alert_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|right"/>
-</FrameLayout>
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:gravity="center"
+            android:layout_marginStart="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <ImageView
+                android:id="@+id/iv_alert_icon"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/menu_alert"
+                android:src="@drawable/ic_alarm"
+                app:tint="@color/text_secondary"
+                android:visibility="gone" />
+
+            <CheckBox
+                android:id="@android:id/checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:focusable="false"
+                android:clickable="false"
+                android:visibility="gone"
+                android:layout_marginStart="8dp" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/src/res/layout/note_list.xml b/src/res/layout/note_list.xml
index 6b25d38..92d8416 100644
--- a/src/res/layout/note_list.xml
+++ b/src/res/layout/note_list.xml
@@ -15,44 +15,70 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/list_background">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tv_title_bar"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/title_bar_bg"
-            android:visibility="gone"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textColor="#FFEAD1AE"
-            android:textSize="@dimen/text_font_size_medium" />
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/surface"
+            android:elevation="4dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <TextView
+                android:id="@+id/tv_title_bar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearanceMedium"
+                android:textColor="@color/text_primary" />
+
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <ListView
             android:id="@+id/notes_list"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="80dp"
+            android:clipToPadding="false"
             android:cacheColorHint="@null"
             android:listSelector="@android:color/transparent"
             android:divider="@null"
-            android:fadingEdge="@null" />
-    </LinearLayout>
+            android:fadingEdge="none"
+            app:layout_constraintTop_toBottomOf="@id/toolbar"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
-        android:id="@+id/btn_new_note"
-        android:background="@drawable/new_note"
-        android:layout_width="match_parent"
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_new_note"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:focusable="false"
-        android:layout_gravity="bottom" />
-</FrameLayout>
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:contentDescription="@string/notelist_menu_new"
+        android:src="@drawable/ic_add"
+        app:backgroundTint="@color/primary"
+        app:tint="@color/on_primary"
+        app:fabSize="normal"
+        app:elevation="6dp"
+        app:pressedTranslationZ="12dp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/src/res/layout/settings_header.xml b/src/res/layout/settings_header.xml
index 5eb8c50..ba114e6 100644
--- a/src/res/layout/settings_header.xml
+++ b/src/res/layout/settings_header.xml
@@ -3,7 +3,7 @@
 <!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
 
      Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
+     you may use this file except in compliance with the License.
      You may obtain a copy of the License at
 
           http://www.apache.org/licenses/LICENSE-2.0
@@ -21,21 +21,11 @@
         android:orientation="vertical"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <Button
-        android:id="@+id/preference_sync_button"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
-        style="?android:attr/textAppearanceMedium"
-        android:text="@string/preferences_button_sync_immediately"/>
-
-    <TextView
-        android:id="@+id/prefenerece_sync_status_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone"/>
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/surface"
+        android:elevation="4dp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/res/menu/note_edit.xml b/src/res/menu/note_edit.xml
index c1bc4e4..17b7c63 100644
--- a/src/res/menu/note_edit.xml
+++ b/src/res/menu/note_edit.xml
@@ -16,15 +16,25 @@
 -->
 
 <menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_new_note"
         android:title="@string/notelist_menu_new"/>
 
+    <item
+        android:id="@+id/menu_insert_image"
+        android:icon="@android:drawable/ic_menu_camera"
+        android:title="@string/menu_insert_image"
+        app:showAsAction="never"
+        android:orderInCategory="2" />
     <item
         android:id="@+id/menu_delete"
-        android:title="@string/menu_delete"/>
+        android:icon="@android:drawable/ic_menu_delete"
+        android:title="@string/menu_delete"
+        app:showAsAction="never"
+        android:orderInCategory="4" />
 
     <item
         android:id="@+id/menu_font_size"
@@ -49,23 +59,4 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
-
-    <item
-        android:id="@+id/menu_format"
-        android:title="@string/menu_format">
-        <menu>
-            <item
-                android:id="@+id/menu_bold"
-                android:title="@string/menu_bold" />
-            <item
-                android:id="@+id/menu_italic"
-                android:title="@string/menu_italic" />
-            <item
-                android:id="@+id/menu_underline"
-                android:title="@string/menu_underline" />
-            <item
-                android:id="@+id/menu_strikethrough"
-                android:title="@string/menu_strikethrough" />
-        </menu>
-    </item>
 </menu>
\ No newline at end of file
diff --git a/src/res/menu/note_list_options.xml b/src/res/menu/note_list_options.xml
index 2300018..93a957d 100644
--- a/src/res/menu/note_list_options.xml
+++ b/src/res/menu/note_list_options.xml
@@ -28,10 +28,16 @@
         android:title="@string/menu_delete"
         android:icon="@drawable/menu_delete"
         android:showAsAction="always|withText" />
-    
+
+    <item
+        android:id="@+id/lock"
+        android:title="@string/menu_lock"
+        android:icon="@drawable/ic_lock"
+        android:showAsAction="always|withText" />
+
     <item
-        android:id="@+id/pin"
-        android:title="置顶"
-        android:icon="@android:drawable/star_big_on"
+        android:id="@+id/unlock"
+        android:title="@string/menu_unlock"
+        android:icon="@drawable/ic_lock_open"
         android:showAsAction="always|withText" />
 </menu>
\ No newline at end of file
diff --git a/src/res/mipmap-anydpi-v26/ic_launcher.xml b/src/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from src/res/mipmap-anydpi-v26/ic_launcher.xml
rename to src/res/mipmap-anydpi/ic_launcher.xml
diff --git a/src/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 100%
rename from src/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to src/res/mipmap-anydpi/ic_launcher_round.xml
diff --git a/src/res/values-night/colors.xml b/src/res/values-night/colors.xml
new file mode 100644
index 0000000..86f61f0
--- /dev/null
+++ b/src/res/values-night/colors.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Dark Mode Color Overrides -->
+    <!-- Background Colors -->
+    <color name="background">#121212</color>
+    <color name="surface">#1E1E1E</color>
+    <color name="surface_variant">#2D2D2D</color>
+
+    <!-- Text Colors -->
+    <color name="text_primary">#E0E0E0</color>
+    <color name="text_secondary">#A0A0A0</color>
+    <color name="text_hint">#757575</color>
+
+    <!-- On Colors -->
+    <color name="on_background">#E0E0E0</color>
+    <color name="on_surface">#E0E0E0</color>
+    <color name="on_surface_variant">#B0B0B0</color>
+
+    <!-- Note Background Colors (Dark Mode) -->
+    <color name="note_bg_yellow">#4A4536</color>
+    <color name="note_bg_red">#4A3636</color>
+    <color name="note_bg_blue">#364A5A</color>
+    <color name="note_bg_green">#364A3E</color>
+    <color name="note_bg_white">#1E1E1E</color>
+
+    <!-- Divider Colors -->
+    <color name="divider">#2D2D2D</color>
+    <color name="outline">#404040</color>
+
+    <!-- Ripple Effect -->
+    <color name="ripple">#3352D399</color>
+
+    <!-- Status Bar & Navigation Bar -->
+    <color name="status_bar">#121212</color>
+    <color name="navigation_bar">#121212</color>
+</resources>
\ No newline at end of file
diff --git a/src/res/values-night/themes.xml b/src/res/values-night/themes.xml
index d2c68d1..208af6f 100644
--- a/src/res/values-night/themes.xml
+++ b/src/res/values-night/themes.xml
@@ -1,7 +1,20 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.Notesmaster" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+    <!-- Base application theme for dark mode. -->
+    <style name="Base.Theme.NotesMaster" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Override light status bar and navigation bar for dark mode -->
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
+        
+        <!-- Ensure proper contrast for dark mode -->
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        <item name="android:textColorHint">@color/text_hint</item>
+    </style>
+    
+    <!-- NoteTheme dark mode overrides (inherits from Theme.NotesMaster) -->
+    <style name="NoteTheme" parent="Theme.NotesMaster">
+        <!-- Override for dark mode -->
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/src/res/values/colors.xml b/src/res/values/colors.xml
index 123ffbf..5e9b1ee 100644
--- a/src/res/values/colors.xml
+++ b/src/res/values/colors.xml
@@ -17,4 +17,57 @@
 
 <resources>
     <color name="user_query_highlight">#335b5b5b</color>
+
+    <!-- Material Design 3 Color System -->
+    <!-- Primary Colors -->
+    <color name="primary">#34D399</color>
+    <color name="primary_container">#DCFCE7</color>
+    <color name="on_primary">#FFFFFF</color>
+    <color name="on_primary_container">#064E3B</color>
+
+    <!-- Secondary Colors -->
+    <color name="secondary">#6B7280</color>
+    <color name="secondary_container">#E5E7EB</color>
+    <color name="on_secondary">#FFFFFF</color>
+    <color name="on_secondary_container">#1F2937</color>
+
+    <!-- Background Colors -->
+    <color name="background">#FAFAFA</color>
+    <color name="surface">#FFFFFF</color>
+    <color name="surface_variant">#F3F4F6</color>
+    <color name="on_background">#1F2937</color>
+    <color name="on_surface">#1F2937</color>
+    <color name="on_surface_variant">#4B5563</color>
+
+    <!-- Note Background Colors (Modern Soft Tones) -->
+    <color name="note_bg_yellow">#FEF3C7</color>
+    <color name="note_bg_red">#FEE2E2</color>
+    <color name="note_bg_blue">#DBEAFE</color>
+    <color name="note_bg_green">#DCFCE7</color>
+    <color name="note_bg_white">#FFFFFF</color>
+
+    <!-- Text Colors -->
+    <color name="text_primary">#1F2937</color>
+    <color name="text_secondary">#6B7280</color>
+    <color name="text_link">#2563EB</color>
+    <color name="text_hint">#9CA3AF</color>
+
+    <!-- Accent Colors -->
+    <color name="accent">#34D399</color>
+    <color name="accent_container">#DCFCE7</color>
+
+    <!-- Error Colors -->
+    <color name="error">#EF4444</color>
+    <color name="error_container">#FEE2E2</color>
+    <color name="on_error">#FFFFFF</color>
+
+    <!-- Divider Colors -->
+    <color name="divider">#E5E7EB</color>
+    <color name="outline">#D1D5DB</color>
+
+    <!-- Ripple Effect -->
+    <color name="ripple">#1A34D399</color>
+
+    <!-- Legacy Colors (for backward compatibility) -->
+    <!-- Note: primary_text_dark and secondary_text_dark are defined in res/color/ directory as selectors -->
 </resources>
diff --git a/src/res/values/strings.xml b/src/res/values/strings.xml
index e29be13..ab43bd0 100644
--- a/src/res/values/strings.xml
+++ b/src/res/values/strings.xml
@@ -64,14 +64,24 @@
     <string name="menu_folder_change_name">Change folder name</string>
     <string name="folder_exist">The folder %1$s exist, please rename</string>
     <string name="menu_share">Share</string>
+    <string name="menu_insert_image">Insert image</string>
+    <string name="image_insert_title">Insert image</string>
+    <string name="image_insert_gallery">Choose from gallery</string>
+    <string name="image_insert_camera">Take a photo</string>
+    <string name="image_content_description">Attachment image</string>
+    <string name="delete_image">Delete image</string>
+    <string name="confirm_delete_image">Are you sure you want to delete this image?</string>
+    <string name="permission_denied">Permission denied, cannot access image</string>
+    <string name="image_added">Image added successfully</string>
+    <string name="image_deleted">Image deleted</string>
+    <string name="failed_to_add_image">Failed to add image</string>
+    <string name="camera_preview_title">Preview Photo</string>
+    <string name="camera_preview_image">Preview image</string>
+    <string name="camera_retake">Retake</string>
+    <string name="camera_confirm">Confirm</string>
     <string name="menu_send_to_desktop">Send to home</string>
     <string name="menu_alert">Remind me</string>
     <string name="menu_remove_remind">Delete reminder</string>
-    <string name="menu_format">Format</string>
-    <string name="menu_bold">Bold</string>
-    <string name="menu_italic">Italic</string>
-    <string name="menu_underline">Underline</string>
-    <string name="menu_strikethrough">Strikethrough</string>
     <string name="menu_title_select_folder">Select folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="info_note_enter_desktop">Note added to home</string>
@@ -89,44 +99,39 @@
     <string name="success_sdcard_export">Export successful</string>
     <string name="failed_sdcard_export">Export fail</string>
     <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
-    <!-- Sync -->
-    <string name="ticker_syncing">Syncing notes...</string>
-    <string name="ticker_success">Sync is successful</string>
-    <string name="ticker_fail">Sync is failed</string>
-    <string name="ticker_cancel">Sync is canceled</string>
-    <string name="success_sync_account">Sync is successful with account %1$s</string>
-    <string name="error_sync_network">Sync failed, please check network and account settings</string>
-    <string name="error_sync_internal">Sync failed, internal error occurs</string>
-    <string name="error_sync_cancelled">Sync is canceled</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
-    <string name="sync_progress_init_list">Getting remote note list...</string>
-    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
-    <!-- Preferences -->
+
     <string name="preferences_title">Settings</string>
-    <string name="preferences_account_title">Sync account</string>
-    <string name="preferences_account_summary">Sync notes with google task</string>
-    <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
-    <string name="preferences_add_account">Add account</string>
-    <string name="preferences_menu_change_account">Change sync account</string>
-    <string name="preferences_menu_remove_account">Remove sync account</string>
-    <string name="preferences_menu_cancel">Cancel</string>
-    <string name="preferences_button_sync_immediately">Sync immediately</string>
-    <string name="preferences_button_sync_cancel">Cancel syncing</string>
-    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
-    <string name="preferences_dialog_select_account_title">Sync notes</string>
-    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
-    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
-    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="preferences_user_center_title">User Center</string>
+    <string name="preferences_user_center_summary">Current user: %1$s</string>
+    <string name="preferences_user_center_not_logged_in">Not logged in</string>
+    <string name="menu_login">Login</string>
+    <string name="menu_register">Register</string>
+    <string name="menu_logout">Logout</string>
+    <string name="toast_logout_success">Logout successful</string>
     <string name="preferences_bg_random_appear_title">New note background color random</string>
-    <string name="preferences_elder_mode_title">Elderly Mode</string>
-    <string name="preferences_elder_mode_summary">Use larger font size for better readability</string>
+    <string name="preferences_elder_mode_title">Elder mode</string>
 
     <string name="button_delete">Delete</string>
     <string name="call_record_folder_name">Call notes</string>
     <string name="hint_foler_name">Input name</string>
 
+    <!-- 用户登录/注册相关字符串 -->
+    <string name="title_login">Login</string>
+    <string name="title_register">Register</string>
+    <string name="btn_login">Login</string>
+    <string name="btn_register">Register</string>
+    <string name="text_register_account">Don\'t have an account? Register</string>
+    <string name="hint_username">Username</string>
+    <string name="hint_login_password">Password</string>
+    <string name="hint_confirm_password">Confirm Password</string>
+    <string name="error_username_empty">Username cannot be empty</string>
+    <string name="error_login_failed">Username or password is incorrect</string>
+    <string name="error_username_exists">Username already exists</string>
+    <string name="error_register_failed">Registration failed</string>
+    <string name="toast_login_success">Login successful</string>
+    <string name="toast_register_success">Registration successful</string>
+    <string name="error_sync_not_available">Sync feature is no longer available</string>
+
     <string name="search_label">Searching Notes</string>
     <string name="search_hint">Search notes</string>
     <string name="search_setting_description">Text in your notes</string>
@@ -139,4 +144,40 @@
         <item quantity="other"><xliff:g id="number" example="15">%1$s</xliff:g> results for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
     </plurals>
 
+    <string name="change_background_color">Change background color</string>
+
+    <!-- 便签加锁相关字符串 -->
+    <string name="menu_lock">加锁</string>
+    <string name="menu_unlock">解锁</string>
+    <string name="menu_security_settings">加密设置</string>
+    <string name="menu_set_password">设置密码</string>
+    <string name="menu_change_password">修改密码</string>
+    <string name="menu_clear_password">清除密码</string>
+    <string name="preferences_security_category">安全设置</string>
+    <string name="preferences_security_title">加密设置</string>
+    <string name="preferences_security_summary">设置、修改或清除便签密码</string>
+    <string name="preferences_password_set">密码已设置</string>
+    <string name="preferences_password_not_set">密码未设置</string>
+    <string name="title_locked_note">便签已加锁</string>
+    <string name="title_unlock_note">解锁便签</string>
+    <string name="title_set_password">设置密码</string>
+    <string name="title_change_password">修改密码</string>
+    <string name="title_verify_password">验证密码</string>
+    <string name="hint_enter_password">请输入密码</string>
+    <string name="hint_password">密码</string>
+    <string name="hint_new_password">新密码</string>
+    <string name="hint_old_password">原密码</string>
+    <string name="error_wrong_password">密码错误</string>
+    <string name="error_no_password_set">请先设置密码</string>
+    <string name="error_password_empty">密码不能为空</string>
+    <string name="error_password_mismatch">两次密码不一致</string>
+    <string name="error_operation_failed">操作失败</string>
+    <string name="toast_lock_success">加锁成功</string>
+    <string name="toast_unlock_success">解锁成功</string>
+    <string name="toast_password_set_success">密码设置成功</string>
+    <string name="toast_password_change_success">密码修改成功</string>
+    <string name="toast_password_cleared">密码已清除</string>
+    <string name="message_batch_unlock">解锁选中的 %d 条便签</string>
+    <string name="message_clear_password_confirm">确定要清除密码吗？清除后所有便签将不再受保护。</string>
+
 </resources>
diff --git a/src/res/values/styles.xml b/src/res/values/styles.xml
index c1eddb2..5e85e39 100644
--- a/src/res/values/styles.xml
+++ b/src/res/values/styles.xml
@@ -15,54 +15,119 @@
      limitations under the License.
 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="TextAppearanceSuper">
         <item name="android:textSize">@dimen/text_font_size_super</item>
-        <item name="android:textColorLink">#0000ff</item>
+        <item name="android:textColorLink">@color/text_link</item>
+        <item name="android:lineSpacingMultiplier">1.4</item>
     </style>
     <style name="TextAppearanceLarge">
         <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#0000ff</item>
+        <item name="android:textColorLink">@color/text_link</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
     </style>
     <style name="TextAppearanceMedium">
         <item name="android:textSize">@dimen/text_font_size_medium</item>
-        <item name="android:textColorLink">#0000ff</item>
+        <item name="android:textColorLink">@color/text_link</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
     </style>
     <style name="TextAppearanceNormal">
         <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColorLink">#0000ff</item>
+        <item name="android:textColorLink">@color/text_link</item>
+        <item name="android:lineSpacingMultiplier">1.4</item>
     </style>
 
     <style name="TextAppearancePrimaryItem">
         <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
+        <item name="android:textColor">@color/text_primary</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
     </style>
 
     <style name="TextAppearanceSecondaryItem">
         <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
+        <item name="android:textColor">@color/text_secondary</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
     </style>
 
     <style name="TextAppearanceUnderMenuIcon">
         <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@android:color/black</item>
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="HighlightTextAppearancePrimary">
     <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
+        <item name="android:textColor">@color/text_primary</item>
     </style>
 
     <style name="HighlightTextAppearanceSecondary">
         <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
+        <item name="android:textColor">@color/text_secondary</item>
     </style>
 
-    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+    <!-- Material Design 3 Styles -->
+    <style name="NoteTheme" parent="Theme.NotesMaster">
+        <!-- Inherits all configuration from Theme.NotesMaster -->
+        <!-- Additional dialog-specific styling if needed -->
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="NoteActionBarStyle" parent="Theme.Material3.DayNight">
+        <item name="android:background">@color/surface</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
+    <!-- Material Card Style -->
+    <style name="MaterialCard" parent="Widget.Material3.CardView.Elevated">
+        <item name="cardCornerRadius">12dp</item>
+        <item name="cardElevation">2dp</item>
+        <item name="cardBackgroundColor">@color/surface</item>
+        <item name="contentPadding">16dp</item>
+    </style>
+
+    <!-- Material Button Styles -->
+    <style name="MaterialButton" parent="Widget.Material3.Button">
+        <item name="android:textAllCaps">false</item>
+        <item name="cornerRadius">8dp</item>
+        <item name="android:paddingStart">24dp</item>
+        <item name="android:paddingEnd">24dp</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingBottom">12dp</item>
+    </style>
+
+    <style name="MaterialButtonOutlined" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textAllCaps">false</item>
+        <item name="cornerRadius">8dp</item>
+        <item name="strokeColor">@color/outline</item>
+        <item name="strokeWidth">1dp</item>
+        <item name="android:paddingStart">24dp</item>
+        <item name="android:paddingEnd">24dp</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingBottom">12dp</item>
+    </style>
+
+    <!-- Material FAB Style -->
+    <style name="MaterialFAB" parent="Widget.Material3.FloatingActionButton.Primary">
+        <item name="fabSize">normal</item>
+        <item name="backgroundTint">@color/primary</item>
+        <item name="tint">@color/on_primary</item>
+    </style>
+
+    <!-- Material EditText Style -->
+    <style name="MaterialEditText" parent="Widget.Material3.TextInputLayout.OutlinedBox">
+        <item name="boxStrokeColor">@color/outline</item>
+        <item name="boxCornerRadiusBottomEnd">8dp</item>
+        <item name="boxCornerRadiusBottomStart">8dp</item>
+        <item name="boxCornerRadiusTopEnd">8dp</item>
+        <item name="boxCornerRadiusTopStart">8dp</item>
+    </style>
+
+    <!-- Legacy Theme (for backward compatibility) -->
+    <style name="NoteThemeLegacy" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style>
 
-    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+    <style name="NoteActionBarStyleLegacy" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/src/res/values/themes.xml b/src/res/values/themes.xml
index 7c616ff..5a90d43 100644
--- a/src/res/values/themes.xml
+++ b/src/res/values/themes.xml
@@ -1,9 +1,45 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.Notesmaster" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+    <!-- Base application theme with Material Design 3 -->
+    <style name="Base.Theme.NotesMaster" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Primary Colors -->
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorOnPrimary">@color/on_primary</item>
+        <item name="colorPrimaryContainer">@color/primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/on_primary_container</item>
+
+        <!-- Secondary Colors -->
+        <item name="colorSecondary">@color/secondary</item>
+        <item name="colorOnSecondary">@color/on_secondary</item>
+        <item name="colorSecondaryContainer">@color/secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/on_secondary_container</item>
+
+        <!-- Background & Surface Colors -->
+        <item name="android:windowBackground">@color/background</item>
+        <item name="android:colorBackground">@color/background</item>
+        <item name="colorSurface">@color/surface</item>
+        <item name="colorOnSurface">@color/on_surface</item>
+        <item name="colorOnSurfaceVariant">@color/on_surface_variant</item>
+
+        <!-- Error Colors -->
+        <item name="colorError">@color/error</item>
+        <item name="colorOnError">@color/on_error</item>
+        <item name="colorErrorContainer">@color/error_container</item>
+        <item name="colorOnErrorContainer">@color/on_error</item>
+
+        <!-- Text Colors -->
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        <item name="android:textColorHint">@color/text_hint</item>
+
+        <!-- Ripple Effect -->
+        <item name="android:colorControlHighlight">@color/ripple</item>
+
+        <!-- Status Bar & Navigation Bar -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
     </style>
 
-    <style name="Theme.Notesmaster" parent="Base.Theme.Notesmaster" />
+    <style name="Theme.NotesMaster" parent="Base.Theme.NotesMaster" />
 </resources>
\ No newline at end of file
diff --git a/src/res/xml/file_paths.xml b/src/res/xml/file_paths.xml
new file mode 100644
index 0000000..0e45a3d
--- /dev/null
+++ b/src/res/xml/file_paths.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-files-path name="external_files" path="." />
+    <files-path name="files" path="." />
+    <cache-path name="cache" path="." />
+    <external-path name="external" path="." />
+</paths>
\ No newline at end of file
diff --git a/src/res/xml/preferences.xml b/src/res/xml/preferences.xml
index 451be41..f007d0b 100644
--- a/src/res/xml/preferences.xml
+++ b/src/res/xml/preferences.xml
@@ -17,8 +17,10 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="pref_sync_account_key">
+    <PreferenceCategory android:title="@string/preferences_user_center_title">
+        <Preference
+            android:key="pref_user_center"
+            android:title="@string/preferences_user_center_title" />
     </PreferenceCategory>
 
     <PreferenceCategory>
@@ -29,7 +31,12 @@
         <CheckBoxPreference
             android:key="pref_key_elder_mode"
             android:title="@string/preferences_elder_mode_title"
-            android:summary="@string/preferences_elder_mode_summary"
             android:defaultValue="false" />
     </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/preferences_security_category">
+        <Preference
+            android:key="pref_security_settings"
+            android:title="@string/preferences_security_title" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/res/xml/searchable.xml b/src/res/xml/searchable.xml
index 03b467a..bf74f14 100644
--- a/src/res/xml/searchable.xml
+++ b/src/res/xml/searchable.xml
@@ -21,7 +21,7 @@
     android:hint="@string/search_hint"
     android:searchMode="queryRewriteFromText"
 
-    android:searchSuggestAuthority="micode_notes"
+    android:searchSuggestAuthority="notes"
     android:searchSuggestIntentAction="android.intent.action.VIEW"
     android:searchSettingsDescription="@string/search_setting_description"
     android:includeInGlobalSearch="true" />