diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
deleted file mode 100644
index f2062ec..0000000
--- a/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,232 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.micode.notes"
-    android:versionCode="1"
-    android:versionName="0.1" >
-
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- 蓝牙录音使用，不需要可以去除 -->
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-
-    <application
-        android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
-
-        <activity
-            android:name=".ui.LoginActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-            <!--android:uiOptions="splitActionBarWhenNarrow"-->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ui.ChangedLoginPassword"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
-
-        <activity
-            android:name=".ui.RegisterLoginPassword"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-        </activity>
-
-        <activity
-        android:name=".ui.DeleteLoginPassword"
-        android:configChanges="keyboardHidden|orientation|screenSize"
-        android:label="@string/app_name"
-        android:launchMode="singleTop"
-        android:theme="@style/NoteTheme"
-        android:windowSoftInputMode="adjustPan" >
-        </activity>
-
-
-        <activity
-            android:name=".ui.SearchActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan"
-            tools:ignore="MissingClass">
-        </activity>
-
-
-
-        <activity
-            android:name=".ui.NotesListActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-            <!--android:uiOptions="splitActionBarWhenNarrow"-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-        </activity>
-
-        <activity
-            android:name=".ui.NoteEditActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-            <intent-filter>
-              <action android:name="android.intent.action.SEARCH" />
-              <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-<!--            <meta-data>必须包括android:name这个属性，而且其值必须为"android.app.searchable"，-->
-<!--            还必须包括android:resource这个属性，它指定了我们的search dialog的配置文件。-->
-
-        </activity>
-
-        <provider
-            android:name="net.micode.notes.data.NotesProvider"
-            android:authorities="micode_notes"
-            android:exported="false"
-            android:multiprocess="true">
-        </provider>
-
-        <receiver
-            android:name=".widget.NoteWidgetProvider_2x"
-            android:label="@string/app_widget2x2" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_2x_info" />
-        </receiver>
-
-        <receiver
-            android:name=".widget.NoteWidgetProvider_4x"
-            android:label="@string/app_widget4x4" >
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_4x_info" />
-        </receiver>
-
-        <receiver android:name=".ui.AlarmInitReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
-        </receiver>
-
-        <activity
-            android:name=".ui.AlarmAlertActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-        </activity>
-
-        <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-            android:label="@string/preferences_title"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
-
-        <activity
-            android:name="net.micode.notes.ui.BoardActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
-
-        <service
-            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
-
-        <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".ui.NoteEditActivity" />
-<!--        如果你想为你的应用程序的每个activity 都提供该search dialog, 那么将<meta-data>元素加入<application>中，
-            通过这种方式, 每个activity 都继承了该值, 提供search dialog, 并把searches传送到同一个searchable activity.
-            <meta-data>元素，它声明了使用哪个searchable activity来执行搜索-->
-    </application>
-</manifest>
diff --git a/src/main/assets/Fonts/8514fix.fon b/src/main/assets/Fonts/8514fix.fon
deleted file mode 100644
index f9b9bba..0000000
Binary files a/src/main/assets/Fonts/8514fix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514fixe.fon b/src/main/assets/Fonts/8514fixe.fon
deleted file mode 100644
index 482c00c..0000000
Binary files a/src/main/assets/Fonts/8514fixe.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514fixg.fon b/src/main/assets/Fonts/8514fixg.fon
deleted file mode 100644
index fe24af2..0000000
Binary files a/src/main/assets/Fonts/8514fixg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514fixr.fon b/src/main/assets/Fonts/8514fixr.fon
deleted file mode 100644
index fb0d5c3..0000000
Binary files a/src/main/assets/Fonts/8514fixr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514fixt.fon b/src/main/assets/Fonts/8514fixt.fon
deleted file mode 100644
index 8cea2d6..0000000
Binary files a/src/main/assets/Fonts/8514fixt.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514oem.fon b/src/main/assets/Fonts/8514oem.fon
deleted file mode 100644
index 98c4dc5..0000000
Binary files a/src/main/assets/Fonts/8514oem.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514oeme.fon b/src/main/assets/Fonts/8514oeme.fon
deleted file mode 100644
index 2bf5f97..0000000
Binary files a/src/main/assets/Fonts/8514oeme.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514oemg.fon b/src/main/assets/Fonts/8514oemg.fon
deleted file mode 100644
index 75154ec..0000000
Binary files a/src/main/assets/Fonts/8514oemg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514oemr.fon b/src/main/assets/Fonts/8514oemr.fon
deleted file mode 100644
index 516541d..0000000
Binary files a/src/main/assets/Fonts/8514oemr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514oemt.fon b/src/main/assets/Fonts/8514oemt.fon
deleted file mode 100644
index ad72f95..0000000
Binary files a/src/main/assets/Fonts/8514oemt.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514sys.fon b/src/main/assets/Fonts/8514sys.fon
deleted file mode 100644
index 986a8a2..0000000
Binary files a/src/main/assets/Fonts/8514sys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514syse.fon b/src/main/assets/Fonts/8514syse.fon
deleted file mode 100644
index 60a0ced..0000000
Binary files a/src/main/assets/Fonts/8514syse.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514sysg.fon b/src/main/assets/Fonts/8514sysg.fon
deleted file mode 100644
index 3829be4..0000000
Binary files a/src/main/assets/Fonts/8514sysg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514sysr.fon b/src/main/assets/Fonts/8514sysr.fon
deleted file mode 100644
index a640fcc..0000000
Binary files a/src/main/assets/Fonts/8514sysr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/8514syst.fon b/src/main/assets/Fonts/8514syst.fon
deleted file mode 100644
index 25abc43..0000000
Binary files a/src/main/assets/Fonts/8514syst.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85775.fon b/src/main/assets/Fonts/85775.fon
deleted file mode 100644
index bfc4aab..0000000
Binary files a/src/main/assets/Fonts/85775.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85855.fon b/src/main/assets/Fonts/85855.fon
deleted file mode 100644
index 09c405b..0000000
Binary files a/src/main/assets/Fonts/85855.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85f1255.fon b/src/main/assets/Fonts/85f1255.fon
deleted file mode 100644
index 09c71c5..0000000
Binary files a/src/main/assets/Fonts/85f1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85f1256.fon b/src/main/assets/Fonts/85f1256.fon
deleted file mode 100644
index e9c8a02..0000000
Binary files a/src/main/assets/Fonts/85f1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85f1257.fon b/src/main/assets/Fonts/85f1257.fon
deleted file mode 100644
index 2cb5b9c..0000000
Binary files a/src/main/assets/Fonts/85f1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85f874.fon b/src/main/assets/Fonts/85f874.fon
deleted file mode 100644
index 23f3960..0000000
Binary files a/src/main/assets/Fonts/85f874.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85s1255.fon b/src/main/assets/Fonts/85s1255.fon
deleted file mode 100644
index 341d190..0000000
Binary files a/src/main/assets/Fonts/85s1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85s1256.fon b/src/main/assets/Fonts/85s1256.fon
deleted file mode 100644
index 06b4fb4..0000000
Binary files a/src/main/assets/Fonts/85s1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85s1257.fon b/src/main/assets/Fonts/85s1257.fon
deleted file mode 100644
index 50bfb8f..0000000
Binary files a/src/main/assets/Fonts/85s1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/85s874.fon b/src/main/assets/Fonts/85s874.fon
deleted file mode 100644
index 8f3d0f3..0000000
Binary files a/src/main/assets/Fonts/85s874.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/AGENCYB.TTF b/src/main/assets/Fonts/AGENCYB.TTF
deleted file mode 100644
index 8704061..0000000
Binary files a/src/main/assets/Fonts/AGENCYB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/AGENCYR.TTF b/src/main/assets/Fonts/AGENCYR.TTF
deleted file mode 100644
index f0f7e95..0000000
Binary files a/src/main/assets/Fonts/AGENCYR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ALGER.TTF b/src/main/assets/Fonts/ALGER.TTF
deleted file mode 100644
index dcc72ae..0000000
Binary files a/src/main/assets/Fonts/ALGER.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ANTQUAB.TTF b/src/main/assets/Fonts/ANTQUAB.TTF
deleted file mode 100644
index 60519c5..0000000
Binary files a/src/main/assets/Fonts/ANTQUAB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ANTQUABI.TTF b/src/main/assets/Fonts/ANTQUABI.TTF
deleted file mode 100644
index 59a731c..0000000
Binary files a/src/main/assets/Fonts/ANTQUABI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ANTQUAI.TTF b/src/main/assets/Fonts/ANTQUAI.TTF
deleted file mode 100644
index cf99b3a..0000000
Binary files a/src/main/assets/Fonts/ANTQUAI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ARIALN.TTF b/src/main/assets/Fonts/ARIALN.TTF
deleted file mode 100644
index 94907a3..0000000
Binary files a/src/main/assets/Fonts/ARIALN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ARIALNB.TTF b/src/main/assets/Fonts/ARIALNB.TTF
deleted file mode 100644
index 62437f0..0000000
Binary files a/src/main/assets/Fonts/ARIALNB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ARIALNBI.TTF b/src/main/assets/Fonts/ARIALNBI.TTF
deleted file mode 100644
index d3f019a..0000000
Binary files a/src/main/assets/Fonts/ARIALNBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ARIALNI.TTF b/src/main/assets/Fonts/ARIALNI.TTF
deleted file mode 100644
index 4acd468..0000000
Binary files a/src/main/assets/Fonts/ARIALNI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ARIALUNI.TTF b/src/main/assets/Fonts/ARIALUNI.TTF
deleted file mode 100644
index 51a18bc..0000000
Binary files a/src/main/assets/Fonts/ARIALUNI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ARLRDBD.TTF b/src/main/assets/Fonts/ARLRDBD.TTF
deleted file mode 100644
index 20b92a2..0000000
Binary files a/src/main/assets/Fonts/ARLRDBD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BASKVILL.TTF b/src/main/assets/Fonts/BASKVILL.TTF
deleted file mode 100644
index 21f63f8..0000000
Binary files a/src/main/assets/Fonts/BASKVILL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BAUHS93.TTF b/src/main/assets/Fonts/BAUHS93.TTF
deleted file mode 100644
index 42c3238..0000000
Binary files a/src/main/assets/Fonts/BAUHS93.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BELL.TTF b/src/main/assets/Fonts/BELL.TTF
deleted file mode 100644
index 3f42675..0000000
Binary files a/src/main/assets/Fonts/BELL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BELLB.TTF b/src/main/assets/Fonts/BELLB.TTF
deleted file mode 100644
index 2e32d41..0000000
Binary files a/src/main/assets/Fonts/BELLB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BELLI.TTF b/src/main/assets/Fonts/BELLI.TTF
deleted file mode 100644
index e58132e..0000000
Binary files a/src/main/assets/Fonts/BELLI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BERNHC.TTF b/src/main/assets/Fonts/BERNHC.TTF
deleted file mode 100644
index bb9b711..0000000
Binary files a/src/main/assets/Fonts/BERNHC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BKANT.TTF b/src/main/assets/Fonts/BKANT.TTF
deleted file mode 100644
index d52046c..0000000
Binary files a/src/main/assets/Fonts/BKANT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_B.TTF b/src/main/assets/Fonts/BOD_B.TTF
deleted file mode 100644
index 24de599..0000000
Binary files a/src/main/assets/Fonts/BOD_B.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_BI.TTF b/src/main/assets/Fonts/BOD_BI.TTF
deleted file mode 100644
index 38c4ca0..0000000
Binary files a/src/main/assets/Fonts/BOD_BI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_BLAI.TTF b/src/main/assets/Fonts/BOD_BLAI.TTF
deleted file mode 100644
index 143568c..0000000
Binary files a/src/main/assets/Fonts/BOD_BLAI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_BLAR.TTF b/src/main/assets/Fonts/BOD_BLAR.TTF
deleted file mode 100644
index f05f9e4..0000000
Binary files a/src/main/assets/Fonts/BOD_BLAR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_CB.TTF b/src/main/assets/Fonts/BOD_CB.TTF
deleted file mode 100644
index 719c285..0000000
Binary files a/src/main/assets/Fonts/BOD_CB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_CBI.TTF b/src/main/assets/Fonts/BOD_CBI.TTF
deleted file mode 100644
index b310ea4..0000000
Binary files a/src/main/assets/Fonts/BOD_CBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_CI.TTF b/src/main/assets/Fonts/BOD_CI.TTF
deleted file mode 100644
index ef709de..0000000
Binary files a/src/main/assets/Fonts/BOD_CI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_CR.TTF b/src/main/assets/Fonts/BOD_CR.TTF
deleted file mode 100644
index 2dd7db5..0000000
Binary files a/src/main/assets/Fonts/BOD_CR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_I.TTF b/src/main/assets/Fonts/BOD_I.TTF
deleted file mode 100644
index 82e4dc1..0000000
Binary files a/src/main/assets/Fonts/BOD_I.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_PSTC.TTF b/src/main/assets/Fonts/BOD_PSTC.TTF
deleted file mode 100644
index 312515f..0000000
Binary files a/src/main/assets/Fonts/BOD_PSTC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOD_R.TTF b/src/main/assets/Fonts/BOD_R.TTF
deleted file mode 100644
index 1861bc8..0000000
Binary files a/src/main/assets/Fonts/BOD_R.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOOKOS.TTF b/src/main/assets/Fonts/BOOKOS.TTF
deleted file mode 100644
index d5ed82f..0000000
Binary files a/src/main/assets/Fonts/BOOKOS.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOOKOSB.TTF b/src/main/assets/Fonts/BOOKOSB.TTF
deleted file mode 100644
index 51f362d..0000000
Binary files a/src/main/assets/Fonts/BOOKOSB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOOKOSBI.TTF b/src/main/assets/Fonts/BOOKOSBI.TTF
deleted file mode 100644
index bfbe1ea..0000000
Binary files a/src/main/assets/Fonts/BOOKOSBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BOOKOSI.TTF b/src/main/assets/Fonts/BOOKOSI.TTF
deleted file mode 100644
index 6d14b35..0000000
Binary files a/src/main/assets/Fonts/BOOKOSI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BRADHITC.TTF b/src/main/assets/Fonts/BRADHITC.TTF
deleted file mode 100644
index 2b3c309..0000000
Binary files a/src/main/assets/Fonts/BRADHITC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BRITANIC.TTF b/src/main/assets/Fonts/BRITANIC.TTF
deleted file mode 100644
index e98502b..0000000
Binary files a/src/main/assets/Fonts/BRITANIC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BRLNSB.TTF b/src/main/assets/Fonts/BRLNSB.TTF
deleted file mode 100644
index 509477e..0000000
Binary files a/src/main/assets/Fonts/BRLNSB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BRLNSDB.TTF b/src/main/assets/Fonts/BRLNSDB.TTF
deleted file mode 100644
index e5f34b2..0000000
Binary files a/src/main/assets/Fonts/BRLNSDB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BRLNSR.TTF b/src/main/assets/Fonts/BRLNSR.TTF
deleted file mode 100644
index efaf22f..0000000
Binary files a/src/main/assets/Fonts/BRLNSR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BROADW.TTF b/src/main/assets/Fonts/BROADW.TTF
deleted file mode 100644
index 62aeb1e..0000000
Binary files a/src/main/assets/Fonts/BROADW.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BRUSHSCI.TTF b/src/main/assets/Fonts/BRUSHSCI.TTF
deleted file mode 100644
index 85634c0..0000000
Binary files a/src/main/assets/Fonts/BRUSHSCI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/BSSYM7.TTF b/src/main/assets/Fonts/BSSYM7.TTF
deleted file mode 100644
index 2e7c357..0000000
Binary files a/src/main/assets/Fonts/BSSYM7.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALIFB.TTF b/src/main/assets/Fonts/CALIFB.TTF
deleted file mode 100644
index 91bc7a8..0000000
Binary files a/src/main/assets/Fonts/CALIFB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALIFI.TTF b/src/main/assets/Fonts/CALIFI.TTF
deleted file mode 100644
index 13d92cd..0000000
Binary files a/src/main/assets/Fonts/CALIFI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALIFR.TTF b/src/main/assets/Fonts/CALIFR.TTF
deleted file mode 100644
index 70c54c3..0000000
Binary files a/src/main/assets/Fonts/CALIFR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALIST.TTF b/src/main/assets/Fonts/CALIST.TTF
deleted file mode 100644
index 8a013cb..0000000
Binary files a/src/main/assets/Fonts/CALIST.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALISTB.TTF b/src/main/assets/Fonts/CALISTB.TTF
deleted file mode 100644
index a198dd0..0000000
Binary files a/src/main/assets/Fonts/CALISTB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALISTBI.TTF b/src/main/assets/Fonts/CALISTBI.TTF
deleted file mode 100644
index 1d7a407..0000000
Binary files a/src/main/assets/Fonts/CALISTBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CALISTI.TTF b/src/main/assets/Fonts/CALISTI.TTF
deleted file mode 100644
index 07656ef..0000000
Binary files a/src/main/assets/Fonts/CALISTI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CASTELAR.TTF b/src/main/assets/Fonts/CASTELAR.TTF
deleted file mode 100644
index 47c3147..0000000
Binary files a/src/main/assets/Fonts/CASTELAR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CENSCBK.TTF b/src/main/assets/Fonts/CENSCBK.TTF
deleted file mode 100644
index f395102..0000000
Binary files a/src/main/assets/Fonts/CENSCBK.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CENTAUR.TTF b/src/main/assets/Fonts/CENTAUR.TTF
deleted file mode 100644
index 1c2abac..0000000
Binary files a/src/main/assets/Fonts/CENTAUR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CENTURY.TTF b/src/main/assets/Fonts/CENTURY.TTF
deleted file mode 100644
index cb46e46..0000000
Binary files a/src/main/assets/Fonts/CENTURY.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CHILLER.TTF b/src/main/assets/Fonts/CHILLER.TTF
deleted file mode 100644
index 3ebfa84..0000000
Binary files a/src/main/assets/Fonts/CHILLER.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/COLONNA.TTF b/src/main/assets/Fonts/COLONNA.TTF
deleted file mode 100644
index 23de991..0000000
Binary files a/src/main/assets/Fonts/COLONNA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/COOPBL.TTF b/src/main/assets/Fonts/COOPBL.TTF
deleted file mode 100644
index 79e7048..0000000
Binary files a/src/main/assets/Fonts/COOPBL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/COPRGTB.TTF b/src/main/assets/Fonts/COPRGTB.TTF
deleted file mode 100644
index 764965d..0000000
Binary files a/src/main/assets/Fonts/COPRGTB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/COPRGTL.TTF b/src/main/assets/Fonts/COPRGTL.TTF
deleted file mode 100644
index a0edd5c..0000000
Binary files a/src/main/assets/Fonts/COPRGTL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/CURLZ___.TTF b/src/main/assets/Fonts/CURLZ___.TTF
deleted file mode 100644
index fbcd460..0000000
Binary files a/src/main/assets/Fonts/CURLZ___.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/Candara.ttf b/src/main/assets/Fonts/Candara.ttf
deleted file mode 100644
index b9817e2..0000000
Binary files a/src/main/assets/Fonts/Candara.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Candarab.ttf b/src/main/assets/Fonts/Candarab.ttf
deleted file mode 100644
index d9ab172..0000000
Binary files a/src/main/assets/Fonts/Candarab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Candarai.ttf b/src/main/assets/Fonts/Candarai.ttf
deleted file mode 100644
index 4f4e239..0000000
Binary files a/src/main/assets/Fonts/Candarai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Candaral.ttf b/src/main/assets/Fonts/Candaral.ttf
deleted file mode 100644
index a7b9c80..0000000
Binary files a/src/main/assets/Fonts/Candaral.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Candarali.ttf b/src/main/assets/Fonts/Candarali.ttf
deleted file mode 100644
index 190cc89..0000000
Binary files a/src/main/assets/Fonts/Candarali.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Candaraz.ttf b/src/main/assets/Fonts/Candaraz.ttf
deleted file mode 100644
index 124b59f..0000000
Binary files a/src/main/assets/Fonts/Candaraz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/DINNextLTPro-Bold.ttf b/src/main/assets/Fonts/DINNextLTPro-Bold.ttf
deleted file mode 100644
index 64f9aa9..0000000
Binary files a/src/main/assets/Fonts/DINNextLTPro-Bold.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/DINNextLTPro-Light.ttf b/src/main/assets/Fonts/DINNextLTPro-Light.ttf
deleted file mode 100644
index cbd9444..0000000
Binary files a/src/main/assets/Fonts/DINNextLTPro-Light.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/DINNextLTPro-Medium.ttf b/src/main/assets/Fonts/DINNextLTPro-Medium.ttf
deleted file mode 100644
index 2a1833e..0000000
Binary files a/src/main/assets/Fonts/DINNextLTPro-Medium.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/DINNextLTPro-Regular.ttf b/src/main/assets/Fonts/DINNextLTPro-Regular.ttf
deleted file mode 100644
index 1cab646..0000000
Binary files a/src/main/assets/Fonts/DINNextLTPro-Regular.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/DUBAI-BOLD.TTF b/src/main/assets/Fonts/DUBAI-BOLD.TTF
deleted file mode 100644
index f72642f..0000000
Binary files a/src/main/assets/Fonts/DUBAI-BOLD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/DUBAI-LIGHT.TTF b/src/main/assets/Fonts/DUBAI-LIGHT.TTF
deleted file mode 100644
index 9ec24da..0000000
Binary files a/src/main/assets/Fonts/DUBAI-LIGHT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/DUBAI-MEDIUM.TTF b/src/main/assets/Fonts/DUBAI-MEDIUM.TTF
deleted file mode 100644
index c52df5d..0000000
Binary files a/src/main/assets/Fonts/DUBAI-MEDIUM.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/DUBAI-REGULAR.TTF b/src/main/assets/Fonts/DUBAI-REGULAR.TTF
deleted file mode 100644
index 9d9cea1..0000000
Binary files a/src/main/assets/Fonts/DUBAI-REGULAR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/Deng.ttf b/src/main/assets/Fonts/Deng.ttf
deleted file mode 100644
index 1eb188e..0000000
Binary files a/src/main/assets/Fonts/Deng.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Dengb.ttf b/src/main/assets/Fonts/Dengb.ttf
deleted file mode 100644
index 4873453..0000000
Binary files a/src/main/assets/Fonts/Dengb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/Dengl.ttf b/src/main/assets/Fonts/Dengl.ttf
deleted file mode 100644
index 3d6ca1f..0000000
Binary files a/src/main/assets/Fonts/Dengl.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ELEPHNT.TTF b/src/main/assets/Fonts/ELEPHNT.TTF
deleted file mode 100644
index 024b076..0000000
Binary files a/src/main/assets/Fonts/ELEPHNT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ELEPHNTI.TTF b/src/main/assets/Fonts/ELEPHNTI.TTF
deleted file mode 100644
index 16ddd20..0000000
Binary files a/src/main/assets/Fonts/ELEPHNTI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ENGR.TTF b/src/main/assets/Fonts/ENGR.TTF
deleted file mode 100644
index aa5a7ea..0000000
Binary files a/src/main/assets/Fonts/ENGR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ERASBD.TTF b/src/main/assets/Fonts/ERASBD.TTF
deleted file mode 100644
index e4d3496..0000000
Binary files a/src/main/assets/Fonts/ERASBD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ERASDEMI.TTF b/src/main/assets/Fonts/ERASDEMI.TTF
deleted file mode 100644
index 4e6bfd1..0000000
Binary files a/src/main/assets/Fonts/ERASDEMI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ERASLGHT.TTF b/src/main/assets/Fonts/ERASLGHT.TTF
deleted file mode 100644
index e8fc22f..0000000
Binary files a/src/main/assets/Fonts/ERASLGHT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ERASMD.TTF b/src/main/assets/Fonts/ERASMD.TTF
deleted file mode 100644
index bfb1b66..0000000
Binary files a/src/main/assets/Fonts/ERASMD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FELIXTI.TTF b/src/main/assets/Fonts/FELIXTI.TTF
deleted file mode 100644
index 3d2cc8e..0000000
Binary files a/src/main/assets/Fonts/FELIXTI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FORTE.TTF b/src/main/assets/Fonts/FORTE.TTF
deleted file mode 100644
index f4dfaa7..0000000
Binary files a/src/main/assets/Fonts/FORTE.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRABK.TTF b/src/main/assets/Fonts/FRABK.TTF
deleted file mode 100644
index 21c4ecf..0000000
Binary files a/src/main/assets/Fonts/FRABK.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRABKIT.TTF b/src/main/assets/Fonts/FRABKIT.TTF
deleted file mode 100644
index e1c8198..0000000
Binary files a/src/main/assets/Fonts/FRABKIT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRADM.TTF b/src/main/assets/Fonts/FRADM.TTF
deleted file mode 100644
index 8afb611..0000000
Binary files a/src/main/assets/Fonts/FRADM.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRADMCN.TTF b/src/main/assets/Fonts/FRADMCN.TTF
deleted file mode 100644
index 34ffc7a..0000000
Binary files a/src/main/assets/Fonts/FRADMCN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRADMIT.TTF b/src/main/assets/Fonts/FRADMIT.TTF
deleted file mode 100644
index 3e44bf1..0000000
Binary files a/src/main/assets/Fonts/FRADMIT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRAHV.TTF b/src/main/assets/Fonts/FRAHV.TTF
deleted file mode 100644
index fd61ff4..0000000
Binary files a/src/main/assets/Fonts/FRAHV.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRAHVIT.TTF b/src/main/assets/Fonts/FRAHVIT.TTF
deleted file mode 100644
index 0549c85..0000000
Binary files a/src/main/assets/Fonts/FRAHVIT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRAMDCN.TTF b/src/main/assets/Fonts/FRAMDCN.TTF
deleted file mode 100644
index efe9364..0000000
Binary files a/src/main/assets/Fonts/FRAMDCN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FREESCPT.TTF b/src/main/assets/Fonts/FREESCPT.TTF
deleted file mode 100644
index 196c56c..0000000
Binary files a/src/main/assets/Fonts/FREESCPT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FRSCRIPT.TTF b/src/main/assets/Fonts/FRSCRIPT.TTF
deleted file mode 100644
index ae18af3..0000000
Binary files a/src/main/assets/Fonts/FRSCRIPT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FTLTLT.TTF b/src/main/assets/Fonts/FTLTLT.TTF
deleted file mode 100644
index cc502b3..0000000
Binary files a/src/main/assets/Fonts/FTLTLT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FZSTK.TTF b/src/main/assets/Fonts/FZSTK.TTF
deleted file mode 100644
index 407d370..0000000
Binary files a/src/main/assets/Fonts/FZSTK.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/FZYTK.TTF b/src/main/assets/Fonts/FZYTK.TTF
deleted file mode 100644
index 45c8c19..0000000
Binary files a/src/main/assets/Fonts/FZYTK.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GARA.TTF b/src/main/assets/Fonts/GARA.TTF
deleted file mode 100644
index 0606e80..0000000
Binary files a/src/main/assets/Fonts/GARA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GARABD.TTF b/src/main/assets/Fonts/GARABD.TTF
deleted file mode 100644
index 9dac6cf..0000000
Binary files a/src/main/assets/Fonts/GARABD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GARAIT.TTF b/src/main/assets/Fonts/GARAIT.TTF
deleted file mode 100644
index e77eb1e..0000000
Binary files a/src/main/assets/Fonts/GARAIT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GIGI.TTF b/src/main/assets/Fonts/GIGI.TTF
deleted file mode 100644
index 39745b9..0000000
Binary files a/src/main/assets/Fonts/GIGI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GILBI___.TTF b/src/main/assets/Fonts/GILBI___.TTF
deleted file mode 100644
index 97c6bbb..0000000
Binary files a/src/main/assets/Fonts/GILBI___.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GILB____.TTF b/src/main/assets/Fonts/GILB____.TTF
deleted file mode 100644
index 1cad3fd..0000000
Binary files a/src/main/assets/Fonts/GILB____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GILC____.TTF b/src/main/assets/Fonts/GILC____.TTF
deleted file mode 100644
index 0dca98a..0000000
Binary files a/src/main/assets/Fonts/GILC____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GILI____.TTF b/src/main/assets/Fonts/GILI____.TTF
deleted file mode 100644
index 35d0fe8..0000000
Binary files a/src/main/assets/Fonts/GILI____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GILLUBCD.TTF b/src/main/assets/Fonts/GILLUBCD.TTF
deleted file mode 100644
index 9718060..0000000
Binary files a/src/main/assets/Fonts/GILLUBCD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GILSANUB.TTF b/src/main/assets/Fonts/GILSANUB.TTF
deleted file mode 100644
index a72e5c1..0000000
Binary files a/src/main/assets/Fonts/GILSANUB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GIL_____.TTF b/src/main/assets/Fonts/GIL_____.TTF
deleted file mode 100644
index bb58254..0000000
Binary files a/src/main/assets/Fonts/GIL_____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GLECB.TTF b/src/main/assets/Fonts/GLECB.TTF
deleted file mode 100644
index 0233916..0000000
Binary files a/src/main/assets/Fonts/GLECB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GLSNECB.TTF b/src/main/assets/Fonts/GLSNECB.TTF
deleted file mode 100644
index 211982c..0000000
Binary files a/src/main/assets/Fonts/GLSNECB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOTHIC.TTF b/src/main/assets/Fonts/GOTHIC.TTF
deleted file mode 100644
index c60a324..0000000
Binary files a/src/main/assets/Fonts/GOTHIC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOTHICB.TTF b/src/main/assets/Fonts/GOTHICB.TTF
deleted file mode 100644
index d3577b9..0000000
Binary files a/src/main/assets/Fonts/GOTHICB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOTHICBI.TTF b/src/main/assets/Fonts/GOTHICBI.TTF
deleted file mode 100644
index d01cefa..0000000
Binary files a/src/main/assets/Fonts/GOTHICBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOTHICI.TTF b/src/main/assets/Fonts/GOTHICI.TTF
deleted file mode 100644
index 777a6d8..0000000
Binary files a/src/main/assets/Fonts/GOTHICI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOUDOS.TTF b/src/main/assets/Fonts/GOUDOS.TTF
deleted file mode 100644
index 701b8b5..0000000
Binary files a/src/main/assets/Fonts/GOUDOS.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOUDOSB.TTF b/src/main/assets/Fonts/GOUDOSB.TTF
deleted file mode 100644
index 4cff355..0000000
Binary files a/src/main/assets/Fonts/GOUDOSB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOUDOSI.TTF b/src/main/assets/Fonts/GOUDOSI.TTF
deleted file mode 100644
index 4531dc4..0000000
Binary files a/src/main/assets/Fonts/GOUDOSI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/GOUDYSTO.TTF b/src/main/assets/Fonts/GOUDYSTO.TTF
deleted file mode 100644
index f747443..0000000
Binary files a/src/main/assets/Fonts/GOUDYSTO.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/Gabriola.ttf b/src/main/assets/Fonts/Gabriola.ttf
deleted file mode 100644
index ceaaaf6..0000000
Binary files a/src/main/assets/Fonts/Gabriola.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/GlobalMonospace.CompositeFont b/src/main/assets/Fonts/GlobalMonospace.CompositeFont
deleted file mode 100644
index 86483b2..0000000
--- a/src/main/assets/Fonts/GlobalMonospace.CompositeFont
+++ /dev/null
@@ -1,727 +0,0 @@
-<FontFamily
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/composite-font"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:System="clr-namespace:System;assembly=mscorlib"
-    Baseline="0.9"
-    LineSpacing="1.2">
-
-    <!-- Name mapping -->
-    <FontFamily.FamilyNames>
-        <System:String x:Key="en-US">Global Monospace</System:String>
-    </FontFamily.FamilyNames>
-
-    <!-- Faces to report in font chooser UI -->
-    <FontFamily.FamilyTypefaces>
-        <FamilyTypeface
-            Weight="Normal" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3" StrikethroughThickness="0.05"
-            CapsHeight="0.5" XHeight="0.3" />
-
-        <FamilyTypeface
-            Weight="Bold" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3" StrikethroughThickness="0.05"
-            CapsHeight="0.5" XHeight="0.3" />
-    </FontFamily.FamilyTypefaces>
-
-    <!-- Character to family lookups (in lookup order) -->
-    <FontFamily.FamilyMaps>
-        <!--
-            Basic Latin                 0000-007F
-            Latin-1 Supplement          0080-00FF
-            Latin Extended-A            0100-017F
-            Latin Extended-B            0180-024F
-            IPA Extensions              0250-02AF
-            Spacing Modifier Letters    02B0-02FF 
-            Combining Diacritics Marks  0300-036F 
-            Greek and Coptic            0370-03FF
-            Cyrillic                    0400-04FF 
-            Cyrillic Supplement         0500-052F 
-            Hebrew                      0590-05FF 
-            Arabic                      0600-06FF
-            Arabic Supplement           0750-077F
-            Phonetic Extensions         1D00-1D7F
-            Phonetic Extensions Sup.    1D80-1DBF - Unicode 4.1, supported in Vista fonts
-            Combining Diacritical M. S. 1DC0-1DFF - Unicode 4.1, supported in Vista fonts
-            Latin Extended Additional   1E00-1EFF
-            Greek Extended              1F00-1FFF
-            Alpha Pres Forms Latin      FB00-FB0F
-            Alpha Pres Forms Hebrew     FB1D-FB4F
-            Arabic Pres Forms-A         FB50-FDCF
-            Arabic Pres Forms-A         FDF0-FDFF
-            Combining Half Marks        FE20-FE2F
-            Arabic Pres Forms-B         FE70-FEFE -->
-        <FontFamilyMap
-            Unicode="0000-052F, 0590-06FF, 0750-077F, 1D00-1FFF, FB00-FB0F, FB1D-FDCF, FDF0-FDFF, FE20-FE2F, FE70-FEFE"
-            Target="Courier New"
-            Scale="1.0" />
-
-        <!--
-            Armenian                    0530-058F    
-            Georgian (Mkhedruli)        10D0-10FF
-            Alpha Pres Forms (Armenian) FB10-FB1C -->
-        <FontFamilyMap
-            Unicode="0530-058F, 10D0-10FF, FB10-FB1C"
-            Target="Sylfaen"
-            Scale="1.0" />
-
-        <!-- Syriac                      0700-074F -->
-        <FontFamilyMap
-            Unicode="0700-074F"
-            Target="Estrangelo Edessa"
-            Scale="1.0" />
-
-        <!-- Thaana                      0780-07BF -->
-        <FontFamilyMap
-            Unicode="0780-07BF"
-            Target="MV Boli"
-            Scale="1.0" />
-
-        <!-- Devanagari                  0900-097F -->
-        <FontFamilyMap
-            Unicode="0900-097F"
-            Target="Mangal"
-            Scale="1.0" />
-
-        <!-- Bengali                     0980-09FF -->
-        <FontFamilyMap
-            Unicode="0980-09FF"
-            Target="Vrinda"
-            Scale="1.0" />
-
-        <!-- Gurmukhi                    0A00-0A7F -->
-        <FontFamilyMap
-            Unicode="0A00-0A7F"
-            Target="Raavi"
-            Scale="1.0" />
-
-        <!-- Gujarati                    0A80-0AFF -->
-        <FontFamilyMap
-            Unicode="0A80-0AFF"
-            Target="Shruti"
-            Scale="1.0" />
-
-        <!-- Oriya                       0B00-0B7F -->
-        <FontFamilyMap
-            Unicode="0B00-0B7F"
-            Target="Kalinga"
-            Scale="1.0" />
-
-        <!-- Tamil                       0B80-0BFF -->
-        <FontFamilyMap
-            Unicode="0B80-0BFF"
-            Target="Latha"
-            Scale="1.0" />
-
-        <!-- Telugu                      0C00-0C7F -->
-        <FontFamilyMap
-            Unicode="0C00-0C7F"
-            Target="Gautami"
-            Scale="1.0" />
-
-        <!-- Kannada                     0C80-0CFF -->
-        <FontFamilyMap
-            Unicode="0C80-0CFF"
-            Target="Tunga"
-            Scale="1.0" />
-
-        <!-- Malayalam                   0D00-0D7F -->
-        <FontFamilyMap
-            Unicode="0D00-0D7F"
-            Target="Kartika"
-            Scale="1.0" />
-
-        <!-- Sinhala                     0D80-0DFF -->
-        <FontFamilyMap
-            Unicode="0D80-0DFF"
-            Target="Iskoola Pota"
-            Scale="1.0" />
-
-        <!-- Thai                        0E00-0E7F -->
-        <FontFamilyMap
-            Unicode="0E00-0E7F"
-            Target="Microsoft Sans Serif"
-            Scale="1.0" />
-
-        <!-- Lao                         0E80-0EFF -->
-         <FontFamilyMap  
-            Unicode="0E80-0EFF"
-            Target="DokChampa"
-            Scale="1.0"/>
-
-        <!-- Tibetan                     0F00-0FFF -->
-        <FontFamilyMap
-            Unicode="0F00-0FFF"
-            Target="Microsoft Himalaya"
-            Scale="1.0" />
-
-        <!-- 
-            Myanmar                     1000-109F
-            Georgian (Khutsuri)         10A0-10CF
-            Georgian Supplement         2D00-2D2F -->
-        <!-- No font -->
-
-        <!--
-            Hangul Jamo                 1100-11FF  
-            Hangul Compatibility Jamo   3130-318F
-            Enc. CJK Paren Hangul       3200-321F
-            Enc. CJK Circled Hangul     3260-327F
-            Hangul Syllables            AC00-D7AF -->
-        <FontFamilyMap
-            Unicode="1100-11FF, 3130-318F, 3200-321F, 3260-327F, AC00-D7AF"
-            Target="Malgun Gothic, Gulim"
-            Scale="1.0" />
-
-        <!--
-            Ethiopic                   1200-137F
-            Ethiopic Supplement        1380-139F - Unicode 4.1, NOT supported in Vista fonts!
-            Ethiopic Extended          2D80-2DDF - Unicode 4.1, NOT supported in Vista fonts! -->
-        <FontFamilyMap
-            Unicode="1200-137F"
-            Target="Nyala"
-            Scale="1.0" />
-
-        <!-- Cherokee                    13A0-13FF -->
-        <FontFamilyMap
-            Unicode="13A0-13FF"
-            Target="Plantagenet Cherokee"
-            Scale="1.0" />
-
-        <!-- Canadian Aboriginals        1400-167F -->
-        <FontFamilyMap
-            Unicode="1400-167F"
-            Target="Euphemia"
-            Scale="1.0" />
-
-        <!--
-            Ogham                       1680-169F
-            Runic                       16A0-16FF
-            Tagalog                     1700-171F
-            Hanunoo                     1720-173F
-            Buhid                       1740-175F
-            Tagbanwa                    1760-177f -->
-        <!-- No font -->
-
-        <!--
-            Khmer                       1780-17FF
-            Khmer Symbols               19E0-19FF -->
-        <FontFamilyMap
-            Unicode="1780-17FF, 19E0-19FF"
-            Target="DaunPenh"
-            Scale="1.0" />
-
-        <!-- Mongolian                   1800-18AF -->
-        <FontFamilyMap
-            Unicode="1800-18AF"
-            Target="Mongolian Baiti"
-            Scale="1.0" />
-
-        <!--
-            Limbu                       1900-194F
-            Tai Le                      1950-197F
-            New Tai Lue                 1980-19DF
-            Buginese                    1A00-1A1F -->
-        <!-- No font -->
-
-        <!-- NNBSP                       202F -->
-        <!-- Always use Mongolian font to preserve Mongolian shaping -->
-        <FontFamilyMap  
-            Unicode          = "202F" 
-            Target           = "Mongolian Baiti"
-            Scale            = "1.0"/>
-
-        <!--
-            General Punctuation         2000-202E, 2030-206F
-            Superscripts and Subscripts 2070-209F
-            Currency Symbols            20A0-20CF
-            Letterlike Symbols          2100-214F
-            Number Forms                2150-218F
-            Arrows                      2190-21FF
-            Mathematical Operators      2200-22FF
-            Miscelllaneous Technical    2300-23FF
-            Enclosed Alphanumerics      2460-24FF
-            Box Drawing                 2500-257F
-            Block Elements              2580-259F
-            Geometric Shapes            25A0-25FF
-            Miscellaneous Symbols       2600-26FF
-            Dingbats                    2700-27BF
-            Misc Mathematical Symbols-B 2980-29FF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, Meiryo, SimSun, MS Gothic, Courier New, Microsoft Sans Serif"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, Meiryo, MingLiU, MS Gothic, Courier New, Microsoft Sans Serif"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="ja"
-            Target="Meiryo, MS Gothic, Courier New, Microsoft Sans Serif"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="ko"
-            Target="Malgun Gothic, Gulim, MS Gothic, Courier New, Microsoft Sans Serif"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Target="Courier New, Microsoft Sans Serif, Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            Combining Diacritical Marks 20D0-20FF
-            Control Pictures            2400-243F
-            OCR                         2440-245F
-            Misc Mathematical Symbols-A 27C0-27EF
-            Supplemental Arrows-A       27F0-27FF
-            Braille Patterns            2800-28FF
-            Supplemental Arrows-B       2900-297F
-            Supplemental Math Operators 2A00-2AFF
-            Misc Symbols and Arrows     2B00-2BFF
-            Glagolitic                  2C00-2C5F
-            Coptic                      2C80-2CFF
-            Tifinagh                    2D30-2D7F
-            Supplemental Punctuation    2E00-2E7F -->
-        <!-- No font -->
-
-        <!-- CJK Radicals Supplement     2E80-2EFF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode="2E80-2EFF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun, Meiryo, MingLiu"
-            Scale="1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode="2E80-2EFF"
-            Language="zh-Hant"
-            Target="Microsoft YaHei, MingLiU, Meiryo, SimSun"
-            Scale="1.0"/>
-        <!-- Other (include JA and KO) -->    
-        <FontFamilyMap  
-            Unicode="2E80-2EFF"
-            Target="Meiryo, Microsoft YaHei, MingLiU, SimSun"
-            Scale="1.0"/>
-
-        <!-- Kangxi Radicals             2F00-2FDF -->
-        <FontFamilyMap  
-            Unicode="2F00-2FDF"
-            Target="Meiryo"
-            Scale="1.0"/>
-
-        <!-- Ideogr Description Char     2FF0-2FFF -->
-        <FontFamilyMap
-            Unicode="2FF0-2FFF"
-            Target="SimSun"
-            Scale="1.0" />
-        
-        <!--
-            Symbols and Punctuation     3000-303F
-            Hiragana                    3040-309F
-            Katakana                    30A0-30FF
-            Katakana Phonetic Ext.      31F0-31FF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic, SimSun"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic, MingLiu"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Microsoft YaHei, Gulim, MS Gothic, MingLiu"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Target="Meiryo, Microsoft YaHei, MS Gothic, MingLiu"
-            Scale="1.0" />
-
-        <!--
-            Bopomofo                    3100-312F
-            Bopomofo Extended           31A0-31BF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3100-312F, 31A0-31BF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun"
-            Scale="1.0" />
-        <!-- Other (include CHT, JA and KO) -->
-        <FontFamilyMap
-            Unicode="3100-312F, 31A0-31BF"
-            Target="Microsoft JhengHei, MingLiu"
-            Scale="1.0" />
-
-        <!-- Kanbun                      3190-319F -->
-        <FontFamilyMap
-            Unicode="3190-319F"
-            Target="Microsoft YaHei, MingLiU"
-            Scale="1.0" />
-
-        <!-- CJK Strokes                 31C0-31EF -->
-        <FontFamilyMap  
-            Unicode          = "31C0-31EF"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Enclosed CJK Han            3220-324F
-            Enclosed CJK Numbers 21-35  3251-325F
-            Enclosed CJK (Circled Ideog)3280-32B0
-            Enclosed CJK Numbers 36-50  32B1-32BF
-            Enclosed CJK Month          32C0-32CB
-            Enclosed CJK Katakana       32D0-32FF
-            CJK Comp Square Katakana    3300-3357
-            CJK Comp Hours              3358-3370
-            CJK Comp Latin Abr (hPa-PC) 3371-3376
-            CJK Comp Ja era and corp    337B-337F
-            CJK Comp Days               33E0-33FF -->
-        <FontFamilyMap
-            Unicode="3220-324F,3251-325F, 3280-32CB, 32D0-3376, 337B-337F, 33E0-33FF"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            Enclosed CJK PTE                  3250
-            Enclosed CJK (Sq Lat Ab Hg to LTD)32CC-32CF
-            CJK Comp (Latin Abr DM-IU)        3377-337A -->
-        <!-- No font -->
-        
-        <!-- CJK Comp Square Latin Abr   3380-33DF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            CJK Unified Ext A           3400-4DBF
-            CJK Unified                 4E00-9FBB -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun, SimSun-18030"
-            Scale="1.0" />
-        <!-- Hong Kong -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="zh-HK"
-            Target="Microsoft JhengHei, Microsoft YaHei, MingLiU_HKSCS, MingLiU, SimSun-18030"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, Microsoft YaHei, MingLiU, SimSun-18030"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="ja"
-            Target="Meiryo, MS Gothic, Microsoft YaHei"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="ko"
-            Target="Gulim, Microsoft YaHei"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Target="Meiryo, Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-
-        <!-- Yijing Hexagram Symbols     4DC0-4DFF -->
-        <!-- No font -->
-
-        <!--
-            Yi Syllables                   A000-A48F
-            Yi Radicals                    A490-A4CF  -->
-        <FontFamilyMap
-            Unicode="A000-A4CF"
-            Target="Microsoft Yi Baiti, SimSun-18030"
-            Scale="1.0" />
-
-        <!-- 
-            Modifier Tone Letters       A700-A71F
-            Syloti Nagri                A800-A82F -->
-        <!-- No font -->
-
-        <!-- CHS CJK Compatibility Ideographs F900-FAFF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, Microsoft JhengHei, Meiryo, MS Gothic, Gulim"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, Meiryo, MS Gothic, Gulim"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Language="ko"
-            Target="Meiryo, Microsoft JhengHei, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Target="Meiryo, Microsoft JhengHei, MS Gothic, Gulim"
-            Scale="1.0" />
-
-        <!-- Variation Selectors         FE00-FE0F -->
-        <!-- No font -->
-        
-        <!-- Vertical Forms              FE10-FE1F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode="FE10-FE1F"
-            Language="zh-Hans"
-            Target="Microsoft YaHei"
-            Scale="1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode="FE10-FE1F"
-            Language="ko"
-            Target="Malgun Gothic, Microsoft JhengHei"
-            Scale="1.0"/>
-        <!-- Other (include CHT and JA) -->
-        <FontFamilyMap  
-            Unicode="FE10-FE1F"
-            Target="Microsoft JhengHei"
-            Scale="1.0"/>
-        
-        <!--
-            CJK Compatibility Forms     FE30-FE4F
-            Small Form Variants         FE50-FE6F -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="ja"
-            Target="Meiryo, Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="ko"
-            Target="Malgun Gothic, Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Target="Microsoft JhengHei, MingLiu"
-            Scale="1.0" />
-
-        <!-- Character FEFF              FEFF -->
-        <!-- No font -->
-        
-        <!-- Halfw and Fullw Forms Latin FF00-FF60 -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            Half Full Forms CJK Punct   FF61-FF64
-            Half Full Forms Katakana    FF65-FF9F -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FF61-FF9F"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MingLiU"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FF61-FF9F"
-            Language="zh-Hans"
-            Target="Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap
-            Unicode="FF61-FF9F"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!-- Half Full Forms Hangul      FFA0-FFDC -->
-        <!-- No font -->
-
-        <!-- Half Full (Symbol Variants) FFE0-FFEE -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode="FFE0-FFEE"
-            Language="ja"
-            Target="Meiryo, Microsoft JhengHei, MS Gothic"
-            Scale="1.0"/>
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Microsoft JhengHei, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-            
-        <!-- Specials                    FFF0-FFFD -->
-        <FontFamilyMap
-            Unicode="FFF0-FFFD"
-            Target="Microsoft Sans Serif"
-            Scale="1.0" />
-        
-        <!--
-            Linear B Syllabary          10000-1007F
-            Linear B Ideograms          10080-100FF
-            Aegean Numbers              10100-1013F
-            Old Italic                  10300-1032F
-            Gothic                      10330-1034F
-            Ugaritic                    10380-1039F
-            Old Persian                 103A0-103DF
-            Deseret                     10400-1044F
-            Shavian                     10450-1047F
-            Osmanya                     10480-104AF
-            Cypriot Syllabary           10800-1083F
-            Kharoshthi                  10A00-10A5F
-            Byzantine Musical Symbols   1D000-1D0FF
-            Musical Symbols             1D100-1D1FF
-            Ancient Greek Musical Not.  1D200-1D24F
-            Tai Xuan Jing Symbols       1D300-1D35F
-            Math Alphanumeric Symbols   1D400-1D7FF -->
-        <!-- No font -->
-        
-        <!-- CJK Unified Ideographs ExtB 20000-2A6DF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Language="zh-Hans"
-            Target="SimSun-ExtB"
-            Scale="1.0" />
-        <!-- Hong Kong -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Language="zh-HK"
-            Target="MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Language="ja"
-            Target="Meiryo, MS Gothic, MingLiU-ExtB"
-            Scale="1.0" />
-        <!-- Other (include CHT and KO) -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Target="MingLiU-ExtB"
-            Scale="1.0" />
-
-        <!-- CJK Comp Ideog Supplement      2F800-2FA1F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hans"
-            Target           = "SimSun-ExtB"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hant"
-            Target           = "MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Target           = "Meiryo, MingLiU-ExtB"
-            Scale            = "1.0"/>
-
-    </FontFamily.FamilyMaps>
-
-</FontFamily>
diff --git a/src/main/assets/Fonts/GlobalSansSerif.CompositeFont b/src/main/assets/Fonts/GlobalSansSerif.CompositeFont
deleted file mode 100644
index f4a10df..0000000
--- a/src/main/assets/Fonts/GlobalSansSerif.CompositeFont
+++ /dev/null
@@ -1,740 +0,0 @@
-<FontFamily
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/composite-font"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:System="clr-namespace:System;assembly=mscorlib"
-    Baseline="0.9"
-    LineSpacing="1.2">
-
-    <!-- Name mapping -->
-    <FontFamily.FamilyNames>
-        <System:String x:Key="en-US">Global Sans Serif</System:String>
-    </FontFamily.FamilyNames>
-
-    <!-- Faces to report in font chooser UI -->
-    <FontFamily.FamilyTypefaces>
-        <FamilyTypeface
-            Weight="Normal" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3" StrikethroughThickness="0.05"
-            CapsHeight="0.5" XHeight="0.3" />
-
-        <FamilyTypeface
-            Weight="Bold" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3" StrikethroughThickness="0.05"
-            CapsHeight="0.5" XHeight="0.3" />
-    </FontFamily.FamilyTypefaces>
-
-    <!-- Character to family lookups (in lookup order) -->
-    <FontFamily.FamilyMaps>
-
-        <!--
-            Basic Latin                 0000-007F
-            Latin-1 Supplement          0080-00FF
-            Latin Extended-A            0100-017F
-            Latin Extended-B            0180-024F
-            IPA Extensions              0250-02AF
-            Spacing Modifier Letters    02B0-02FF 
-            Combining Diacritics Marks  0300-036F 
-            Greek and Coptic            0370-03FF
-            Cyrillic                    0400-04FF 
-            Cyrillic Supplement         0500-052F 
-            Hebrew                      0590-05FF 
-            Arabic                      0600-06FF
-            Arabic Supplement           0750-077F
-            Phonetic Extensions         1D00-1D7F
-            Phonetic Extensions Sup.    1D80-1DBF - Unicode 4.1, supported in Vista fonts
-            Combining Diacritical M. S. 1DC0-1DFF - Unicode 4.1, supported in Vista fonts
-            Latin Extended Additional   1E00-1EFF
-            Latin Extended Additional   1E00-1EFF
-            Greek Extended              1F00-1FFF
-            Alpha Pres Forms Latin      FB00-FB0F
-            Alpha Pres Forms Hebrew     FB1D-FB4F
-            Arabic Pres Forms-A         FB50-FDCF
-            Arabic Pres Forms-A         FDF0-FDFF
-            Combining Half Marks        FE20-FE2F
-            Arabic Pres Forms-B         FE70-FEFE -->
-        <!-- CHS -->    
-        <FontFamilyMap
-            Unicode="0590-06FF, 0750-077F, FB1D-FDCF, FDF0-FDFF, FE70-FEFE"
-            Language="zh-Hans"
-            Target="Microsoft Uighur, Arial"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="0000-052F, 0590-06FF, 0750-077F, 1D00-1FFF, FB00-FB0F, FB1D-FBFF"
-            Target="Arial, Microsoft Sans Serif, Lucida Sans Unicode"
-            Scale="1.0" />
-        <FontFamilyMap
-            Unicode="FC00-FDCF, FDF0-FDFF, FE20-FE2F, FE70-FEFE"
-            Target="Arial, Simplified Arabic, Traditional Arabic"
-            Scale="1.0" />
-
-        <!--
-            Armenian                    0530-058F    
-            Georgian (Mkhedruli)        10D0-10FF
-            Alpha Pres Forms (Armenian) FB10-FB1C -->
-        <FontFamilyMap
-            Unicode="0530-058F, 10D0-10FF, FB10-FB1C"
-            Target="Sylfaen"
-            Scale="1.0" />
-
-        <!-- Syriac                      0700-074F -->
-        <FontFamilyMap
-            Unicode="0700-074F"
-            Target="Estrangelo Edessa"
-            Scale="1.0" />
-
-        <!-- Thaana                      0780-07BF -->
-        <FontFamilyMap
-            Unicode="0780-07BF"
-            Target="MV Boli"
-            Scale="1.0" />
-
-        <!-- Devanagari                  0900-097F -->
-        <FontFamilyMap
-            Unicode="0900-097F"
-            Target="Mangal"
-            Scale="1.0" />
-
-        <!-- Bengali                     0980-09FF -->
-        <FontFamilyMap
-            Unicode="0980-09FF"
-            Target="Vrinda"
-            Scale="1.0" />
-
-        <!-- Gurmukhi                    0A00-0A7F -->
-        <FontFamilyMap
-            Unicode="0A00-0A7F"
-            Target="Raavi"
-            Scale="1.0" />
-
-        <!-- Gujarati                    0A80-0AFF -->
-        <FontFamilyMap
-            Unicode="0A80-0AFF"
-            Target="Shruti"
-            Scale="1.0" />
-
-        <!-- Oriya                       0B00-0B7F -->
-        <FontFamilyMap
-            Unicode="0B00-0B7F"
-            Target="Kalinga"
-            Scale="1.0" />
-
-        <!-- Tamil                       0B80-0BFF -->
-        <FontFamilyMap
-            Unicode="0B80-0BFF"
-            Target="Latha"
-            Scale="1.0" />
-
-        <!-- Telugu                      0C00-0C7F -->
-        <FontFamilyMap
-            Unicode="0C00-0C7F"
-            Target="Gautami"
-            Scale="1.0" />
-
-        <!-- Kannada                     0C80-0CFF -->
-        <FontFamilyMap
-            Unicode="0C80-0CFF"
-            Target="Tunga"
-            Scale="1.0" />
-
-        <!-- Malayalam                   0D00-0D7F -->
-        <FontFamilyMap
-            Unicode="0D00-0D7F"
-            Target="Kartika"
-            Scale="1.0" />
-
-        <!-- Sinhala                     0D80-0DFF -->
-        <FontFamilyMap
-            Unicode="0D80-0DFF"
-            Target="Iskoola Pota"
-            Scale="1.0" />
-
-        <!-- Thai                        0E00-0E7F -->
-        <FontFamilyMap
-            Unicode="0E00-0E7F"
-            Target="Cordia New"
-            Scale="1.4" />
-
-        <!-- Lao                         0E80-0EFF -->
-         <FontFamilyMap  
-            Unicode="0E80-0EFF"
-            Target="DokChampa"
-            Scale="1.0"/>
-
-        <!-- Tibetan                     0F00-0FFF -->
-        <FontFamilyMap
-            Unicode="0F00-0FFF"
-            Target="Microsoft Himalaya"
-            Scale="1.0" />
-
-        <!-- 
-            Myanmar                     1000-109F
-            Georgian (Khutsuri)         10A0-10CF
-            Georgian Supplement         2D00-2D2F -->
-        <!-- No font -->
-
-        <!--
-            Hangul Jamo                 1100-11FF  
-            Hangul Compatibility Jamo   3130-318F
-            Enc. CJK Paren Hangul       3200-321F
-            Enc. CJK Circled Hangul     3260-327F
-            Hangul Syllables            AC00-D7AF -->
-        <FontFamilyMap
-            Unicode="1100-11FF, 3130-318F, 3200-321F, 3260-327F, AC00-D7AF"
-            Target="Malgun Gothic, Gulim"
-            Scale="1.0" />
-
-        <!--
-            Ethiopic                   1200-137F
-            Ethiopic Supplement        1380-139F - Unicode 4.1, NOT supported in Vista fonts!
-            Ethiopic Extended          2D80-2DDF - Unicode 4.1, NOT supported in Vista fonts! -->
-        <FontFamilyMap
-            Unicode="1200-137F"
-            Target="Nyala"
-            Scale="1.0" />
-
-        <!-- Cherokee                    13A0-13FF -->
-        <FontFamilyMap
-            Unicode="13A0-13FF"
-            Target="Plantagenet Cherokee"
-            Scale="1.0" />
-
-        <!-- Canadian Aboriginals        1400-167F -->
-        <FontFamilyMap
-            Unicode="1400-167F"
-            Target="Euphemia"
-            Scale="1.0" />
-
-        <!--
-            Ogham                       1680-169F
-            Runic                       16A0-16FF
-            Tagalog                     1700-171F
-            Hanunoo                     1720-173F
-            Buhid                       1740-175F
-            Tagbanwa                    1760-177f -->
-        <!-- No font -->
-
-        <!--
-            Khmer                       1780-17FF
-            Khmer Symbols               19E0-19FF -->
-        <FontFamilyMap
-            Unicode="1780-17FF, 19E0-19FF"
-            Target="DaunPenh"
-            Scale="1.0" />
-
-        <!-- Mongolian                   1800-18AF -->
-        <FontFamilyMap
-            Unicode="1800-18AF"
-            Target="Mongolian Baiti"
-            Scale="1.0" />
-
-        <!--
-            Limbu                       1900-194F
-            Tai Le                      1950-197F
-            New Tai Lue                 1980-19DF
-            Buginese                    1A00-1A1F -->
-        <!-- No font -->
-
-        <!-- NNBSP                       202F -->
-        <!-- Always use Mongolian font to preserve Mongolian shaping -->
-        <FontFamilyMap  
-            Unicode          = "202F" 
-            Target           = "Mongolian Baiti"
-            Scale            = "1.0"/>
-
-        <!--
-            General Punctuation         2000-202E, 2030-206F
-            Superscripts and Subscripts 2070-209F
-            Currency Symbols            20A0-20CF
-            Letterlike Symbols          2100-214F
-            Number Forms                2150-218F
-            Arrows                      2190-21FF
-            Mathematical Operators      2200-22FF
-            Miscelllaneous Technical    2300-23FF
-            Enclosed Alphanumerics      2460-24FF
-            Box Drawing                 2500-257F
-            Block Elements              2580-259F
-            Geometric Shapes            25A0-25FF
-            Miscellaneous Symbols       2600-26FF
-            Dingbats                    2700-27BF
-            Misc Mathematical Symbols-B 2980-29FF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, Meiryo, SimSun, MS Gothic, Arial"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, Meiryo, MingLiU, MS Gothic, Arial"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="ja"
-            Target="Meiryo, MS Gothic, Arial"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language="ko"
-            Target="Malgun Gothic, Gulim, MS Gothic, Arial"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Target="Arial, Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            Combining Diacritical Marks 20D0-20FF
-            Control Pictures            2400-243F
-            OCR                         2440-245F
-            Misc Mathematical Symbols-A 27C0-27EF
-            Supplemental Arrows-A       27F0-27FF
-            Braille Patterns            2800-28FF
-            Supplemental Arrows-B       2900-297F
-            Supplemental Math Operators 2A00-2AFF
-            Misc Symbols and Arrows     2B00-2BFF
-            Glagolitic                  2C00-2C5F
-            Coptic                      2C80-2CFF
-            Tifinagh                    2D30-2D7F
-            Supplemental Punctuation    2E00-2E7F -->
-        <!-- No font -->
-
-        <!-- CJK Radicals Supplement    2E80-2EFF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode="2E80-2EFF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun, Meiryo, MingLiu"
-            Scale="1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode="2E80-2EFF"
-            Language="zh-Hant"
-            Target="Microsoft YaHei, MingLiU, Meiryo, SimSun"
-            Scale="1.0"/>
-        <!-- Other (include JA and KO) -->    
-        <FontFamilyMap  
-            Unicode="2E80-2EFF"
-            Target="Meiryo, Microsoft YaHei, MingLiU, SimSun"
-            Scale="1.0"/>
-            
-        <!-- Kangxi Radicals             2F00-2FDF -->
-        <FontFamilyMap  
-            Unicode="2F00-2FDF"
-            Target="Meiryo"
-            Scale="1.0"/>
-
-        <!-- Ideogr Description Char     2FF0-2FFF -->
-        <FontFamilyMap
-            Unicode="2FF0-2FFF"
-            Target="SimSun"
-            Scale="1.0" />
-        
-        <!--
-            Symbols and Punctuation     3000-303F
-            Hiragana                    3040-309F
-            Katakana                    30A0-30FF
-            Katakana Phonetic Ext.      31F0-31FF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic, SimSun"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic, MingLiu"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Microsoft YaHei, Gulim, MS Gothic, MingLiu"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="3000-30FF, 31F0-31FF"
-            Target="Meiryo, Microsoft YaHei, MS Gothic, MingLiu"
-            Scale="1.0" />
-
-        <!--
-            Bopomofo                    3100-312F
-            Bopomofo Extended           31A0-31BF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3100-312F, 31A0-31BF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun"
-            Scale="1.0" />
-        <!-- Other (include CHT, JA and KO) -->
-        <FontFamilyMap
-            Unicode="3100-312F, 31A0-31BF"
-            Target="Microsoft JhengHei, MingLiu"
-            Scale="1.0" />
-
-        <!-- Kanbun                      3190-319F -->
-        <FontFamilyMap
-            Unicode="3190-319F"
-            Target="Microsoft YaHei, MingLiU"
-            Scale="1.0" />
-
-        <!-- CJK Strokes                 31C0-31EF -->
-        <FontFamilyMap  
-            Unicode          = "31C0-31EF"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Enclosed CJK Han            3220-324F
-            Enclosed CJK Numbers 21-35  3251-325F
-            Enclosed CJK (Circled Ideog)3280-32B0
-            Enclosed CJK Numbers 36-50  32B1-32BF
-            Enclosed CJK Month          32C0-32CB
-            Enclosed CJK Katakana       32D0-32FF
-            CJK Comp Square Katakana    3300-3357
-            CJK Comp Hours              3358-3370
-            CJK Comp Latin Abr (hPa-PC) 3371-3376
-            CJK Comp Ja era and corp    337B-337F
-            CJK Comp Days               33E0-33FF -->
-        <FontFamilyMap
-            Unicode="3220-324F,3251-325F, 3280-32CB, 32D0-3376, 337B-337F, 33E0-33FF"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            Enclosed CJK PTE                  3250
-            Enclosed CJK (Sq Lat Ab Hg to LTD)32CC-32CF
-            CJK Comp (Latin Abr DM-IU)        3377-337A -->
-        <!-- No font -->
-        
-        <!-- CJK Comp Square Latin Abr   3380-33DF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="3380-33DF"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            CJK Unified Ext A           3400-4DBF
-            CJK Unified                 4E00-9FBB -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun, SimSun-18030, SimSun-ExtB"
-            Scale="1.0" />
-        <!-- Hong Kong -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="zh-HK"
-            Target="Microsoft JhengHei, Microsoft YaHei, MingLiU_HKSCS, MingLiU, SimSun-18030, SimSun-ExtB, Simsun"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, Microsoft YaHei, MingLiU, SimSun-18030, SimSun-ExtB, Simsun"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="ja"
-            Target="Meiryo, MS Gothic, Microsoft YaHei, SimSun"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Language="ko"
-            Target="Gulim, Microsoft YaHei, MS Gothic, Simsun"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="3400-4DBF, 4E00-9FBB"
-            Target="Meiryo, Microsoft YaHei, MS Gothic, Simsun"
-            Scale="1.0" />
-
-        <!-- Yijing Hexagram Symbols     4DC0-4DFF -->
-        <!-- No font -->
-
-        <!--
-            Yi Syllables                   A000-A48F
-            Yi Radicals                    A490-A4CF  -->
-        <FontFamilyMap
-            Unicode="A000-A4CF"
-            Target="Microsoft Yi Baiti, SimSun-18030, SimSun-ExtB"
-            Scale="1.0" />
-
-        <!-- 
-            Modifier Tone Letters       A700-A71F
-            Syloti Nagri                A800-A82F -->
-        <!-- No font -->
-
-        <!-- CHS CJK Compatibility Ideographs F900-FAFF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, Microsoft JhengHei, Meiryo, MS Gothic, Gulim"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, Meiryo, MS Gothic, Gulim"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Language="ko"
-            Target="Meiryo, Microsoft JhengHei, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="F900-FAFF"
-            Target="Meiryo, Microsoft JhengHei, MS Gothic, Gulim"
-            Scale="1.0" />
-
-        <!-- Variation Selectors         FE00-FE0F -->
-        <!-- No font -->
-        
-        <!-- Vertical Forms              FE10-FE1F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode="FE10-FE1F"
-            Language="zh-Hans"
-            Target="Microsoft YaHei"
-            Scale="1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode="FE10-FE1F"
-            Language="ko"
-            Target="Malgun Gothic, Microsoft JhengHei"
-            Scale="1.0"/>
-        <!-- Other (include CHT and JA) -->
-        <FontFamilyMap  
-            Unicode="FE10-FE1F"
-            Target="Microsoft JhengHei"
-            Scale="1.0"/>
-        
-        <!--
-            CJK Compatibility Forms     FE30-FE4F
-            Small Form Variants         FE50-FE6F -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, SimSun"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="ja"
-            Target="Meiryo, Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Language="ko"
-            Target="Malgun Gothic, Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="FE30-FE6F"
-            Target="Microsoft JhengHei, MingLiu"
-            Scale="1.0" />
-
-        <!-- Character FEFF              FEFF -->
-        <!-- No font -->
-        
-        <!-- Halfw and Fullw Forms Latin FF00-FF60 -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other (include JA) -->
-        <FontFamilyMap
-            Unicode="FF00-FF60"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!--
-            Half Full Forms CJK Punct   FF61-FF64
-            Half Full Forms Katakana    FF65-FF9F -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FF61-FF9F"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MingLiU"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FF61-FF9F"
-            Language="zh-Hans"
-            Target="Microsoft JhengHei, MingLiU"
-            Scale="1.0" />
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap
-            Unicode="FF61-FF9F"
-            Target="Meiryo, MS Gothic"
-            Scale="1.0" />
-
-        <!-- Half Full Forms Hangul      FFA0-FFDC -->
-        <!-- No font -->
-
-        <!-- Half Full (Symbol Variants) FFE0-FFEE -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Language="zh-Hans"
-            Target="Microsoft YaHei, MS Gothic"
-            Scale="1.0" />
-        <!-- CHT -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Language="zh-Hant"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode="FFE0-FFEE"
-            Language="ja"
-            Target="Meiryo, Microsoft JhengHei, MS Gothic"
-            Scale="1.0"/>
-        <!-- KO -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Language="ko"
-            Target="Malgun Gothic, Meiryo, Microsoft JhengHei, Gulim, MS Gothic"
-            Scale="1.0" />
-        <!-- Other -->
-        <FontFamilyMap
-            Unicode="FFE0-FFEE"
-            Target="Microsoft JhengHei, MS Gothic"
-            Scale="1.0" />
-            
-        <!-- Specials                    FFF0-FFFD -->
-        <FontFamilyMap
-            Unicode="FFF0-FFFD"
-            Target="Arial"
-            Scale="1.0" />
-        
-        <!--
-            Linear B Syllabary          10000-1007F
-            Linear B Ideograms          10080-100FF
-            Aegean Numbers              10100-1013F
-            Old Italic                  10300-1032F
-            Gothic                      10330-1034F
-            Ugaritic                    10380-1039F
-            Old Persian                 103A0-103DF
-            Deseret                     10400-1044F
-            Shavian                     10450-1047F
-            Osmanya                     10480-104AF
-            Cypriot Syllabary           10800-1083F
-            Kharoshthi                  10A00-10A5F
-            Byzantine Musical Symbols   1D000-1D0FF
-            Musical Symbols             1D100-1D1FF
-            Ancient Greek Musical Not.  1D200-1D24F
-            Tai Xuan Jing Symbols       1D300-1D35F
-            Math Alphanumeric Symbols   1D400-1D7FF -->
-        <!-- No font -->
-        
-        <!-- CJK Unified Ideographs ExtB 20000-2A6DF -->
-        <!-- CHS -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Language="zh-Hans"
-            Target="SimSun-ExtB"
-            Scale="1.0" />
-        <!-- Hong Kong -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Language="zh-HK"
-            Target="MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale="1.0" />
-        <!-- JA -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Language="ja"
-            Target="Meiryo, MS Gothic, MingLiU-ExtB"
-            Scale="1.0" />
-        <!-- Other (include CHT and KO) -->
-        <FontFamilyMap
-            Unicode="20000-2A6DF"
-            Target="MingLiU-ExtB"
-            Scale="1.0" />
-
-        <!-- CJK Comp Ideog Supplement      2F800-2FA1F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hans"
-            Target           = "SimSun-ExtB"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hant"
-            Target           = "MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Target           = "Meiryo, MingLiU-ExtB"
-            Scale            = "1.0"/>
-
-    </FontFamily.FamilyMaps>
-
-</FontFamily>
diff --git a/src/main/assets/Fonts/GlobalSerif.CompositeFont b/src/main/assets/Fonts/GlobalSerif.CompositeFont
deleted file mode 100644
index 231d488..0000000
--- a/src/main/assets/Fonts/GlobalSerif.CompositeFont
+++ /dev/null
@@ -1,758 +0,0 @@
-<FontFamily 
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/composite-font"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:System="clr-namespace:System;assembly=mscorlib"
-    Baseline="0.9" 
-    LineSpacing="1.2">
-
-    <!-- Name mapping -->
-    <FontFamily.FamilyNames>
-        <System:String x:Key="en-US">Global Serif</System:String>
-    </FontFamily.FamilyNames>
-
-    <!-- Faces to report in font chooser UI -->
-    <FontFamily.FamilyTypefaces>
-        <FamilyTypeface
-            Weight="Normal" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3"  StrikethroughThickness="0.05"
-            CapsHeight="0.5"         XHeight="0.3"/>
-
-        <FamilyTypeface
-            Weight="Bold" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3"  StrikethroughThickness="0.05"
-            CapsHeight="0.5"         XHeight="0.3"/>
-    </FontFamily.FamilyTypefaces>
-
-    <!-- Character to family lookups (in lookup order) -->
-    <FontFamily.FamilyMaps>
-        
-        <!--
-            Basic Latin                 0000-007F
-            Latin-1 Supplement          0080-00FF
-            Latin Extended-A            0100-017F
-            Latin Extended-B            0180-024F
-            IPA Extensions              0250-02AF
-            Spacing Modifier Letters    02B0-02FF 
-            Combining Diacritics Marks  0300-036F 
-            Greek and Coptic            0370-03FF
-            Cyrillic                    0400-04FF 
-            Cyrillic Supplement         0500-052F 
-            Hebrew                      0590-05FF 
-            Arabic                      0600-06FF
-            Arabic Supplement           0750-077F
-            Phonetic Extensions         1D00-1D7F
-            Phonetic Extensions Sup.    1D80-1DBF - Unicode 4.1, supported in Vista fonts
-            Combining Diacritical M. S. 1DC0-1DFF - Unicode 4.1, supported in Vista fonts
-            Latin Extended Additional   1E00-1EFF
-            Greek Extended              1F00-1FFF
-            Alpha Pres Forms Latin      FB00-FB0F
-            Alpha Pres Forms Hebrew     FB1D-FB4F
-            Arabic Pres Forms-A         FB50-FDCF
-            Arabic Pres Forms-A         FDF0-FDFF
-            Combining Half Marks        FE20-FE2F
-            Arabic Pres Forms-B         FE70-FEFE -->
-        <!-- CHS -->    
-        <FontFamilyMap  
-            Unicode          = "0590-06FF, 0750-077F, FB1D-FDCF, FDF0-FDFF, FE70-FEFE" 
-            Language         = "zh-Hans"
-            Target           = "Microsoft Uighur, Times New Roman"        
-            Scale            = "1.0"/>
-        <!-- Other -->
-        <FontFamilyMap  
-            Unicode          = "0000-052F, 0590-06FF, 0750-077F, 1D00-1FFF, FB00-FB0F, FB1D-FDCF, FDF0-FDFF, FE20-FE2F, FE70-FEFE" 
-            Target           = "Times New Roman"        
-            Scale            = "1.0"/>
-
-        <!--
-            Armenian                    0530-058F    
-            Georgian                    10D0-10FF
-            Alpha Pres Forms Armenian   FB10-FB1C -->
-        <FontFamilyMap  
-            Unicode          = "0530-058F, 10D0-10FF, FB10-FB1C" 
-            Target           = "Sylfaen"
-            Scale            = "1.0"/>
-
-        <!-- Syriac                      0700-074F -->
-        <FontFamilyMap  
-            Unicode          = "0700-074F" 
-            Target           = "Estrangelo Edessa"
-            Scale            = "1.0"/>
-
-        <!-- Thaana                      0780-07BF -->
-        <FontFamilyMap  
-            Unicode          = "0780-07BF" 
-            Target           = "MV Boli"
-            Scale            = "1.0"/>
-
-        <!-- Devanagari                  0900-097F -->
-        <FontFamilyMap  
-            Unicode          = "0900-097F"
-            Target           = "Mangal"
-            Scale            = "1.0"/>
-
-        <!-- Bengali                     0980-09FF -->
-        <FontFamilyMap  
-            Unicode          = "0980-09FF" 
-            Target           = "Vrinda"
-            Scale            = "1.0"/>
-
-        <!-- Gurmukhi                    0A00-0A7F -->
-        <FontFamilyMap  
-            Unicode          = "0A00-0A7F" 
-            Target           = "Raavi"
-            Scale            = "1.0"/>
-
-        <!-- Gujarati                    0A80-0AFF -->
-        <FontFamilyMap  
-            Unicode          = "0A80-0AFF" 
-            Target           = "Shruti"
-            Scale            = "1.0"/>
-
-        <!-- Oriya                       0B00-0B7F -->
-        <FontFamilyMap  
-            Unicode          = "0B00-0B7F" 
-            Target           = "Kalinga"
-            Scale            = "1.0"/>
-
-        <!-- Tamil                       0B80-0BFF -->
-        <FontFamilyMap  
-            Unicode          = "0B80-0BFF" 
-            Target           = "Latha"
-            Scale            = "1.0"/>
-
-        <!-- Telugu                      0C00-0C7F -->
-        <FontFamilyMap  
-            Unicode          = "0C00-0C7F" 
-            Target           = "Gautami"
-            Scale            = "1.0"/>
-
-        <!-- Kannada                     0C80-0CFF -->
-        <FontFamilyMap  
-            Unicode          = "0C80-0CFF" 
-            Target           = "Tunga"
-            Scale            = "1.0"/>
-
-        <!-- Malayalam                   0D00-0D7F -->
-        <FontFamilyMap  
-            Unicode          = "0D00-0D7F" 
-            Target           = "Kartika"
-            Scale            = "1.0"/>
-
-        <!-- Sinhala                     0D80-0DFF -->
-        <FontFamilyMap  
-            Unicode          = "0D80-0DFF" 
-            Target           = "Iskoola Pota"
-            Scale            = "1.0"/>
-
-        <!-- Thai                        0E00-0E7F -->
-        <FontFamilyMap  
-            Unicode          = "0E00-0E7F" 
-            Target           = "Angsana New"
-            Scale            = "1.4"/>
-
-        <!-- Lao                         0E80-0EFF -->
-         <FontFamilyMap  
-            Unicode="0E80-0EFF"
-            Target="DokChampa"
-            Scale="1.0"/>
-
-        <!-- Tibetan                     0F00-0FFF -->
-        <FontFamilyMap  
-            Unicode          = "0F00-0FFF" 
-            Target           = "Microsoft Himalaya"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Myanmar                     1000-109F
-            Georgian (Khutsuri)         10A0-10CF
-            Georgian Supplement         2D00-2D2F -->
-        <!-- No font -->
-
-        <!--
-            Hangul Jamo                 1100-11FF  
-            Hangul Compatibility Jamo   3130-318F
-            Enc. CJK Paren Hangul       3200-321F
-            Enc. CJK Circled Hangul     3260-327F
-            Hangul Syllables            AC00-D7AF -->
-        <FontFamilyMap  
-            Unicode          = "1100-11FF, 3130-318F, 3200-321F, 3260-327F, AC00-D7AF" 
-            Target           = "Batang"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Ethiopic                    1200-137F 
-            Ethiopic Supplement         1380-139F - Unicode 4.1, NOT supported in Vista fonts!
-            Ethiopic Extended           2D80-2DDF - Unicode 4.1, NOT supported in Vista fonts! -->
-        <FontFamilyMap  
-            Unicode          = "1200-137F" 
-            Target           = "Nyala"
-            Scale            = "1.0"/>
-
-        <!-- Cherokee                    13A0-13FF -->
-        <FontFamilyMap  
-            Unicode          = "13A0-13FF" 
-            Target           = "Plantagenet Cherokee"
-            Scale            = "1.0"/>
-
-        <!-- Canadian Aboriginals        1400-167F -->
-        <FontFamilyMap  
-            Unicode          = "1400-167F" 
-            Target           = "Euphemia"
-            Scale            = "1.0"/>
-
-        <!--
-            Ogham                       1680-169F
-            Runic                       16A0-16FF
-            Tagalog                     1700-171F
-            Hanunoo                     1720-173F
-            Buhid                       1740-175F
-            Tagbanwa                    1760-177f -->
-        <!-- No font -->
-
-        <!--
-            Khmer                       1780-17FF
-            Khmer Symbols               19E0-19FF -->
-        <FontFamilyMap  
-            Unicode          = "1780-17FF, 19E0-19FF" 
-            Target           = "DaunPenh"
-            Scale            = "1.0"/>
-
-        <!-- Mongolian                   1800-18AF -->
-        <FontFamilyMap  
-            Unicode          = "1800-18AF" 
-            Target           = "Mongolian Baiti"
-            Scale            = "1.0"/>
-
-        <!--
-            Limbu                       1900-194F
-            Tai Le                      1950-197F
-            New Tai Lue                 1980-19DF
-            Buginese                    1A00-1A1F -->
-        <!-- No font -->
-
-        <!-- NNBSP                       202F -->
-        <!-- Always use Mongolian font to preserve Mongolian shaping -->
-        <FontFamilyMap  
-            Unicode          = "202F" 
-            Target           = "Mongolian Baiti"
-            Scale            = "1.0"/>
-
-        <!--
-            General Punctuation         2000-202E, 2030-206F
-            Superscripts and Subscripts 2070-209F
-            Currency Symbols            20A0-20CF
-            Letterlike Symbols          2100-214F
-            Number Forms                2150-218F
-            Arrows                      2190-21FF
-            Mathematical Operators      2200-22FF
-            Miscelllaneous Technical    2300-23FF
-            Enclosed Alphanumerics      2460-24FF
-            Box Drawing                 2500-257F
-            Block Elements              2580-259F
-            Geometric Shapes            25A0-25FF
-            Miscellaneous Symbols       2600-26FF
-            Dingbats                    2700-27BF
-            Misc Mathematical Symbols-B 2980-29FF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MS Mincho, Times New Roman"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS, MingLiU, MS Mincho, Times New Roman"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language         = "zh-Hant"
-            Target           = "MingLiU, MS Mincho, Times New Roman"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language         = "ja"
-            Target           = "MS Mincho, Times New Roman"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Language         = "ko"
-            Target           = "Batang, MS Mincho, Times New Roman"
-            Scale            = "1.0"/>
-        <!-- Other -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF, 2980-29FF"
-            Target           = "Times New Roman, MS Mincho"
-            Scale            = "1.0"/>
-
-        <!--
-            Combining Diacritical Marks 20D0-20FF
-            Control Pictures            2400-243F
-            OCR                         2440-245F
-            Misc Mathematical Symbols-A 27C0-27EF
-            Supplemental Arrows-A       27F0-27FF
-            Braille Patterns            2800-28FF
-            Supplemental Arrows-B       2900-297F
-            Supplemental Math Operators 2A00-2AFF
-            Misc Symbols and Arrows     2B00-2BFF -->
-        <!-- No font -->
-
-        <!-- CJK Radicals Supplement     2E80-2EFF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2E80-2EFF"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MingLiu"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT, JA and KO) -->    
-        <FontFamilyMap  
-            Unicode          = "2E80-2EFF"
-            Target           = "MingLiU, SimSun"
-            Scale            = "1.0"/>
-
-        <!-- Kangxi Radicals             2F00-2FDF -->
-        <FontFamilyMap  
-            Unicode          = "2F00-2FDF"
-            Target           = "Meiryo"
-            Scale            = "1.0"/>
-
-        <!-- Ideogr Description Char     2FF0-2FFF -->
-        <FontFamilyMap  
-            Unicode          = "2FF0-2FFF"
-            Target           = "SimSun"
-            Scale            = "1.0"/>
-        
-        <!--
-            Symbols and Punctuation     3000-303F
-            Hiragana                    3040-309F
-            Katakana                    30A0-30FF
-            Katakana Phonetic Ext.      31F0-31FF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS, MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "zh-Hant"
-            Target           = "MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "ko"
-            Target           = "Batang, MS Mincho, MingLiu"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Target           = "MS Mincho, MingLiu"
-            Scale            = "1.0"/>
-
-        <!--
-            Bopomofo                    3100-312F
-            Bopomofo Extended           31A0-31BF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3100-312F, 31A0-31BF"
-            Language         = "zh-Hans"
-            Target           = "SimSun"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT, JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "3100-312F, 31A0-31BF"
-            Target           = "MingLiu"
-            Scale            = "1.0"/>
-
-        <!-- Kanbun                      3190-319F -->
-        <FontFamilyMap  
-            Unicode          = "3190-319F"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-
-        <!-- CJK Strokes                 31C0-31EF -->
-        <FontFamilyMap  
-            Unicode          = "31C0-31EF"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-
-        <!-- Enclosed CJK Han            3220-324F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3220-324F"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT, Hong Kong, JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "3220-324F"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-
-        <!-- Enclosed CJK PTE            3250      -->
-        <!-- No font -->
-
-        <!--
-            Enclosed CJK Numbers 21-35  3251-325F
-            Enclosed CJK Numbers 36-50  32B1-32BF
-            Enclosed CJK Month          32C0-32CB
-            Enclosed CJK Katakana       32D0-32FF
-            CJK Comp Square Katakana    3300-3357
-            CJK Comp Hours              3358-3370
-            CJK Comp Latin Abr (hPa-PC) 3371-3376
-            CJK Comp Ja era and corp    337B-337F
-            CJK Comp Days               33E0-33FF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3251-325F, 32B1-32CB, 32D0-3376, 337B-337F, 33E0-33FF"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-
-        <!-- Enclosed CJK Circled Ideog  3280-32B0 -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3280-32B0"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3280-32B0"
-            Language         = "zh-Hant"
-            Target           = "MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "3280-32B0"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-
-        <!--
-            Enclosed CJK (Sq Lat Ab Hg to LTD) 32CC-32CF
-            CJK Comp (Latin Abr DM-IU)         3377-337A -->
-        <!-- No font -->
-        
-        <!-- CJK Comp Square Latin Abr   3380-33DF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Language         = "zh-Hant"
-            Target           = "MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Language         = "ko"
-            Target           = "Batang, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-
-        <!--
-            CJK Unified Ext A           3400-4DBF
-            CJK Unified                 4E00-9FBB -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MingLiu, SimSun-18030"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS, MingLiU, SimSun-18030"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "ja"
-            Target           = "MS Mincho, MingLiu"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "ko"
-            Target           = "Batang, MingLiu"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT) -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Target           = "MingLiu, SimSun-18030"
-            Scale            = "1.0"/>
-
-        <!-- Yijing Hexagram Symbols     4DC0-4DFF -->
-        <!-- No font -->
-
-        <!--
-            Yi Syllables                   A000-A48F
-            Yi Radicals                    A490-A4CF  -->
-        <FontFamilyMap  
-            Unicode          = "A000-A4CF" 
-            Target           = "Microsoft Yi Baiti, SimSun-18030"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Modifier Tone Letters       A700-A71F
-            Syloti Nagri                A800-A82F -->
-        <!-- No font -->
-
-        <!-- CHS CJK Compatibility Ideographs F900-FAFF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS, MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "ja"
-            Target           = "MS Mincho, MingLiu"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "ko"
-            Target           = "Batang, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT) -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Target           = "MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-
-        <!-- Variation Selectors         FE00-FE1F -->
-        <!-- No font -->
-        
-        <!-- Vertical Forms              FE10-FE1F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FE10-FE1F"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FE10-FE1F"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Microsoft JhengHei"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT and JA) -->
-        <FontFamilyMap  
-            Unicode          = "FE10-FE1F"
-            Target           = "Microsoft JhengHei"
-            Scale            = "1.0"/>
-        
-        <!--
-            CJK Compatibility Forms     FE30-FE4F
-            Small Form Variants         FE50-FE6F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Language         = "zh-Hans"
-            Target           = "SimSun"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT, JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Target           = "MingLiu"
-            Scale            = "1.0"/>
-
-        <!-- Character FEFF              FEFF -->
-        <!-- No font -->
-        
-        <!-- Halfw and Fullw Forms Latin FF00-FF60 -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "zh-Hans"
-            Target           = "SimSun ,MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS, MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "zh-Hant"
-            Target           = "MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "ko"
-            Target           = "Batang, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-
-        <!--
-            Half Full Forms CJK Punct   FF61-FF64
-            Half Full Forms Katakana    FF65-FF9F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FF61-FF9F"
-            Language         = "zh-Hans"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "FF61-FF9F"
-            Language         = "zh-Hans"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "FF61-FF9F"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-
-        <!-- Half Full Forms Hangul      FFA0-FFDC -->
-        <!-- No font -->
-
-        <!-- Half Full Symbol Variants   FFE0-FFEE -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Language         = "zh-Hans"
-            Target           = "SimSun, MingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS, MingLiU, SimSun, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Language         = "zh-Hant"
-            Target           = "MingLiU, SimSun, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Language         = "ko"
-            Target           = "Batang, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Target           = "MS Mincho"
-            Scale            = "1.0"/>
-            
-        <!-- Specials                    FFF0-FFFD -->
-        <FontFamilyMap  
-            Unicode          = "FFF0-FFFD"
-            Target           = "Times New Roman"
-            Scale            = "1.0"/>
-        
-        <!--
-            Linear B Syllabary             10000-1007F
-            Linear B Ideograms             10080-100FF
-            Aegean Numbers                 10100-1013F
-            Old Italic                     10300-1032F
-            Gothic                         10330-1034F
-            Ugaritic                       10380-1039F
-            Old Persian                    103A0-103DF
-            Deseret                        10400-1044F
-            Shavian                        10450-1047F
-            Osmanya                        10480-104AF
-            Cypriot Syllabary              10800-1083F
-            Kharoshthi                     10A00-10A5F
-            Byzantine Musical Symbols      1D000-1D0FF
-            Musical Symbols                1D100-1D1FF
-            Ancient Greek Musical Notation 1D200-1D24F
-            Tai Xuan Jing Symbols          1D300-1D35F
-            Math Alphanumeric Symbols      1D400-1D7FF -->
-        <!-- No font -->
-        
-        <!-- CJK Unified Ideographs ExtB 20000-2A6DF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "20000-2A6DF" 
-            Language         = "zh-Hans"
-            Target           = "SimSun-ExtB"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "20000-2A6DF" 
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "20000-2A6DF" 
-            Language         = "ja"
-            Target           = "MS Mincho, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT and KO) -->
-        <FontFamilyMap
-            Unicode          = "20000-2A6DF" 
-            Target           = "MingLiU-ExtB"
-            Scale            = "1.0"/>
-
-        <!-- CJK Comp Ideog Supplement      2F800-2FA1F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hans"
-            Target           = "SimSun-ExtB"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hant"
-            Target           = "MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Target           = "Meiryo, MingLiU-ExtB"
-            Scale            = "1.0"/>
-
-    </FontFamily.FamilyMaps>
-
-</FontFamily>
diff --git a/src/main/assets/Fonts/GlobalUserInterface.CompositeFont b/src/main/assets/Fonts/GlobalUserInterface.CompositeFont
deleted file mode 100644
index 6aaf86f..0000000
--- a/src/main/assets/Fonts/GlobalUserInterface.CompositeFont
+++ /dev/null
@@ -1,1014 +0,0 @@
-<FontFamily
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/composite-font"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:System="clr-namespace:System;assembly=mscorlib"
-    Baseline="0.9" 
-    LineSpacing="1.2">
-
-    <!-- Arial Unicode MS ships with Office, not Windows, but is likely to be on many 
-         systems, so making use of that here. -->
-         
-    <!-- Name mapping -->
-    <FontFamily.FamilyNames>
-        <System:String x:Key="en-US">Global User Interface</System:String>
-    </FontFamily.FamilyNames>
-
-    <!-- Faces to report in font chooser UI -->
-    <FontFamily.FamilyTypefaces>
-        <FamilyTypeface
-            Weight="Normal" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3"  StrikethroughThickness="0.05"
-            CapsHeight="0.5"         XHeight="0.3"/>
-
-        <FamilyTypeface
-            Weight="Bold" Stretch="Normal" Style="Normal"
-            UnderlinePosition="-0.1" UnderlineThickness="0.05"
-            StrikethroughPosition="0.3"  StrikethroughThickness="0.05"
-            CapsHeight="0.5"         XHeight="0.3"/>
-    </FontFamily.FamilyTypefaces>
-
-    <!-- Character to family lookups (in lookup order) -->
-    <FontFamily.FamilyMaps>
-
-        <!--
-            Basic Latin                            0000-007F
-            Latin-1 Supplement                     0080-00FF
-            Latin Extended-A                       0100-017F
-            Latin Extended-B                       0180-024F
-            IPA Extensions                         0250-02AF
-            Spacing Modifier Letters               02B0-02FF 
-            Combining Diacritical Marks            0300-036F 
-            Greek and Coptic                       0370-03FF
-            Cyrillic                               0400-04FF 
-            Cyrillic Supplement                    0500-052F 
-            Hebrew                                 0590-05FF 
-            Arabic                                 0600-06FF
-            Arabic Supplement                      0750-077F - Unicode 4.1, supported in Vista fonts
-            Phonetic Extensions                    1D00-1D7F
-            Phonetic Extensions Supplement         1D80-1DBF - Unicode 4.1, supported in Vista fonts
-            Combining Diacritical Marks Supplement 1DC0-1DFF - Unicode 4.1, supported in Vista fonts
-            Latin Extended Additional              1E00-1EFF
-            Greek Extended                         1F00-1FFF
-            Latin Extended-C                       2C60-2C7F - Unicode 5.0, supported in Vista fonts
-            Cyrillic Extended-A                    2DE0-2DFF - Unicode 5.1, no support in Win7
-            Cyrillic Extended-B                    A640-A69F - Unicode 5.1, no support in Win7
-            Alpha Pres Forms Latin                 FB00-FB0F
-            Alpha Pres Forms (Hebrew)              FB1D-FB4F
-            Arabic Pres Forms-A                    FB50-FDCF
-            Arabic Pres Forms-A                    FDF0-FDFF
-            Combining Half Marks                   FE20-FE2F
-            Arabic Pres Forms-B                    FE70-FEFE -->
-        <!-- Uighur -->
-        <FontFamilyMap  
-            Unicode          = "0600-06FF, 0750-077F, FB50-FDCF, FDF0-FDFF, FE70-FEFE" 
-            Language         = "ug"
-            Target           = "Microsoft Uighur, Segoe UI, Tahoma, Simplified Arabic, Traditional Arabic, Arial, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "0600-06FF, 0750-077F, FB50-FDCF, FDF0-FDFF, FE70-FEFE" 
-            Language         = "zh-Hans"
-            Target           = "Microsoft Uighur, Segoe UI, Tahoma, Simplified Arabic, Traditional Arabic, Arial, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT, JA and KO) -->    
-        <FontFamilyMap  
-            Unicode          = "0000-052F, 0590-06FF, 0750-077F, 1D00-1FFF, 2C60-2C7F, FB00-FB0F, FB1D-FBFF" 
-            Target           = "Segoe UI, Tahoma, Arial, Arial Unicode MS, Microsoft Sans Serif, Lucida Sans Unicode"
-            Scale            = "1.0"/>
-        <FontFamilyMap  
-            Unicode          = "FC00-FDCF, FDF0-FDFF, FE20-FE2F, FE70-FEFE" 
-            Target           = "Tahoma, Simplified Arabic, Traditional Arabic, Arial Unicode MS"        
-            Scale            = "1.0"/>
-
-        <!--
-            Armenian                    0530-058F    
-            Georgian (Khutsuri)         10A0-10CF - not supported in Vista fonts, but supported in AUMS)
-            Georgian (Mkhedruli)        10D0-10FF
-            Georgian Supplement         2D00-2D2F - no font support
-            Alpha Pres Forms (Armenian) FB10-FB1C -->
-        <FontFamilyMap  
-            Unicode          = "0530-058F, 10A0-10CF, 10D0-10FF, FB10-FB1C" 
-            Target           = "Sylfaen, Arial Unicode MS"
-            Scale            = "1.0"/>
-
-        <!-- Syriac                      0700-074F -->
-        <FontFamilyMap  
-            Unicode          = "0700-074F" 
-            Target           = "Estrangelo Edessa"
-            Scale            = "1.0"/>
-
-        <!-- Thaana                      0780-07BF -->
-        <FontFamilyMap  
-            Unicode          = "0780-07BF" 
-            Target           = "MV Boli"
-            Scale            = "1.0"/>
-
-        <!-- N'Ko                        07C0-07FF -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-            Unicode          = "07C0-07FF"
-            Target           = "Ebrima"
-            Scale            = "1.0"/>
-
-        <!-- 0800-08FF: unassigned -->
-        
-        <!-- Devanagari                  0900-097F -->
-        <FontFamilyMap  
-            Unicode          = "0900-097F"
-            Target           = "Mangal"
-            Scale            = "1.0"/>
-
-        <!-- Bengali                     0980-09FF -->
-        <FontFamilyMap  
-            Unicode          = "0980-09FF" 
-            Target           = "Vrinda"
-            Scale            = "1.0"/>
-
-        <!-- Gurmukhi                    0A00-0A7F -->
-        <FontFamilyMap  
-            Unicode          = "0A00-0A7F" 
-            Target           = "Raavi"
-            Scale            = "1.0"/>
-
-        <!-- Gujarati                    0A80-0AFF -->
-        <FontFamilyMap  
-            Unicode          = "0A80-0AFF" 
-            Target           = "Shruti"
-            Scale            = "1.0"/>
-
-        <!-- Oriya                       0B00-0B7F -->
-        <FontFamilyMap  
-            Unicode          = "0B00-0B7F" 
-            Target           = "Kalinga"
-            Scale            = "1.0"/>
-
-        <!-- Tamil                       0B80-0BFF -->
-        <FontFamilyMap  
-            Unicode          = "0B80-0BFF" 
-            Target           = "Latha"
-            Scale            = "1.0"/>
-
-        <!-- Telugu                      0C00-0C7F -->
-        <FontFamilyMap  
-            Unicode          = "0C00-0C7F" 
-            Target           = "Gautami"
-            Scale            = "1.0"/>
-
-        <!-- Kannada                     0C80-0CFF -->
-        <FontFamilyMap  
-            Unicode          = "0C80-0CFF" 
-            Target           = "Tunga"
-            Scale            = "1.0"/>
-
-        <!-- Malayalam                   0D00-0D7F -->
-        <FontFamilyMap  
-            Unicode          = "0D00-0D7F" 
-            Target           = "Kartika"
-            Scale            = "1.0"/>
-
-        <!-- Sinhala                     0D80-0DFF -->
-        <FontFamilyMap  
-            Unicode          = "0D80-0DFF" 
-            Target           = "Iskoola Pota"
-            Scale            = "1.0"/>
-
-        <!-- Thai                        0E00-0E7F -->
-        <FontFamilyMap  
-            Unicode          = "0E00-0E7F" 
-            Target           = "Tahoma"
-            Scale            = "1.0"/>
-
-        <!-- Lao                         0E80-0EFF -->
-        <FontFamilyMap  
-            Unicode          = "0E80-0EFF"
-            Target           = "Lao UI, DokChampa"
-            Scale            = "1.0"/>
-
-        <!-- Tibetan                     0F00-0FFF -->
-        <FontFamilyMap  
-            Unicode          = "0F00-0FFF" 
-            Target           = "Microsoft Himalaya"
-            Scale            = "1.0"/>
-
-        <!-- Myanmar                    1000-109F  -->
-        <!-- No font -->
-
-        <!--
-            Hangul Jamo                 1100-11FF  
-            Hangul Compatibility Jamo   3130-318F
-            Enc. CJK (Paren Hangul)     3200-321F
-            Enc. CJK (Circled Hangul)   3260-327F
-            Hangul Syllables            AC00-D7AF -->
-        <FontFamilyMap  
-            Unicode          = "1100-11FF, 3130-318F, 3200-321F, 3260-327F, AC00-D7AF" 
-            Target           = "Malgun Gothic, Gulim"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Ethiopic                    1200-137F 
-            Ethiopic Supplement         1380-139F 
-            Ethiopic Extended           2D80-2DDF -->
-        <FontFamilyMap  
-            Unicode          = "1200-137F, 1380-139F, 2D80-2DDF" 
-            Target           = "Nyala"
-            Scale            = "1.0"/>
-
-        <!-- Cherokee                    13A0-13FF -->
-        <FontFamilyMap  
-            Unicode          = "13A0-13FF" 
-            Target           = "Plantagenet Cherokee"
-            Scale            = "1.0"/>
-
-        <!-- Canadian Aboriginals        1400-167F -->
-        <FontFamilyMap  
-            Unicode          = "1400-167F" 
-            Target           = "Euphemia"
-            Scale            = "1.0"/>
-
-        <!-- Ogham                      1680-169F -->
-        <!-- Windows 7 only -->
-        <FontFamilyMap
-            Unicode          = "1680-169F"
-            Target           = "Segoe UI Symbol"
-            Scale            = "1.0"/>
-
-        <!-- Runic                      16A0-16FF -->
-        <!-- Windows 7 only -->
-        <FontFamilyMap
-            Unicode          = "16A0-16FF"
-            Target           = "Segoe UI Symbol"
-            Scale            = "1.0"/>
-
-      <!-- 
-            Tagalog                     1700-171F
-            Hanunoo                     1720-173F
-            Buhid                       1740-175F
-            Tagbanwa                    1760-177F -->
-        <!-- No font -->
-
-        <!--
-            Khmer                       1780-17FF
-            Khmer Symbols               19E0-19FF -->
-        <!-- Khmer UI on Win7, DaunPenh on Vista -->
-        <FontFamilyMap  
-            Unicode          = "1780-17FF, 19E0-19FF" 
-            Target           = "Khmer UI, DaunPenh"
-            Scale            = "1.0"/>
-
-        <!-- Mongolian                  1800-18AF -->
-        <FontFamilyMap  
-            Unicode          = "1800-18AF" 
-            Target           = "Mongolian Baiti"
-            Scale            = "1.0"/>
-
-        <!-- 18B0-18FF: unassigned -->
-      
-        <!-- Limbu                      1900-194F -->
-        <!-- No font -->
-      
-        <!-- Tai Le                     1950-197F -->
-        <!-- Windows 7 only -->
-        <FontFamilyMap
-            Unicode          = "1950-197F"
-            Target           = "Microsoft Tai Le"
-            Scale            = "1.0"/>
-
-        <!-- New Tai Lue                1980-19DF -->
-        <!-- Windows 7 only -->
-        <FontFamilyMap
-            Unicode          = "1980-19DF"
-            Target           = "Microsoft New Tai Lue"
-            Scale            = "1.0"/>
-
-        <!-- Khmer Symbols (19E0-19FF): see above, by 1780-17FF -->
-      
-        <!-- Buginese                   1A00-1A1F -->
-        <!-- No font -->
-      
-        <!-- 1A20-1AFF: not assigned -->
-      
-        <!-- Balinese                   1B00-1B7F 
-             Sundanese                  1B80-1BBF -->
-        <!-- No font -->
-      
-        <!-- 1BC0-1BFF: not assigned -->
-      
-        <!-- Lepcha                     1C00-1C4F 
-             Ol Chiki                   1C50-1C7F -->
-        <!-- No font -->
-      
-        <!-- Phonetic Extensions (1D00-1D7F): see above, by 0000-007F 
-             Phonetic Extensions Supplement (1D80-1DBF): see above, by 0000-007F 
-             Combining Diacritical Marks Supplement (1DC0-1DFF): see above, by 0000-007F 
-             Latin Extended Additional (1E00-1EFF): see above, by 0000-007F
-             Greek Extended (1F00-1FFF): see above, by 0000-007F -->
-
-        <!-- NNBSP                      202F -->
-        <!-- Always use Mongolian font to preserve Mongolian shaping -->
-        <FontFamilyMap  
-            Unicode          = "202F" 
-            Target           = "Mongolian Baiti"
-            Scale            = "1.0"/>
-
-        <!--
-            General Punctuation (excl NNBSP) 2000-202E, 2030-206F
-            Superscripts and Subscripts      2070-209F
-            Currency Symbols                 20A0-20CF
-            Letterlike Symbols               2100-214F
-            Number Forms                     2150-218F
-            Arrows                           2190-21FF
-            Mathematical Operators           2200-22FF
-            Miscelllaneous Technical         2300-23FF
-            Enclosed Alphanumerics           2460-24FF
-            Box Drawing                      2500-257F
-            Block Elements                   2580-259F
-            Geometric Shapes                 25A0-25FF
-            Miscellaneous Symbols            2600-26FF
-            Dingbats                         2700-27BF -->
-        <!-- Not ideographs, so after first choice can prioritize ClearType, sans-serif/serif over culture -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, Meiryo, Segoe UI, Segoe UI Symbol, SimSun, MS Gothic, MingLiU, Tahoma, Lucida Sans Unicode, Arial, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, Meiryo, Segoe UI, Segoe UI Symbol, Microsoft YaHei, MingLiU, MS Gothic, Tahoma, Lucida Sans Unicode, Arial, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF"
-            Language         = "ja"
-            Target           = "Meiryo, Segoe UI, Segoe UI Symbol, Microsoft JhengHei, Microsoft YaHei, Malgun Gothic, MS Gothic, MingLiU, Tahoma, Lucida Sans Unicode, Arial, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Segoe UI, Segoe UI Symbol, Meiryo, Microsoft JhengHei, Microsoft YaHei, Gulim, MS Gothic, MingLiU, Tahoma, Lucida Sans Unicode, Arial, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- Other -->
-        <FontFamilyMap  
-            Unicode          = "2000-202E, 2030-20CF, 2100-23FF, 2460-27BF"
-            Target           = "Segoe UI, Segoe UI Symbol, Meiryo, Microsoft JhengHei, Microsoft YaHei, Malgun Gothic, Tahoma, Lucida Sans Unicode, Arial, MS Gothic, MingLiU, Arial Unicode MS, MingLiU"
-            Scale            = "1.0"/>
-
-        <!-- Comb Diacr Marks for Symb  20D0-20FF -->
-        <!-- Windows 7 only; only 20DD -->
-        <FontFamilyMap
-            Unicode          = "20DD"
-            Target           = "Segoe UI Symbol"
-            Scale            = "1.0"/>
-
-        <!-- Control Pictures           2400-243F -->
-        <!-- Segoe UI Symbol for Windows 7, Lucida Sans Unicode for down-level OS -->
-        <FontFamilyMap  
-            Unicode          = "2400-243F"
-            Target           = "Segoe UI Symbol, Lucida Sans Unicode"
-            Scale            = "1.0"/>
-
-        <!-- OCR                        2440-245F -->
-        <!-- Segoe UI Symbol for Windows 7, AUMS for down-level OS (if present) -->
-        <FontFamilyMap  
-            Unicode          = "2440-245F"
-            Target           = "Segoe UI Symbol, Arial Unicode MS"
-            Scale            = "1.0"/>
-
-        <!--
-            Misc Mathematical Symbols-A 27C0-27EF
-            Supplemental Arrows-A       27F0-27FF
-            Braille Patterns            2800-28FF
-            Supplemental Arrows-B       2900-297F
-            Supplemental Math Operators 2A00-2AFF
-            Misc Symbols and Arrows     2B00-2BFF -->
-        <!-- Cambria Math for 2A00-2AFF; rest, only Segoe UI Symbol on Windows 7 -->
-        <FontFamilyMap
-            Unicode          = "27C0-297F, 2A00-2BFF"
-            Target           = "Segoe UI Symbol, Cambria Math"
-            Scale            = "1.0"/>
-      
-        <!-- Misc Mathematical Symbols-B  2980-29FF-->
-        <FontFamilyMap
-            Unicode          = "2980-29FF"
-            Target           = "Segoe UI Symbol, MS Gothic"
-            Scale            = "1.0"/>
-
-        <!-- 
-              Glagolitic                  2C00-2C5F
-              Coptic                      2C80-2CFF -->
-        <!-- No font -->
-      
-        <!-- Georgian Supplement (2D00-2D2F): see above, by 0530-058F -->
-      
-        <!-- Tifinagh                    2D30-2D7F -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-           Unicode          = "2D30-2D7F"
-           Target           = "Ebrima"
-           Scale            = "1.0"/>
-
-        <!-- Ethiopic Extended (2D80-2DDF): see above, by 1200-137F -->
-      
-        <!-- Cyrillic Extended-A (2DE0-2DFF): see above, by 0000-007F -->
-      
-        <!-- Supplemental Punctuation    2E00-2E7F -->
-        <!-- No font -->
-
-        <!-- CJK Radicals Supplement     2E80-2EFF -->
-        <!-- ideographic: culture, important as well as ClearType -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2E80-2EFF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun, Meiryo, MingLiu"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2E80-2EFF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft YaHei, MingLiU, Meiryo, SimSun"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->    
-        <FontFamilyMap  
-            Unicode          = "2E80-2EFF"
-            Target           = "Meiryo, Microsoft YaHei, MingLiU, SimSun"
-            Scale            = "1.0"/>
-
-        <!-- Kangxi Radicals             2F00-2FDF -->
-        <FontFamilyMap  
-            Unicode          = "2F00-2FDF"
-            Target           = "Meiryo"
-            Scale            = "1.0"/>
-      
-        <!-- 2FE0-2FEF: unassigned -->
-
-        <!-- Ideogr Description Char     2FF0-2FFF -->
-        <FontFamilyMap  
-            Unicode          = "2FF0-2FFF"
-            Target           = "SimSun"
-            Scale            = "1.0"/>
-        
-        <!--
-            Symbols and Punctuation     3000-303F
-            Hiragana                    3040-309F
-            Katakana                    30A0-30FF
-            Katakana Phonetic Ext.      31F0-31FF -->
-        <!-- CHS -->
-        <!-- On Vista, the CHS UI font has a sans-serif style; it supports these except for 31F0-31FF. -->
-        <!-- On Vista, MS Gothic supports 31F0-31FF; SimSun does not. -->
-        <!-- On XP, the CHS UI font has a serif style; it has gaps in 3000-303F, 3040-309F and 30A0-30FF,
-        	 some of which are covered by MS Gothic. MS Gothic also has gaps; some in 3000-303F are covered
-        	 by SimSun. -->
-        <!-- More important to match the style of punctuation used for CHS with ideographs than to keep
-             serif/sans-serif consistency across punctuation/symbols or across kana. -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun, MS Gothic, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <!-- On Vista, the CHT UI font has a sans-serif style; it supports these except for 31F0-31FF. -->
-        <!-- On Vista, MS Gothic supports 31F0-31FF; MingLiU does not. -->
-        <!-- On XP, the CHT UI font has a serif style; it has gaps in 3000-303F, 3040-309F and 30A0-30FF,
-        	 some of which are covered by MS Gothic. MS Gothic also has gaps; some in 3000-303F are covered
-        	 by MingLiU. -->
-        <!-- More important to match the style of punctuation used for CHS with ideographs than to keep
-             serif/sans-serif consistency across punctuation/symbols or across kana. -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, MingLiu, MS Gothic, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <!-- KO UI fonts (Malgun Gothic on Vista, Gulim on XP) has a sans-serif style. -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Meiryo, Microsoft YaHei, Gulim, MS Gothic, MingLiu, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "3000-30FF, 31F0-31FF"
-            Target           = "Meiryo, Microsoft YaHei, MS Gothic, MingLiu, Arial Unicode MS"
-            Scale            = "1.0"/>
-
-        <!--
-            Bopomofo                    3100-312F
-            Bopomofo Extended           31A0-31BF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3100-312F, 31A0-31BF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3100-312F, 31A0-31BF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, MingLiU, Arial Unicode MS"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "3100-312F, 31A0-31BF"
-            Target           = "Microsoft JhengHei, MingLiu, Arial Unicode MS"
-            Scale            = "1.0"/>
-      
-        <!-- Hangul Compatibility Jamo (3130-318F): see above, by 1100-11FF -->
-
-        <!-- Kanbun                     3190-319F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3190-319F"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, MingLiU"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT, JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "3190-319F"
-            Target           = "Microsoft JhengHei, MingLiU"
-            Scale            = "1.0"/>
-
-        <!-- CJK Strokes                31C0-31EF -->
-        <!-- Not supported in any font on XP. -->
-        <FontFamilyMap  
-            Unicode          = "31C0-31EF"
-            Target           = "MingLiU"
-            Scale            = "1.0"/>
-      
-        <!-- Katakana Phonetic Ext. (31F0-31FF): see above, by 3000-303F -->
-
-        <!-- Enclosed CJK Letters and Months (3200-32FF) and CJK Compatibility (3300-33FF): 
-             divided into sub-ranges: -->
-        <!-- 3200-321F and 3260-327F: enclosed Hangul - see above, by 1100-11FF. -->
-        <!--
-            Enclosed CJK Han            3220-324F
-            Enclosed CJK Numbers 21-35  3251-325F
-            Enclosed CJK (Circled Ideog)3280-32B0
-            Enclosed CJK Numbers 36-50  32B1-32BF
-            Enclosed CJK Month          32C0-32CB
-            Enclosed CJK Katakana       32D0-32FF
-            CJK Comp Square Katakana    3300-3357
-            CJK Comp Hours              3358-3370
-            CJK Comp Latin Abr (hPa-PC) 3371-3376
-            CJK Comp Ja era and corp    337B-337F
-            CJK Comp Days               33E0-33FF -->
-        <!-- Vista: Meiryo has all but 75. YaHei and JhengHei each have one: 32A3. Malgun Gothic has none.
-             MS Gothic has all but 1, and is sans-serif. -->
-        <!-- XP: SimSun has 12; MingLiU has 1 (32A3); Gulim has none; MS Gothic has all but 31. -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3220-324F, 3251-325F, 3280-32CB, 32D0-3376, 337B-337F, 33E0-33FF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, Meiryo, SimSun, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3220-324F,3251-325F, 3280-32CB, 32D0-3376, 337B-337F, 33E0-33FF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, Meiryo, MingLiU, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- Other (including JA, KO) -->
-        <FontFamilyMap  
-            Unicode          = "3220-324F,3251-325F, 3280-32CB, 32D0-3376, 337B-337F, 33E0-33FF"
-            Target           = "Meiryo, MS Gothic"
-            Scale            = "1.0"/>
-
-        <!--
-            Enclosed CJK (PTE)                 3250
-            Enclosed CJK (Sq Lat Ab Hg to LTD) 32CC-32CF
-            CJK Comp (Latin Abr DM-IU)         3377-337A -->
-        <!-- No font -->
-        
-        <!-- CJK Comp Square Latin Abr   3380-33DF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, Microsoft JhengHei, Meiryo, Malgun Gothic, SimSun, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, Meiryo, Malgun Gothic, PMingLiU, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Meiryo, Gulim, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "3380-33DF"
-            Target           = "Meiryo, MS Gothic"
-            Scale            = "1.0"/>
-
-        <!--
-            CJK Unified Ext A           3400-4DBF
-            CJK Unified                 4E00-9FFF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun, SimSun-18030, SimSun-ExtB, MingLiU"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "zh-HK"
-            Target           = "Microsoft JhengHei, Microsoft YaHei, MingLiU_HKSCS, MingLiU, SimSun-18030, SimSun-ExtB, SimSun"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, Microsoft YaHei, MingLiU, SimSun-18030, SimSun-ExtB, SimSun"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "ja"
-            Target           = "Meiryo, MS Gothic, Microsoft JhengHei, Microsoft YaHei, MingLiU"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Language         = "ko"
-            Target           = "Gulim, Microsoft JhengHei, Microsoft YaHei, MS Gothic, MingLiU, Simsun"
-            Scale            = "1.0"/>
-        <!-- Other -->
-        <FontFamilyMap  
-            Unicode          = "3400-4DBF, 4E00-9FBB"
-            Target           = "Meiryo, Microsoft JhengHei, Microsoft YaHei, MS Gothic, MingLiU, Simsun"
-            Scale            = "1.0"/>
-
-        <!-- Yijing Hexagram Symbols     4DC0-4DFF -->
-        <!-- Windows 7 only -->
-        <FontFamilyMap
-            Unicode          = "4DC0-4DFF"
-            Target           = "Segoe UI Symbol"
-            Scale            = "1.0"/>
-
-      <!--
-            Yi Syllables                A000-A48F
-            Yi Radicals                 A490-A4CF  -->
-        <FontFamilyMap  
-            Unicode          = "A000-A4CF" 
-            Target           = "Microsoft Yi Baiti, SimSun-18030, SimSun-ExtB"
-            Scale            = "1.0"/>
-
-        <!-- A4D0-A4FF: unassigned -->
-      
-        <!-- Vai                        A500-A63F -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-            Unicode          = "A500-A63F"
-            Target           = "Ebrima"
-            Scale            = "1.0"/>
-      
-        <!-- Cyrillic Extended-B (A640-A69F): see above, by 0000-007F -->
-      
-        <!-- A6A0-A6FF: unassigned -->
-
-        <!-- Modifier Tone Letters      A700-A71F -->
-        <FontFamilyMap
-            Unicode          = "A700-A71F"
-            Target           = "Segoe UI"
-            Scale            = "1.0"/>
-
-        <!-- Syloti Nagri               A800-A82F -->
-        <!-- No font -->
-      
-        <!-- A830-A83F: unassigned -->
-      
-        <!-- Phags-pa                   A840-A87F -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-            Unicode          = "A840-A87F"
-            Target           = "Microsoft PhagsPa"
-            Scale            = "1.0"/>
-
-        <!-- Saurashtra                 A880-A8DF -->
-        <!-- No font -->
-      
-        <!-- A8E0-A8FF: unassigned -->
-      
-        <!-- Kayah Li                   A900-A92F
-             Rejang                     A930-A95F -->
-        <!-- No font -->
-      
-        <!-- A960-A9FF: unassigned -->
-      
-        <!-- Cham                       AA00-AA5F -->
-        <!-- No font -->
-      
-        <!-- AA60-ABFF: unassigned -->
-      
-        <!-- Hangul Syllables (AC00-D7AF): see above, by 1100-11FF -->
-      
-        <!-- D7B0-D7FF: unassigned -->
-      
-        <!-- D800-DFFF: non-characters (UTF-16 surrogates) -->
-      
-        <!-- E000-F8FF: PUA, no general font specified -->
-        <!-- CJK PUA for GB18030 (CN) and HKSCS (HK)-->
-        <!-- CN -->
-        <FontFamilyMap
-            Unicode          = "E76C, E78D-E796, E7C7-E7C8, E7E7-E7F3, E815-E864"
-            Language         = "zh-CN"
-            Target           = "Microsoft YaHei, SimSun"
-            Scale            = "1.0"/>
-        <FontFamilyMap
-            Unicode          = "E76C, E78D-E796, E7C7-E7C8, E7E7-E7F3, E815-E864"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun"
-            Scale            = "1.0"/>
-        <!-- HK -->
-        <!-- ignoring small gaps in font coverage -->
-        <FontFamilyMap
-            Unicode          = "E000-EEB7, F303-F34B, F3A0-F5F1, F634-F848"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS"
-            Scale            = "1.0"/>
-
-        <!-- CJK Compatibility Ideographs F900-FAFF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, Microsoft JhengHei, Meiryo, SimSun, PMingLiU, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, Meiryo, PMingLiU, MS Mincho"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Language         = "ko"
-            Target           = "Meiryo, Microsoft JhengHei, Gulim, MS Gothic, PMingLiU, SimSun"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "F900-FAFF"
-            Target           = "Meiryo, Microsoft JhengHei, MS Gothic, PMingLiU, SimSun, Gulim"
-            Scale            = "1.0"/>
-
-        <!-- FB00-FDFF: see above, by 0000-007F -->
-        
-        <!-- Variation Selectors         FE00-FE0F -->
-        <!-- No font -->
-        
-        <!-- Vertical Forms              FE10-FE1F -->
-        <!-- Not supported in Vista fonts. -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FE10-FE1F"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FE10-FE1F"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Microsoft JhengHei"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT and JA) -->
-        <FontFamilyMap  
-            Unicode          = "FE10-FE1F"
-            Target           = "Microsoft JhengHei"
-            Scale            = "1.0"/>
-
-        <!-- Combining Half Marks (FE20-FE2F): see above, by 0000-007F -->
-        
-        <!--
-            CJK Compatibility Forms     FE30-FE4F
-            Small Form Variants         FE50-FE6F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, MingLiU"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Language         = "ja"
-            Target           = "Meiryo, Microsoft JhengHei, MingLiu"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Microsoft JhengHei, MingLiu"
-            Scale            = "1.0"/>
-        <!-- Other -->
-        <FontFamilyMap  
-            Unicode          = "FE30-FE6F"
-            Target           = "Microsoft JhengHei, MingLiu"
-            Scale            = "1.0"/>
-
-        <!-- Arabic Pres Forms-B FE70-FEFE: see above, by 0000-007F -->
-        
-        <!-- Character FEFF              FEFF -->
-        <!-- No font -->
-        
-        <!-- Halfw and Fullw Forms (Latin) FF00-FF60 -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Meiryo, Gulim, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- Other (include JA) -->
-        <FontFamilyMap  
-            Unicode          = "FF00-FF60"
-            Target           = "Meiryo, MS Gothic"
-            Scale            = "1.0"/>
-
-        <!--
-            Half Full Forms (CJK Punct) FF61-FF64
-            Half Full Forms (Katakana)  FF65-FF9F -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FF61-FF9F"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, MingLiU"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "FF61-FF9F"
-            Language         = "zh-Hant"
-            Target           = "Microsoft JhengHei, MingLiU"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "FF61-FF9F"
-            Target           = "Meiryo, MS Gothic"
-            Scale            = "1.0"/>
-
-        <!-- Half Full Forms (Hangul)    FFA0-FFDF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FFA0-FFDC"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei"
-            Scale            = "1.0"/>
-        <!-- Other -->
-        <FontFamilyMap  
-            Unicode          = "FFA0-FFDC"
-            Target           = "Microsoft JhengHei"
-            Scale            = "1.0"/>
-
-        <!-- Half Full (symbol variants) FFE0-FFEF -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, MS Gothic, Gulim"
-            Scale            = "1.0"/>
-        <!-- KO -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Language         = "ko"
-            Target           = "Malgun Gothic, Meiryo, Microsoft JhengHei, Gulim, MS Gothic"
-            Scale            = "1.0"/>
-        <!-- Other (including CHT, JA) -->
-        <FontFamilyMap  
-            Unicode          = "FFE0-FFEE"
-            Target           = "Microsoft JhengHei, MS Gothic, Gulim"
-            Scale            = "1.0"/>
-            
-        <!-- Specials                    FFF0-FFFD -->
-        <FontFamilyMap  
-            Unicode          = "FFF0-FFFD"
-            Target           = "Tahoma"
-            Scale            = "1.0"/>
-        
-        <!-- FFFE-FFFF: non-characters, no font -->
-      
-        <!--
-            Linear B Syllabary             10000-1007F
-            Linear B Ideograms             10080-100FF
-            Aegean Numbers                 10100-1013F
-            Old Italic                     10300-1032F
-            Gothic                         10330-1034F
-            Ugaritic                       10380-1039F
-            Old Persian                    103A0-103DF -->
-        
-        <!-- Deseret                       10400-1044F -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-            Unicode          = "10400-1044F"
-            Target           = "Segoe UI Symbol"
-            Scale            = "1.0"/>
-
-        <!-- Shavian                       10450-1047F -->
-        
-        <!-- Osmanya                       10480-104AF -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-            Unicode          = "10480-104AF"
-            Target           = "Ebrima"
-            Scale            = "1.0"/>
-
-        <!-- 
-            Cypriot Syllabary              10800-1083F
-            Kharoshthi                     10A00-10A5F
-            Byzantine Musical Symbols      1D000-1D0FF
-            Musical Symbols                1D100-1D1FF
-            Ancient Greek Musical Notation 1D200-1D24F -->
-      
-        <!-- Tai Xuan Jing Symbols         1D300-1D35F -->
-        <!-- Window 7 -->
-        <FontFamilyMap
-            Unicode          = "1D300-1D35F"
-            Target           = "Segoe UI Symbol"
-            Scale            = "1.0"/>
-
-        <!-- Math Alphanumeric Symbols     1D400-1D7FF -->
-        <!-- Not supported in XP fonts. -->
-        <FontFamilyMap  
-            Unicode          = "1D400-1D7FF" 
-            Target           = "Cambria Math"
-            Scale            = "1.0"/>
-        
-        <!-- CJK Unified Ideographs ExtB 20000-2A6DF -->
-		<!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "20000-2A6DF" 
-            Language         = "zh-Hans"
-            Target           = "Microsoft YaHei, SimSun-ExtB"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "20000-2A6DF" 
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS-ExtB, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- JA -->
-        <FontFamilyMap  
-            Unicode          = "20000-2A6DF" 
-            Language         = "ja"
-            Target           = "Meiryo, MS Gothic, MingLiU-ExtB"
-            Scale            = "1.0"/>
-        <!-- Other (include CHT and KO) -->
-        <FontFamilyMap
-            Unicode          = "20000-2A6DF" 
-            Target           = "MingLiU-ExtB"
-            Scale            = "1.0"/>
-
-        <!-- CJK Comp Ideog Supplement      2F800-2FA1F -->
-        <!-- Vista: none in JhengHei, YaHei or Malgun Gothic. Meiryo: 45; MingLiU-ExtB: 11; SimSun-ExtB/MS Gothic/Gulim: 0 -->
-        <!-- CHS -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hans"
-            Target           = "SimSun-ExtB, MingLiU-ExtB, Meiryo"
-            Scale            = "1.0"/>
-        <!-- Hong Kong -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-HK"
-            Target           = "MingLiU_HKSCS-ExtB, MingLiU-ExtB, Meiryo"
-            Scale            = "1.0"/>
-        <!-- CHT -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Language         = "zh-Hant"
-            Target           = "MingLiU-ExtB, Meiryo"
-            Scale            = "1.0"/>
-        <!-- Other (include JA and KO) -->
-        <FontFamilyMap  
-            Unicode          = "2F800-2FA1F"
-            Target           = "Meiryo, MingLiU-ExtB"
-            Scale            = "1.0"/>
-
-    </FontFamily.FamilyMaps>
-
-</FontFamily>
diff --git a/src/main/assets/Fonts/HARLOWSI.TTF b/src/main/assets/Fonts/HARLOWSI.TTF
deleted file mode 100644
index 2be6fc5..0000000
Binary files a/src/main/assets/Fonts/HARLOWSI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/HARNGTON.TTF b/src/main/assets/Fonts/HARNGTON.TTF
deleted file mode 100644
index b460220..0000000
Binary files a/src/main/assets/Fonts/HARNGTON.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/HATTEN.TTF b/src/main/assets/Fonts/HATTEN.TTF
deleted file mode 100644
index af9662f..0000000
Binary files a/src/main/assets/Fonts/HATTEN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/HTOWERT.TTF b/src/main/assets/Fonts/HTOWERT.TTF
deleted file mode 100644
index 48ad007..0000000
Binary files a/src/main/assets/Fonts/HTOWERT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/HTOWERTI.TTF b/src/main/assets/Fonts/HTOWERTI.TTF
deleted file mode 100644
index 58edbe1..0000000
Binary files a/src/main/assets/Fonts/HTOWERTI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/IMPRISHA.TTF b/src/main/assets/Fonts/IMPRISHA.TTF
deleted file mode 100644
index 91794bf..0000000
Binary files a/src/main/assets/Fonts/IMPRISHA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/INFROMAN.TTF b/src/main/assets/Fonts/INFROMAN.TTF
deleted file mode 100644
index 41167e4..0000000
Binary files a/src/main/assets/Fonts/INFROMAN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ITCBLKAD.TTF b/src/main/assets/Fonts/ITCBLKAD.TTF
deleted file mode 100644
index 3d3b6c9..0000000
Binary files a/src/main/assets/Fonts/ITCBLKAD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ITCEDSCR.TTF b/src/main/assets/Fonts/ITCEDSCR.TTF
deleted file mode 100644
index dcc21fd..0000000
Binary files a/src/main/assets/Fonts/ITCEDSCR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ITCKRIST.TTF b/src/main/assets/Fonts/ITCKRIST.TTF
deleted file mode 100644
index 3685aac..0000000
Binary files a/src/main/assets/Fonts/ITCKRIST.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/Inkfree.ttf b/src/main/assets/Fonts/Inkfree.ttf
deleted file mode 100644
index 6f52c04..0000000
Binary files a/src/main/assets/Fonts/Inkfree.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/JOKERMAN.TTF b/src/main/assets/Fonts/JOKERMAN.TTF
deleted file mode 100644
index 3c41249..0000000
Binary files a/src/main/assets/Fonts/JOKERMAN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/JUICE___.TTF b/src/main/assets/Fonts/JUICE___.TTF
deleted file mode 100644
index 5bf7a7e..0000000
Binary files a/src/main/assets/Fonts/JUICE___.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/KUNSTLER.TTF b/src/main/assets/Fonts/KUNSTLER.TTF
deleted file mode 100644
index 5c4269c..0000000
Binary files a/src/main/assets/Fonts/KUNSTLER.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LATINWD.TTF b/src/main/assets/Fonts/LATINWD.TTF
deleted file mode 100644
index 4e883ee..0000000
Binary files a/src/main/assets/Fonts/LATINWD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LBRITE.TTF b/src/main/assets/Fonts/LBRITE.TTF
deleted file mode 100644
index 5d05891..0000000
Binary files a/src/main/assets/Fonts/LBRITE.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LBRITED.TTF b/src/main/assets/Fonts/LBRITED.TTF
deleted file mode 100644
index fe74d4c..0000000
Binary files a/src/main/assets/Fonts/LBRITED.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LBRITEDI.TTF b/src/main/assets/Fonts/LBRITEDI.TTF
deleted file mode 100644
index 901c65d..0000000
Binary files a/src/main/assets/Fonts/LBRITEDI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LBRITEI.TTF b/src/main/assets/Fonts/LBRITEI.TTF
deleted file mode 100644
index a6e6456..0000000
Binary files a/src/main/assets/Fonts/LBRITEI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LCALLIG.TTF b/src/main/assets/Fonts/LCALLIG.TTF
deleted file mode 100644
index d7a0eb8..0000000
Binary files a/src/main/assets/Fonts/LCALLIG.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LEELAWAD.TTF b/src/main/assets/Fonts/LEELAWAD.TTF
deleted file mode 100644
index a930f33..0000000
Binary files a/src/main/assets/Fonts/LEELAWAD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LEELAWDB.TTF b/src/main/assets/Fonts/LEELAWDB.TTF
deleted file mode 100644
index 2db600d..0000000
Binary files a/src/main/assets/Fonts/LEELAWDB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LFAX.TTF b/src/main/assets/Fonts/LFAX.TTF
deleted file mode 100644
index 952b740..0000000
Binary files a/src/main/assets/Fonts/LFAX.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LFAXD.TTF b/src/main/assets/Fonts/LFAXD.TTF
deleted file mode 100644
index 1727256..0000000
Binary files a/src/main/assets/Fonts/LFAXD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LFAXDI.TTF b/src/main/assets/Fonts/LFAXDI.TTF
deleted file mode 100644
index 32cfef6..0000000
Binary files a/src/main/assets/Fonts/LFAXDI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LFAXI.TTF b/src/main/assets/Fonts/LFAXI.TTF
deleted file mode 100644
index 8bde858..0000000
Binary files a/src/main/assets/Fonts/LFAXI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LHANDW.TTF b/src/main/assets/Fonts/LHANDW.TTF
deleted file mode 100644
index 0b68973..0000000
Binary files a/src/main/assets/Fonts/LHANDW.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LSANS.TTF b/src/main/assets/Fonts/LSANS.TTF
deleted file mode 100644
index 607f839..0000000
Binary files a/src/main/assets/Fonts/LSANS.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LSANSD.TTF b/src/main/assets/Fonts/LSANSD.TTF
deleted file mode 100644
index 48de053..0000000
Binary files a/src/main/assets/Fonts/LSANSD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LSANSDI.TTF b/src/main/assets/Fonts/LSANSDI.TTF
deleted file mode 100644
index db754fd..0000000
Binary files a/src/main/assets/Fonts/LSANSDI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LSANSI.TTF b/src/main/assets/Fonts/LSANSI.TTF
deleted file mode 100644
index d21659c..0000000
Binary files a/src/main/assets/Fonts/LSANSI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LTYPE.TTF b/src/main/assets/Fonts/LTYPE.TTF
deleted file mode 100644
index 9545d99..0000000
Binary files a/src/main/assets/Fonts/LTYPE.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LTYPEB.TTF b/src/main/assets/Fonts/LTYPEB.TTF
deleted file mode 100644
index f1209b7..0000000
Binary files a/src/main/assets/Fonts/LTYPEB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LTYPEBO.TTF b/src/main/assets/Fonts/LTYPEBO.TTF
deleted file mode 100644
index d849ad5..0000000
Binary files a/src/main/assets/Fonts/LTYPEBO.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LTYPEO.TTF b/src/main/assets/Fonts/LTYPEO.TTF
deleted file mode 100644
index 606a23d..0000000
Binary files a/src/main/assets/Fonts/LTYPEO.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/LeelUIsl.ttf b/src/main/assets/Fonts/LeelUIsl.ttf
deleted file mode 100644
index 2314cec..0000000
Binary files a/src/main/assets/Fonts/LeelUIsl.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/LeelaUIb.ttf b/src/main/assets/Fonts/LeelaUIb.ttf
deleted file mode 100644
index 4e40409..0000000
Binary files a/src/main/assets/Fonts/LeelaUIb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/LeelawUI.ttf b/src/main/assets/Fonts/LeelawUI.ttf
deleted file mode 100644
index dac7cb4..0000000
Binary files a/src/main/assets/Fonts/LeelawUI.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/MAGNETOB.TTF b/src/main/assets/Fonts/MAGNETOB.TTF
deleted file mode 100644
index 8d96082..0000000
Binary files a/src/main/assets/Fonts/MAGNETOB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MAIAN.TTF b/src/main/assets/Fonts/MAIAN.TTF
deleted file mode 100644
index 57c928c..0000000
Binary files a/src/main/assets/Fonts/MAIAN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MATURASC.TTF b/src/main/assets/Fonts/MATURASC.TTF
deleted file mode 100644
index bc1479b..0000000
Binary files a/src/main/assets/Fonts/MATURASC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MISTRAL.TTF b/src/main/assets/Fonts/MISTRAL.TTF
deleted file mode 100644
index cc3646f..0000000
Binary files a/src/main/assets/Fonts/MISTRAL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MOD20.TTF b/src/main/assets/Fonts/MOD20.TTF
deleted file mode 100644
index a91ebf2..0000000
Binary files a/src/main/assets/Fonts/MOD20.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MSUIGHUB.TTF b/src/main/assets/Fonts/MSUIGHUB.TTF
deleted file mode 100644
index 07b5491..0000000
Binary files a/src/main/assets/Fonts/MSUIGHUB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MSUIGHUR.TTF b/src/main/assets/Fonts/MSUIGHUR.TTF
deleted file mode 100644
index 041ab15..0000000
Binary files a/src/main/assets/Fonts/MSUIGHUR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MTCORSVA.TTF b/src/main/assets/Fonts/MTCORSVA.TTF
deleted file mode 100644
index 55f88d0..0000000
Binary files a/src/main/assets/Fonts/MTCORSVA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/MTEXTRA.TTF b/src/main/assets/Fonts/MTEXTRA.TTF
deleted file mode 100644
index d3178ee..0000000
Binary files a/src/main/assets/Fonts/MTEXTRA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/NIAGENG.TTF b/src/main/assets/Fonts/NIAGENG.TTF
deleted file mode 100644
index 52208e6..0000000
Binary files a/src/main/assets/Fonts/NIAGENG.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/NIAGSOL.TTF b/src/main/assets/Fonts/NIAGSOL.TTF
deleted file mode 100644
index 301e751..0000000
Binary files a/src/main/assets/Fonts/NIAGSOL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/Nirmala.ttf b/src/main/assets/Fonts/Nirmala.ttf
deleted file mode 100644
index 620652b..0000000
Binary files a/src/main/assets/Fonts/Nirmala.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/NirmalaB.ttf b/src/main/assets/Fonts/NirmalaB.ttf
deleted file mode 100644
index b64bf45..0000000
Binary files a/src/main/assets/Fonts/NirmalaB.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/NirmalaS.ttf b/src/main/assets/Fonts/NirmalaS.ttf
deleted file mode 100644
index d998adc..0000000
Binary files a/src/main/assets/Fonts/NirmalaS.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/NumberOnly.ttf b/src/main/assets/Fonts/NumberOnly.ttf
deleted file mode 100644
index 19b6f57..0000000
Binary files a/src/main/assets/Fonts/NumberOnly.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/OCRAEXT.TTF b/src/main/assets/Fonts/OCRAEXT.TTF
deleted file mode 100644
index 0e77e20..0000000
Binary files a/src/main/assets/Fonts/OCRAEXT.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/OLDENGL.TTF b/src/main/assets/Fonts/OLDENGL.TTF
deleted file mode 100644
index bed2c5b..0000000
Binary files a/src/main/assets/Fonts/OLDENGL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ONYX.TTF b/src/main/assets/Fonts/ONYX.TTF
deleted file mode 100644
index baf4efe..0000000
Binary files a/src/main/assets/Fonts/ONYX.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/OUTLOOK.TTF b/src/main/assets/Fonts/OUTLOOK.TTF
deleted file mode 100644
index 1d494ab..0000000
Binary files a/src/main/assets/Fonts/OUTLOOK.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PALSCRI.TTF b/src/main/assets/Fonts/PALSCRI.TTF
deleted file mode 100644
index 3e128a0..0000000
Binary files a/src/main/assets/Fonts/PALSCRI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PAPYRUS.TTF b/src/main/assets/Fonts/PAPYRUS.TTF
deleted file mode 100644
index b530afb..0000000
Binary files a/src/main/assets/Fonts/PAPYRUS.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PARCHM.TTF b/src/main/assets/Fonts/PARCHM.TTF
deleted file mode 100644
index 27d7a09..0000000
Binary files a/src/main/assets/Fonts/PARCHM.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PERBI___.TTF b/src/main/assets/Fonts/PERBI___.TTF
deleted file mode 100644
index 3882fe9..0000000
Binary files a/src/main/assets/Fonts/PERBI___.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PERB____.TTF b/src/main/assets/Fonts/PERB____.TTF
deleted file mode 100644
index c73833d..0000000
Binary files a/src/main/assets/Fonts/PERB____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PERI____.TTF b/src/main/assets/Fonts/PERI____.TTF
deleted file mode 100644
index e4f295e..0000000
Binary files a/src/main/assets/Fonts/PERI____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PERTIBD.TTF b/src/main/assets/Fonts/PERTIBD.TTF
deleted file mode 100644
index 71bc926..0000000
Binary files a/src/main/assets/Fonts/PERTIBD.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PERTILI.TTF b/src/main/assets/Fonts/PERTILI.TTF
deleted file mode 100644
index 91395fd..0000000
Binary files a/src/main/assets/Fonts/PERTILI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PER_____.TTF b/src/main/assets/Fonts/PER_____.TTF
deleted file mode 100644
index 846b3dc..0000000
Binary files a/src/main/assets/Fonts/PER_____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PLAYBILL.TTF b/src/main/assets/Fonts/PLAYBILL.TTF
deleted file mode 100644
index eaecfc5..0000000
Binary files a/src/main/assets/Fonts/PLAYBILL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/POORICH.TTF b/src/main/assets/Fonts/POORICH.TTF
deleted file mode 100644
index 11de8a9..0000000
Binary files a/src/main/assets/Fonts/POORICH.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/PRISTINA.TTF b/src/main/assets/Fonts/PRISTINA.TTF
deleted file mode 100644
index 8740c67..0000000
Binary files a/src/main/assets/Fonts/PRISTINA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/RAGE.TTF b/src/main/assets/Fonts/RAGE.TTF
deleted file mode 100644
index d474dba..0000000
Binary files a/src/main/assets/Fonts/RAGE.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/RAVIE.TTF b/src/main/assets/Fonts/RAVIE.TTF
deleted file mode 100644
index 3e6141d..0000000
Binary files a/src/main/assets/Fonts/RAVIE.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/REFSAN.TTF b/src/main/assets/Fonts/REFSAN.TTF
deleted file mode 100644
index 5e75b7b..0000000
Binary files a/src/main/assets/Fonts/REFSAN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/REFSPCL.TTF b/src/main/assets/Fonts/REFSPCL.TTF
deleted file mode 100644
index b6bfd99..0000000
Binary files a/src/main/assets/Fonts/REFSPCL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCCB___.TTF b/src/main/assets/Fonts/ROCCB___.TTF
deleted file mode 100644
index 0e0cbf6..0000000
Binary files a/src/main/assets/Fonts/ROCCB___.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCC____.TTF b/src/main/assets/Fonts/ROCC____.TTF
deleted file mode 100644
index 2b9b8f7..0000000
Binary files a/src/main/assets/Fonts/ROCC____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCK.TTF b/src/main/assets/Fonts/ROCK.TTF
deleted file mode 100644
index f4cd355..0000000
Binary files a/src/main/assets/Fonts/ROCK.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCKB.TTF b/src/main/assets/Fonts/ROCKB.TTF
deleted file mode 100644
index a36e8c1..0000000
Binary files a/src/main/assets/Fonts/ROCKB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCKBI.TTF b/src/main/assets/Fonts/ROCKBI.TTF
deleted file mode 100644
index 393552b..0000000
Binary files a/src/main/assets/Fonts/ROCKBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCKEB.TTF b/src/main/assets/Fonts/ROCKEB.TTF
deleted file mode 100644
index 02888d5..0000000
Binary files a/src/main/assets/Fonts/ROCKEB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/ROCKI.TTF b/src/main/assets/Fonts/ROCKI.TTF
deleted file mode 100644
index c6ef492..0000000
Binary files a/src/main/assets/Fonts/ROCKI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SCHLBKB.TTF b/src/main/assets/Fonts/SCHLBKB.TTF
deleted file mode 100644
index cc1bfea..0000000
Binary files a/src/main/assets/Fonts/SCHLBKB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SCHLBKBI.TTF b/src/main/assets/Fonts/SCHLBKBI.TTF
deleted file mode 100644
index 81c8c22..0000000
Binary files a/src/main/assets/Fonts/SCHLBKBI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SCHLBKI.TTF b/src/main/assets/Fonts/SCHLBKI.TTF
deleted file mode 100644
index 34e23bd..0000000
Binary files a/src/main/assets/Fonts/SCHLBKI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SCRIPTBL.TTF b/src/main/assets/Fonts/SCRIPTBL.TTF
deleted file mode 100644
index 776f51c..0000000
Binary files a/src/main/assets/Fonts/SCRIPTBL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SHOWG.TTF b/src/main/assets/Fonts/SHOWG.TTF
deleted file mode 100644
index 8317848..0000000
Binary files a/src/main/assets/Fonts/SHOWG.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SIMLI.TTF b/src/main/assets/Fonts/SIMLI.TTF
deleted file mode 100644
index 67a3d4a..0000000
Binary files a/src/main/assets/Fonts/SIMLI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SIMYOU.TTF b/src/main/assets/Fonts/SIMYOU.TTF
deleted file mode 100644
index 933b9d3..0000000
Binary files a/src/main/assets/Fonts/SIMYOU.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SNAP____.TTF b/src/main/assets/Fonts/SNAP____.TTF
deleted file mode 100644
index 6afede3..0000000
Binary files a/src/main/assets/Fonts/SNAP____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STCAIYUN.TTF b/src/main/assets/Fonts/STCAIYUN.TTF
deleted file mode 100644
index f2c31b3..0000000
Binary files a/src/main/assets/Fonts/STCAIYUN.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STENCIL.TTF b/src/main/assets/Fonts/STENCIL.TTF
deleted file mode 100644
index 3cc031b..0000000
Binary files a/src/main/assets/Fonts/STENCIL.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STFANGSO.TTF b/src/main/assets/Fonts/STFANGSO.TTF
deleted file mode 100644
index 441f288..0000000
Binary files a/src/main/assets/Fonts/STFANGSO.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STHUPO.TTF b/src/main/assets/Fonts/STHUPO.TTF
deleted file mode 100644
index d1104b9..0000000
Binary files a/src/main/assets/Fonts/STHUPO.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STKAITI.TTF b/src/main/assets/Fonts/STKAITI.TTF
deleted file mode 100644
index 5044116..0000000
Binary files a/src/main/assets/Fonts/STKAITI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STLITI.TTF b/src/main/assets/Fonts/STLITI.TTF
deleted file mode 100644
index 8ede20e..0000000
Binary files a/src/main/assets/Fonts/STLITI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STSONG.TTF b/src/main/assets/Fonts/STSONG.TTF
deleted file mode 100644
index 3870605..0000000
Binary files a/src/main/assets/Fonts/STSONG.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STXIHEI.TTF b/src/main/assets/Fonts/STXIHEI.TTF
deleted file mode 100644
index e85ffd1..0000000
Binary files a/src/main/assets/Fonts/STXIHEI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STXINGKA.TTF b/src/main/assets/Fonts/STXINGKA.TTF
deleted file mode 100644
index 53439a2..0000000
Binary files a/src/main/assets/Fonts/STXINGKA.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STXINWEI.TTF b/src/main/assets/Fonts/STXINWEI.TTF
deleted file mode 100644
index afe13f4..0000000
Binary files a/src/main/assets/Fonts/STXINWEI.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/STZHONGS.TTF b/src/main/assets/Fonts/STZHONGS.TTF
deleted file mode 100644
index 412dfcd..0000000
Binary files a/src/main/assets/Fonts/STZHONGS.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/SegUIVar.ttf b/src/main/assets/Fonts/SegUIVar.ttf
deleted file mode 100644
index dd8c264..0000000
Binary files a/src/main/assets/Fonts/SegUIVar.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/SegoeIcons.ttf b/src/main/assets/Fonts/SegoeIcons.ttf
deleted file mode 100644
index 8f05a4b..0000000
Binary files a/src/main/assets/Fonts/SegoeIcons.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/SitkaVF-Italic.ttf b/src/main/assets/Fonts/SitkaVF-Italic.ttf
deleted file mode 100644
index 28d0c33..0000000
Binary files a/src/main/assets/Fonts/SitkaVF-Italic.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/SitkaVF.ttf b/src/main/assets/Fonts/SitkaVF.ttf
deleted file mode 100644
index 9137264..0000000
Binary files a/src/main/assets/Fonts/SitkaVF.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/StaticCache.dat b/src/main/assets/Fonts/StaticCache.dat
deleted file mode 100644
index 95783a4..0000000
Binary files a/src/main/assets/Fonts/StaticCache.dat and /dev/null differ
diff --git a/src/main/assets/Fonts/TCBI____.TTF b/src/main/assets/Fonts/TCBI____.TTF
deleted file mode 100644
index 6afa5bd..0000000
Binary files a/src/main/assets/Fonts/TCBI____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TCB_____.TTF b/src/main/assets/Fonts/TCB_____.TTF
deleted file mode 100644
index b2494b2..0000000
Binary files a/src/main/assets/Fonts/TCB_____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TCCB____.TTF b/src/main/assets/Fonts/TCCB____.TTF
deleted file mode 100644
index 72ad444..0000000
Binary files a/src/main/assets/Fonts/TCCB____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TCCEB.TTF b/src/main/assets/Fonts/TCCEB.TTF
deleted file mode 100644
index ed3031b..0000000
Binary files a/src/main/assets/Fonts/TCCEB.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TCCM____.TTF b/src/main/assets/Fonts/TCCM____.TTF
deleted file mode 100644
index 67706eb..0000000
Binary files a/src/main/assets/Fonts/TCCM____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TCMI____.TTF b/src/main/assets/Fonts/TCMI____.TTF
deleted file mode 100644
index bd586a2..0000000
Binary files a/src/main/assets/Fonts/TCMI____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TCM_____.TTF b/src/main/assets/Fonts/TCM_____.TTF
deleted file mode 100644
index a4e3547..0000000
Binary files a/src/main/assets/Fonts/TCM_____.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/TEMPSITC.TTF b/src/main/assets/Fonts/TEMPSITC.TTF
deleted file mode 100644
index 63970fe..0000000
Binary files a/src/main/assets/Fonts/TEMPSITC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/VINERITC.TTF b/src/main/assets/Fonts/VINERITC.TTF
deleted file mode 100644
index 5b7ebaa..0000000
Binary files a/src/main/assets/Fonts/VINERITC.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/VIVALDII.TTF b/src/main/assets/Fonts/VIVALDII.TTF
deleted file mode 100644
index 7ea0bbd..0000000
Binary files a/src/main/assets/Fonts/VIVALDII.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/VLADIMIR.TTF b/src/main/assets/Fonts/VLADIMIR.TTF
deleted file mode 100644
index e422401..0000000
Binary files a/src/main/assets/Fonts/VLADIMIR.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/WINGDNG2.TTF b/src/main/assets/Fonts/WINGDNG2.TTF
deleted file mode 100644
index e36d7f6..0000000
Binary files a/src/main/assets/Fonts/WINGDNG2.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/WINGDNG3.TTF b/src/main/assets/Fonts/WINGDNG3.TTF
deleted file mode 100644
index a6f6b32..0000000
Binary files a/src/main/assets/Fonts/WINGDNG3.TTF and /dev/null differ
diff --git a/src/main/assets/Fonts/YuGothB.ttc b/src/main/assets/Fonts/YuGothB.ttc
deleted file mode 100644
index 58cd5f6..0000000
Binary files a/src/main/assets/Fonts/YuGothB.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/YuGothL.ttc b/src/main/assets/Fonts/YuGothL.ttc
deleted file mode 100644
index d930428..0000000
Binary files a/src/main/assets/Fonts/YuGothL.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/YuGothM.ttc b/src/main/assets/Fonts/YuGothM.ttc
deleted file mode 100644
index 6f397ba..0000000
Binary files a/src/main/assets/Fonts/YuGothM.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/YuGothR.ttc b/src/main/assets/Fonts/YuGothR.ttc
deleted file mode 100644
index 65e2f5d..0000000
Binary files a/src/main/assets/Fonts/YuGothR.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/app775.fon b/src/main/assets/Fonts/app775.fon
deleted file mode 100644
index 6d0b8bc..0000000
Binary files a/src/main/assets/Fonts/app775.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app850.fon b/src/main/assets/Fonts/app850.fon
deleted file mode 100644
index a90b30a..0000000
Binary files a/src/main/assets/Fonts/app850.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app852.fon b/src/main/assets/Fonts/app852.fon
deleted file mode 100644
index 448df18..0000000
Binary files a/src/main/assets/Fonts/app852.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app855.fon b/src/main/assets/Fonts/app855.fon
deleted file mode 100644
index d2d392d..0000000
Binary files a/src/main/assets/Fonts/app855.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app857.fon b/src/main/assets/Fonts/app857.fon
deleted file mode 100644
index 2475890..0000000
Binary files a/src/main/assets/Fonts/app857.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app866.fon b/src/main/assets/Fonts/app866.fon
deleted file mode 100644
index 5507e81..0000000
Binary files a/src/main/assets/Fonts/app866.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app932.fon b/src/main/assets/Fonts/app932.fon
deleted file mode 100644
index bd7a9a7..0000000
Binary files a/src/main/assets/Fonts/app932.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app936.fon b/src/main/assets/Fonts/app936.fon
deleted file mode 100644
index 2ba3465..0000000
Binary files a/src/main/assets/Fonts/app936.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app949.fon b/src/main/assets/Fonts/app949.fon
deleted file mode 100644
index 98a74ed..0000000
Binary files a/src/main/assets/Fonts/app949.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/app950.fon b/src/main/assets/Fonts/app950.fon
deleted file mode 100644
index b74742e..0000000
Binary files a/src/main/assets/Fonts/app950.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/arial.ttf b/src/main/assets/Fonts/arial.ttf
deleted file mode 100644
index 8682d94..0000000
Binary files a/src/main/assets/Fonts/arial.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/arialbd.ttf b/src/main/assets/Fonts/arialbd.ttf
deleted file mode 100644
index a6037e6..0000000
Binary files a/src/main/assets/Fonts/arialbd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/arialbi.ttf b/src/main/assets/Fonts/arialbi.ttf
deleted file mode 100644
index 6a1fa0f..0000000
Binary files a/src/main/assets/Fonts/arialbi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ariali.ttf b/src/main/assets/Fonts/ariali.ttf
deleted file mode 100644
index 3801997..0000000
Binary files a/src/main/assets/Fonts/ariali.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ariblk.ttf b/src/main/assets/Fonts/ariblk.ttf
deleted file mode 100644
index e7ae345..0000000
Binary files a/src/main/assets/Fonts/ariblk.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/bahnschrift.ttf b/src/main/assets/Fonts/bahnschrift.ttf
deleted file mode 100644
index 2c121b3..0000000
Binary files a/src/main/assets/Fonts/bahnschrift.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/c8514fix.fon b/src/main/assets/Fonts/c8514fix.fon
deleted file mode 100644
index 901fc5e..0000000
Binary files a/src/main/assets/Fonts/c8514fix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/c8514oem.fon b/src/main/assets/Fonts/c8514oem.fon
deleted file mode 100644
index 832635e..0000000
Binary files a/src/main/assets/Fonts/c8514oem.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/c8514sys.fon b/src/main/assets/Fonts/c8514sys.fon
deleted file mode 100644
index c59ed5c..0000000
Binary files a/src/main/assets/Fonts/c8514sys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/calibri.ttf b/src/main/assets/Fonts/calibri.ttf
deleted file mode 100644
index aac4726..0000000
Binary files a/src/main/assets/Fonts/calibri.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/calibrib.ttf b/src/main/assets/Fonts/calibrib.ttf
deleted file mode 100644
index 326893d..0000000
Binary files a/src/main/assets/Fonts/calibrib.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/calibrii.ttf b/src/main/assets/Fonts/calibrii.ttf
deleted file mode 100644
index 3543c4c..0000000
Binary files a/src/main/assets/Fonts/calibrii.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/calibril.ttf b/src/main/assets/Fonts/calibril.ttf
deleted file mode 100644
index 1ac6669..0000000
Binary files a/src/main/assets/Fonts/calibril.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/calibrili.ttf b/src/main/assets/Fonts/calibrili.ttf
deleted file mode 100644
index fac9ae2..0000000
Binary files a/src/main/assets/Fonts/calibrili.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/calibriz.ttf b/src/main/assets/Fonts/calibriz.ttf
deleted file mode 100644
index 58afcd1..0000000
Binary files a/src/main/assets/Fonts/calibriz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/cambria.ttc b/src/main/assets/Fonts/cambria.ttc
deleted file mode 100644
index b971a3f..0000000
Binary files a/src/main/assets/Fonts/cambria.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/cambriab.ttf b/src/main/assets/Fonts/cambriab.ttf
deleted file mode 100644
index c70283c..0000000
Binary files a/src/main/assets/Fonts/cambriab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/cambriai.ttf b/src/main/assets/Fonts/cambriai.ttf
deleted file mode 100644
index 299dccd..0000000
Binary files a/src/main/assets/Fonts/cambriai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/cambriaz.ttf b/src/main/assets/Fonts/cambriaz.ttf
deleted file mode 100644
index 4912bcb..0000000
Binary files a/src/main/assets/Fonts/cambriaz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40737.fon b/src/main/assets/Fonts/cga40737.fon
deleted file mode 100644
index 500ad7a..0000000
Binary files a/src/main/assets/Fonts/cga40737.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40850.fon b/src/main/assets/Fonts/cga40850.fon
deleted file mode 100644
index 93c1431..0000000
Binary files a/src/main/assets/Fonts/cga40850.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40852.fon b/src/main/assets/Fonts/cga40852.fon
deleted file mode 100644
index c748f5e..0000000
Binary files a/src/main/assets/Fonts/cga40852.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40857.fon b/src/main/assets/Fonts/cga40857.fon
deleted file mode 100644
index 64bb8d6..0000000
Binary files a/src/main/assets/Fonts/cga40857.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40866.fon b/src/main/assets/Fonts/cga40866.fon
deleted file mode 100644
index 329e13c..0000000
Binary files a/src/main/assets/Fonts/cga40866.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40869.fon b/src/main/assets/Fonts/cga40869.fon
deleted file mode 100644
index f6e83b7..0000000
Binary files a/src/main/assets/Fonts/cga40869.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga40woa.fon b/src/main/assets/Fonts/cga40woa.fon
deleted file mode 100644
index 0730273..0000000
Binary files a/src/main/assets/Fonts/cga40woa.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80737.fon b/src/main/assets/Fonts/cga80737.fon
deleted file mode 100644
index 40ece53..0000000
Binary files a/src/main/assets/Fonts/cga80737.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80850.fon b/src/main/assets/Fonts/cga80850.fon
deleted file mode 100644
index 8b78df9..0000000
Binary files a/src/main/assets/Fonts/cga80850.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80852.fon b/src/main/assets/Fonts/cga80852.fon
deleted file mode 100644
index 218e523..0000000
Binary files a/src/main/assets/Fonts/cga80852.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80857.fon b/src/main/assets/Fonts/cga80857.fon
deleted file mode 100644
index a14365f..0000000
Binary files a/src/main/assets/Fonts/cga80857.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80866.fon b/src/main/assets/Fonts/cga80866.fon
deleted file mode 100644
index bba1486..0000000
Binary files a/src/main/assets/Fonts/cga80866.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80869.fon b/src/main/assets/Fonts/cga80869.fon
deleted file mode 100644
index 5b902f4..0000000
Binary files a/src/main/assets/Fonts/cga80869.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cga80woa.fon b/src/main/assets/Fonts/cga80woa.fon
deleted file mode 100644
index bde4fed..0000000
Binary files a/src/main/assets/Fonts/cga80woa.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/comic.ttf b/src/main/assets/Fonts/comic.ttf
deleted file mode 100644
index 2d8e9ca..0000000
Binary files a/src/main/assets/Fonts/comic.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/comicbd.ttf b/src/main/assets/Fonts/comicbd.ttf
deleted file mode 100644
index 59f77d5..0000000
Binary files a/src/main/assets/Fonts/comicbd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/comici.ttf b/src/main/assets/Fonts/comici.ttf
deleted file mode 100644
index 49a4069..0000000
Binary files a/src/main/assets/Fonts/comici.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/comicz.ttf b/src/main/assets/Fonts/comicz.ttf
deleted file mode 100644
index f451961..0000000
Binary files a/src/main/assets/Fonts/comicz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/consola.ttf b/src/main/assets/Fonts/consola.ttf
deleted file mode 100644
index e881ca4..0000000
Binary files a/src/main/assets/Fonts/consola.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/consolab.ttf b/src/main/assets/Fonts/consolab.ttf
deleted file mode 100644
index 77f5d60..0000000
Binary files a/src/main/assets/Fonts/consolab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/consolai.ttf b/src/main/assets/Fonts/consolai.ttf
deleted file mode 100644
index 2de4de8..0000000
Binary files a/src/main/assets/Fonts/consolai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/consolaz.ttf b/src/main/assets/Fonts/consolaz.ttf
deleted file mode 100644
index d9df211..0000000
Binary files a/src/main/assets/Fonts/consolaz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/constan.ttf b/src/main/assets/Fonts/constan.ttf
deleted file mode 100644
index 0ef9d17..0000000
Binary files a/src/main/assets/Fonts/constan.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/constanb.ttf b/src/main/assets/Fonts/constanb.ttf
deleted file mode 100644
index 540b1d7..0000000
Binary files a/src/main/assets/Fonts/constanb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/constani.ttf b/src/main/assets/Fonts/constani.ttf
deleted file mode 100644
index a5aa7ac..0000000
Binary files a/src/main/assets/Fonts/constani.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/constanz.ttf b/src/main/assets/Fonts/constanz.ttf
deleted file mode 100644
index 0b7ea48..0000000
Binary files a/src/main/assets/Fonts/constanz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/corbel.ttf b/src/main/assets/Fonts/corbel.ttf
deleted file mode 100644
index 34fd5aa..0000000
Binary files a/src/main/assets/Fonts/corbel.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/corbelb.ttf b/src/main/assets/Fonts/corbelb.ttf
deleted file mode 100644
index 551afa3..0000000
Binary files a/src/main/assets/Fonts/corbelb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/corbeli.ttf b/src/main/assets/Fonts/corbeli.ttf
deleted file mode 100644
index 91b076b..0000000
Binary files a/src/main/assets/Fonts/corbeli.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/corbell.ttf b/src/main/assets/Fonts/corbell.ttf
deleted file mode 100644
index 501eeef..0000000
Binary files a/src/main/assets/Fonts/corbell.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/corbelli.ttf b/src/main/assets/Fonts/corbelli.ttf
deleted file mode 100644
index 6173fd7..0000000
Binary files a/src/main/assets/Fonts/corbelli.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/corbelz.ttf b/src/main/assets/Fonts/corbelz.ttf
deleted file mode 100644
index 1afab65..0000000
Binary files a/src/main/assets/Fonts/corbelz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/coue1255.fon b/src/main/assets/Fonts/coue1255.fon
deleted file mode 100644
index b2acc62..0000000
Binary files a/src/main/assets/Fonts/coue1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/coue1256.fon b/src/main/assets/Fonts/coue1256.fon
deleted file mode 100644
index 6c6c320..0000000
Binary files a/src/main/assets/Fonts/coue1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/coue1257.fon b/src/main/assets/Fonts/coue1257.fon
deleted file mode 100644
index 5b6360f..0000000
Binary files a/src/main/assets/Fonts/coue1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/couf1255.fon b/src/main/assets/Fonts/couf1255.fon
deleted file mode 100644
index 48779e3..0000000
Binary files a/src/main/assets/Fonts/couf1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/couf1256.fon b/src/main/assets/Fonts/couf1256.fon
deleted file mode 100644
index aab5def..0000000
Binary files a/src/main/assets/Fonts/couf1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/couf1257.fon b/src/main/assets/Fonts/couf1257.fon
deleted file mode 100644
index cdf5797..0000000
Binary files a/src/main/assets/Fonts/couf1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cour.ttf b/src/main/assets/Fonts/cour.ttf
deleted file mode 100644
index 46a0712..0000000
Binary files a/src/main/assets/Fonts/cour.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/courbd.ttf b/src/main/assets/Fonts/courbd.ttf
deleted file mode 100644
index 145b736..0000000
Binary files a/src/main/assets/Fonts/courbd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/courbi.ttf b/src/main/assets/Fonts/courbi.ttf
deleted file mode 100644
index 430fced..0000000
Binary files a/src/main/assets/Fonts/courbi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/coure.fon b/src/main/assets/Fonts/coure.fon
deleted file mode 100644
index 3f7f73f..0000000
Binary files a/src/main/assets/Fonts/coure.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/couree.fon b/src/main/assets/Fonts/couree.fon
deleted file mode 100644
index 4d01550..0000000
Binary files a/src/main/assets/Fonts/couree.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/coureg.fon b/src/main/assets/Fonts/coureg.fon
deleted file mode 100644
index f04bf57..0000000
Binary files a/src/main/assets/Fonts/coureg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/courer.fon b/src/main/assets/Fonts/courer.fon
deleted file mode 100644
index 346887f..0000000
Binary files a/src/main/assets/Fonts/courer.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/couret.fon b/src/main/assets/Fonts/couret.fon
deleted file mode 100644
index 1d50a22..0000000
Binary files a/src/main/assets/Fonts/couret.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/courf.fon b/src/main/assets/Fonts/courf.fon
deleted file mode 100644
index 240efc3..0000000
Binary files a/src/main/assets/Fonts/courf.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/courfe.fon b/src/main/assets/Fonts/courfe.fon
deleted file mode 100644
index 4b79feb..0000000
Binary files a/src/main/assets/Fonts/courfe.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/courfg.fon b/src/main/assets/Fonts/courfg.fon
deleted file mode 100644
index 0674e90..0000000
Binary files a/src/main/assets/Fonts/courfg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/courfr.fon b/src/main/assets/Fonts/courfr.fon
deleted file mode 100644
index 2fc7b4f..0000000
Binary files a/src/main/assets/Fonts/courfr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/courft.fon b/src/main/assets/Fonts/courft.fon
deleted file mode 100644
index 7b9197c..0000000
Binary files a/src/main/assets/Fonts/courft.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/couri.ttf b/src/main/assets/Fonts/couri.ttf
deleted file mode 100644
index 22b73d4..0000000
Binary files a/src/main/assets/Fonts/couri.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/cvgafix.fon b/src/main/assets/Fonts/cvgafix.fon
deleted file mode 100644
index 80f4f08..0000000
Binary files a/src/main/assets/Fonts/cvgafix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/cvgasys.fon b/src/main/assets/Fonts/cvgasys.fon
deleted file mode 100644
index 2a6dd99..0000000
Binary files a/src/main/assets/Fonts/cvgasys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/desktop.ini b/src/main/assets/Fonts/desktop.ini
deleted file mode 100644
index 6233efb..0000000
--- a/src/main/assets/Fonts/desktop.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[.ShellClassInfo]
-CLSID={BD84B380-8CA2-1069-AB1D-08000948F534}
diff --git a/src/main/assets/Fonts/dos737.fon b/src/main/assets/Fonts/dos737.fon
deleted file mode 100644
index 849f393..0000000
Binary files a/src/main/assets/Fonts/dos737.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/dos869.fon b/src/main/assets/Fonts/dos869.fon
deleted file mode 100644
index 59ce964..0000000
Binary files a/src/main/assets/Fonts/dos869.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/dosapp.fon b/src/main/assets/Fonts/dosapp.fon
deleted file mode 100644
index dc457e2..0000000
Binary files a/src/main/assets/Fonts/dosapp.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ebrima.ttf b/src/main/assets/Fonts/ebrima.ttf
deleted file mode 100644
index 26e2145..0000000
Binary files a/src/main/assets/Fonts/ebrima.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ebrimabd.ttf b/src/main/assets/Fonts/ebrimabd.ttf
deleted file mode 100644
index c12efac..0000000
Binary files a/src/main/assets/Fonts/ebrimabd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40737.fon b/src/main/assets/Fonts/ega40737.fon
deleted file mode 100644
index c34d89f..0000000
Binary files a/src/main/assets/Fonts/ega40737.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40850.fon b/src/main/assets/Fonts/ega40850.fon
deleted file mode 100644
index ab171cd..0000000
Binary files a/src/main/assets/Fonts/ega40850.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40852.fon b/src/main/assets/Fonts/ega40852.fon
deleted file mode 100644
index 2492b0d..0000000
Binary files a/src/main/assets/Fonts/ega40852.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40857.fon b/src/main/assets/Fonts/ega40857.fon
deleted file mode 100644
index 374dd84..0000000
Binary files a/src/main/assets/Fonts/ega40857.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40866.fon b/src/main/assets/Fonts/ega40866.fon
deleted file mode 100644
index 54b65e2..0000000
Binary files a/src/main/assets/Fonts/ega40866.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40869.fon b/src/main/assets/Fonts/ega40869.fon
deleted file mode 100644
index c34d89f..0000000
Binary files a/src/main/assets/Fonts/ega40869.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega40woa.fon b/src/main/assets/Fonts/ega40woa.fon
deleted file mode 100644
index 2cca590..0000000
Binary files a/src/main/assets/Fonts/ega40woa.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80737.fon b/src/main/assets/Fonts/ega80737.fon
deleted file mode 100644
index ed7b829..0000000
Binary files a/src/main/assets/Fonts/ega80737.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80850.fon b/src/main/assets/Fonts/ega80850.fon
deleted file mode 100644
index e2b3c2d..0000000
Binary files a/src/main/assets/Fonts/ega80850.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80852.fon b/src/main/assets/Fonts/ega80852.fon
deleted file mode 100644
index 56ba9e4..0000000
Binary files a/src/main/assets/Fonts/ega80852.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80857.fon b/src/main/assets/Fonts/ega80857.fon
deleted file mode 100644
index 000c272..0000000
Binary files a/src/main/assets/Fonts/ega80857.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80866.fon b/src/main/assets/Fonts/ega80866.fon
deleted file mode 100644
index 006bf89..0000000
Binary files a/src/main/assets/Fonts/ega80866.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80869.fon b/src/main/assets/Fonts/ega80869.fon
deleted file mode 100644
index b44268b..0000000
Binary files a/src/main/assets/Fonts/ega80869.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ega80woa.fon b/src/main/assets/Fonts/ega80woa.fon
deleted file mode 100644
index f6c7622..0000000
Binary files a/src/main/assets/Fonts/ega80woa.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/fms_metadata.xml b/src/main/assets/Fonts/fms_metadata.xml
deleted file mode 100644
index 89e7ecd..0000000
--- a/src/main/assets/Fonts/fms_metadata.xml
+++ /dev/null
@@ -1,2391 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MetaFile Type="System" Version="1.0.0.0">
-  <Font Family="Marlett">
-    <Meta Name="Scripts">Zsym;</Meta>
-  </Font>
-  <Font Family="Andalus">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Arab;</Meta>
-    <Meta Name="Vendor">Glyph Systems</Meta>
-  </Font>
-  <Font Family="Arial Unicode MS">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Arab;Hebr;</Meta> 
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Terminal">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Courier">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Fixedsys">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Modern">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS Serif">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS Sans Serif">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Roman">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Script">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Small Fonts">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="System">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Bookshelf Symbol 7">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft Sans Serif">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Hebr;Arab;Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS Outlook">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS Reference Sans Serif">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS Reference Specialty">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Arabic Typesetting">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="HGMaruGothicMPRO">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co., Ltd.</Meta>  
-  </Font>
-  <Font Family="Estrangelo Edessa">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Syrc;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft Uighur">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">ug-Arab;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MV Boli">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thaa;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Sakkal Majalla">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta>
-    <Meta Name="Vendor">Sakkal Design</Meta>
-  </Font>
-  <Font Family="Simplified Arabic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta>
-    <Meta Name="Vendor">Compugraphic Corp.</Meta>
-  </Font>
-  <Font Family="Simplified Arabic Fixed">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta>
-    <Meta Name="Vendor">Compugraphic Corp.</Meta>
-  </Font>
-  <Font Family="Traditional Arabic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta>
-    <Meta Name="Vendor">Compugraphic Corp.</Meta>
-  </Font>
-  <Font Family="Urdu Typesetting"> 
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta> 
-    <Meta Name="Vendor">Microsoft Corporation</Meta> 
-  </Font>
-  <Font Family="Aldhabi"> 
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Arab;</Meta> 
-    <Meta Name="Vendor">Microsoft Corporation</Meta> 
-  </Font>
-  <Font Family="FangSong">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Beijing ZhongYi Electronics Co.</Meta>
-  </Font>
-  <Font Family="KaiTi">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Beijing ZhongYi Electronics Co.</Meta>
-  </Font>
-  <Font Family="Microsoft YaHei">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft YaHei Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft YaHei UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft YaHei UI Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="NSimSun">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Beijing ZhongYi Electronics, Co.</Meta>
-  </Font>
-  <Font Family="SimHei">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Beijing ZhongYi Electronics, Co.</Meta>
-  </Font>
-  <Font Family="SimSun">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Beijing ZhongYi Electronics, Co.</Meta>
-  </Font>
-  <Font Family="SimSun-ExtB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Beijing ZhongYi Electronics, Co.</Meta>
-  </Font>
-  <Font Family="DengXian">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Founder Corporation</Meta>
-  </Font>
-  <Font Family="DFKai-SB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">DynaLab, Inc.</Meta>
-  </Font>
-  <Font Family="Microsoft JhengHei">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft JhengHei Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft JhengHei UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft JhengHei UI Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MingLiU">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">DynaComware Corp.</Meta>
-  </Font>
-  <Font Family="MingLiU-ExtB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">DynaComware Corp.</Meta>
-  </Font>
-  <Font Family="MingLiU_HKSCS">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant-HK;</Meta>
-    <Meta Name="Vendor">DynaComware Corp.</Meta>
-  </Font>
-  <Font Family="MingLiU_HKSCS-ExtB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant-HK;</Meta>
-    <Meta Name="Vendor">DynaComware Corp.</Meta>
-  </Font>
-  <Font Family="PMingLiU">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">DynaComware Corp.</Meta>
-  </Font>
-  <Font Family="PMingLiU-ExtB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hant;</Meta>
-    <Meta Name="Vendor">DynaComware Corp.</Meta>
-  </Font>
-  <Font Family="Arial">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Hebr;Arab;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Calibri">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Hebr;Arab;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Cambria">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Cambria Math">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;Zmth;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Candara">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-    <Font Family="Gadugi">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Cher;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Comic Sans MS">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Consolas">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Constantia">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Corbel">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Courier New">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Hebr;Arab;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Euphemia">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Cans;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks</Meta>
-  </Font>
-  <Font Family="Franklin Gothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Gabriola">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Georgia">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Carter + Cone</Meta>
-  </Font>
-  <Font Family="Impact">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Lao UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Laoo;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Lucida Console">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Lucida Sans Unicode">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Hebr;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Palatino Linotype">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">LINOTYPE-AG</Meta>
-  </Font>
-  <Font Family="Plantagenet Cherokee">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Cher;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks</Meta>
-  </Font>
-  <Font Family="Segoe Print">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe Script">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-<Font Family="Segoe UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-<Font Family="Segoe UI" Style="Normal" Stretch="Normal" Weight="Regular">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Geok;Arab;Hebr;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe UI" Style="Normal" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Geok;Arab;Hebr;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Normal" Stretch="Normal" Weight="Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Geok;Arab;Hebr;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe UI" Style="Normal" Stretch="Normal" Weight="Semilight">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Geok;Arab;Hebr;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Normal" Stretch="Normal" Weight="Semibold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;Geok;Arab;Hebr;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Italic" Stretch="Normal" Weight="Regular">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe UI" Style="Italic" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Italic" Stretch="Normal" Weight="Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe UI" Style="Italic" Stretch="Normal" Weight="Semilight">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Italic" Stretch="Normal" Weight="Semibold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Geor;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Normal" Stretch="Normal" Weight="Black">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-<Font Family="Segoe UI" Style="Italic" Stretch="Normal" Weight="Black">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Lisu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-</Font>
-  <Font Family="Segoe UI Symbol">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;Brai;Dsrt;Copt;Zmth;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe UI Historic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Armi;Brah;Cari;cprt;Egyp;Khar;Lyci;Lydi;Phli;Phnx;Prti;Sarb;Shaw;Syrc;Ugar;Xpeo;Xsux;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe UI Emoji">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Segoe MDL2 Assets">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Symbol">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Tahoma">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Hebr;Arab;Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Times New Roman">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;Hebr;Arab;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Trebuchet MS">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;Armn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Verdana">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Carter + Cone</Meta>
-  </Font>
-  <Font Family="Webdings">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Wingdings">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Aharoni" Style="Normal" Stretch="Normal" Weight="Regular">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="Aharoni" Style="Normal" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="David">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="FrankRuehl">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="Gisha">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Levenim MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Miriam">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="Miriam Fixed">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="Narkisim">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Zvi Narkis</Meta>
-  </Font>
-  <Font Family="Rod">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hebr;</Meta>
-    <Meta Name="Vendor">Kivun Computers Ltd.</Meta>
-  </Font>
-  <Font Family="Aparajita">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Deva;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Gautami">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Telu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Iskoola Pota">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Sinh;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Kalinga">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Orya;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Kartika">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Mlym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Kokila">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Deva;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Latha">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Taml;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Mangal">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Deva;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Sanskrit Text">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Deva;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Raavi">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Guru;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Shonar Bangla">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Beng;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Shruti">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Gujr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Tunga">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Knda;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Utsaah">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Deva;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Vani">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Telu;</Meta>
-    <Meta Name="Vendor">Ascender Corporation</Meta>
-  </Font>
-  <Font Family="Vijaya">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Taml;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Vrinda">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Beng;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Nirmala UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts"> Taml;Beng;Deva;Gujr;Guru;Knda;Mlym;Orya;Sinh;Telu;Olck;Sora;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Nirmala UI" Style="Normal" Stretch="Normal" Weight="Regular">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Taml;Beng;Deva;Gujr;Guru;Knda;Mlym;Orya;Sinh;Telu;Olck;Sora;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Nirmala UI" Style="Normal" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Taml;Beng;Deva;Gujr;Guru;Knda;Mlym;Orya;Sinh;Telu;Olck;Sora;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Nirmala UI" Style="Normal" Stretch="Normal" Weight="Semilight">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Taml;Beng;Deva;Gujr;Guru;Knda;Mlym;Orya;Sinh;Telu;Olck;Sora;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Meiryo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Meiryo UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-    <Font Family="Yu Gothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Jiyukobo Ltd.</Meta>
-  </Font>
-  <Font Family="Yu Gothic Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Jiyukobo Ltd.</Meta>
-  </Font>
-  <Font Family="Yu Gothic UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Jiyukobo Ltd.</Meta>
-  </Font>
-  <Font Family="Yu Mincho">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Jiyukobo Ltd.</Meta>
-  </Font>
-  <Font Family="Yu Mincho Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Jiyukobo Ltd.</Meta>
-  </Font>
-  <Font Family="MS Gothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS Mincho">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS PGothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS PMincho">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MS UI Gothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Batang">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="BatangChe">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="Dotum">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="DotumChe">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="Gulim">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="GulimChe">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="Gungsuh">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="GungsuhChe">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Han Yang I &amp; C Co. Ltd.</Meta>
-  </Font>
-  <Font Family="Javanese Text">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Java;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks</Meta>
-  </Font>
-  <Font Family="Malgun Gothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Ebrima">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Vaii;Nkoo;Tfng;Osma;Ethi;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft Himalaya">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Tibt;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Myanmar Text">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Mymr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta> 
-  </Font>
-  <Font Family="Microsoft New Tai Lue">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Talu;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft PhagsPa">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Phag;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft Tai Le">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Tale;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Microsoft Yi Baiti">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Yiii;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Mongolian Baiti">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Mong;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Nyala">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Ethi;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks</Meta>
-  </Font>
-  <Font Family="Sylfaen">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Grek;Cyrl;Armn;Geor;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks</Meta>
-  </Font>
-  <Font Family="Angsana New">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="AngsanaUPC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Browallia New">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="BrowalliaUPC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Cordia New">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="CordiaUPC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="DaunPenh">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Khmr;</Meta>
-    <Meta Name="Vendor">OM Mony</Meta>
-  </Font>
-  <Font Family="DilleniaUPC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="DokChampa">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Laoo;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="EucrosiaUPC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="FreesiaUPC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="IrisUPC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="JasmineUPC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Khmer UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Khmr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="KodchiangUPC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Leelawadee">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Leelawadee UI">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;Laoo;Bugi;Khmr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Leelawadee UI" Style="Normal" Stretch="Normal" Weight="Regular">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;Laoo;Bugi;Khmr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Leelawadee UI" Style="Normal" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;Laoo;Bugi;Khmr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Leelawadee UI" Style="Normal" Stretch="Normal" Weight="Semilight">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Thai;Laoo;Bugi;Khmr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="LilyUPC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Thai;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="MoolBoran">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Khmr;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="FZShuTi">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Founder Corporation</Meta>
-  </Font>
-  <Font Family="FZYaoTi">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Founder Corporation</Meta>
-  </Font>
-  <Font Family="LiSu">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Stone Co., Beijing</Meta>
-  </Font>
-  <Font Family="STCaiyun">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STFangsong">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STHupo">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STKaiti">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STLiti">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd</Meta>
-  </Font>
-  <Font Family="STSong">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STXihei">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STXingkai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STXinwei">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="STZhongsong">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Changzhou SinoType Technology Co., Ltd.</Meta>
-  </Font>
-  <Font Family="YouYuan">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Hans;</Meta>
-    <Meta Name="Vendor">Stone Co., Beijing</Meta>
-  </Font>
-  <Font Family="HGGothicE">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGGothicM">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGGyoshotai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGKyokashotai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGMinchoB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGMinchoE">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPGothicE">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPGothicM">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPGyoshotai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPKyokashotai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPMinchoB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPMinchoE">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPSoeiKakugothicUB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPSoeiKakupoptai">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGPSoeiPresenceEB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSeikaishotaiPRO">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSGothicE">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSGothicM">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSGyoshotai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSKyokashotai">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSMinchoB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSMinchoE">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSoeiKakugothicUB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSoeiKakupoptai">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSoeiPresenceEB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSSoeiKakugothicUB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSSoeiKakupoptai">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="HGSSoeiPresenceEB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Jpan;</Meta>
-    <Meta Name="Vendor">RICOH Co.,Ltd.</Meta>
-  </Font>
-  <Font Family="OCRB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Ami R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Expo M">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Headline R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="HYGothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYGothic-Extra">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="HYGraphic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="HYGungSo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="HYHeadLine">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="HYMyeongJo-Extra">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="HYPMokGak">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYPost">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYShortSamul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSinMyeongJo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="Magic R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="MoeumT R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="New Gulim">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang System Co., LTD.</Meta>
-  </Font>
-  <Font Family="Pyunji R">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Yet R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HUMAN COMPUTERS, INC.</Meta>
-  </Font>
-  <Font Family="Ahn B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Ahn L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Ahn M">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Batang Old Koreul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="Big Round R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Big Sans R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Dotum Old Koreul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="Expo B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Expo L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Garam B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic Newsletter">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic Round B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic Round L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic Round R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic Round XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gothic XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Graphic B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Graphic New R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Graphic R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Graphic Sans B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Graphic Sans R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Gungsuh Old Koreul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="Gungsuh R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Headline Sans R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="HYBackSong">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYBudle">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYHaeSo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYKHeadLine">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYKHeadLine" Style="Normal" Stretch="Normal" Weight="Normal">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYLongSamul">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYLongSamul" Style="Normal" Stretch="Normal" Weight="Light">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYLongSamul" Style="Normal" Stretch="Normal" Weight="Normal">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYMokGak">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYMokPan">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYMyeongJo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYMyeongJo" Weight="Extra Bold">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYPillGi">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYPMokPan">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYRGothic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSeNse">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSinGraphic">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSinMun-MyeongJo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSinMyeongJo-Medium-HanjaA">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSinMyeongJo-Medium-HanjaB">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSinMyeongJo-Medium-HanjaC">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSooN-MyeongJo">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolA">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolB">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolC">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolD">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolE">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolF">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolG">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYSymbolH">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYTaJa">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYTaJa" Style="Normal" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYTaJaFull">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYTaJaFull" Style="Normal" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYTeBack">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYYeaSo">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYYeasoL">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="HYYeatGul">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="Jasu B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Jasu L">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Jasu R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Jasu XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Meorimyungjo B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Meorimyungjo XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Modak R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="MoeumT B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="MoeumT L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="MoeumT XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Myungjo B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Myungjo L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Myungjo Newsletter">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Myungjo R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Myungjo SK B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Myungjo XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Namu B">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Namu L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Namu R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Namu XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="New Batang">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc. </Meta>
-  </Font>
-  <Font Family="New Dotum">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="New Gungsuh">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="NewGulim Old Koreul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="NewGulim Old Hangul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="Batang Old Hangul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="Dotum Old Hangul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="Gungsuh Old Hangul">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">HanYang Systems Inc.</Meta>
-  </Font>
-  <Font Family="Pam B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Pam L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Pam M">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Pam New B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Pam New L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Pam New M">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Panhwa R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Saenaegi B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Saenaegi L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Saenaegi R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Saenaegi XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Sam B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Sam L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Sam M">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Sam New B">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Sam New L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Sam New M">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Soha R">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Woorin R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Yeopseo R">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Yet Sans  XB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Yet Sans B">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Yet Sans L">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Yet Sans R">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Kore;</Meta>
-    <Meta Name="Vendor">Human Computers, Inc.</Meta>
-  </Font>
-  <Font Family="Agency FB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Algerian">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Arial Rounded MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Ltd.</Meta>
-  </Font>
-  <Font Family="Baskerville Old Face">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Stephenson Blake</Meta>
-  </Font>
-  <Font Family="Bauhaus 93">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW++</Meta>
-  </Font>
-  <Font Family="Bell MT">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Berlin Sans FB">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Bernard MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Blackadder ITC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Bodoni MT">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Agfa Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Bodoni MT Poster">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Agfa Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Book Antiqua">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Inc.</Meta>
-  </Font>
-  <Font Family="Bookman Old Style">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Inc.</Meta>
-  </Font>
-  <Font Family="Bradley Hand ITC">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Britannic">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Stephenson Blake</Meta>
-  </Font>
-  <Font Family="Broadway">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW++</Meta>
-  </Font>
-  <Font Family="Brush Script MT">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Californian FB">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Calisto MT">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Castellar">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Centaur">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Century">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Agfa Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Century Gothic">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Inc.</Meta>
-  </Font>
-  <Font Family="Century Schoolbook">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Inc.</Meta>
-  </Font>
-  <Font Family="Chiller">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Esselte Corporation</Meta>
-  </Font>
-  <Font Family="Colonna MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Cooper">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW++</Meta>
-  </Font>
-  <Font Family="Copperplate Gothic">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW++</Meta>
-  </Font>
-  <Font Family="Curlz MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Edwardian Script ITC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Elephant">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Carter + Cone</Meta>
-  </Font>
-  <Font Family="Engravers MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Eras ITC">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Eras ITC" Style="Normal" Stretch="Normal" Weight="Medium">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Eras ITC" Style="Italic" Stretch="Normal" Weight="Bold">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Felix Titling">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Footlight MT">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Forte">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Agfa Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Franklin Gothic Book">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Freestyle Script">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="French Script MT">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Garamond">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Inc.</Meta>
-  </Font>
-  <Font Family="Gigi">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Gill Sans">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Gill Sans MT">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Gloucester MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Goudy Old Style">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Goudy Stout">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Haettenschweiler">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Harlow Solid">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Harrington">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="High Tower Text">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Imprint MT Shadow">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Informal Roman">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Esselte Corporation</Meta>
-  </Font>
-  <Font Family="Jokerman">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Juice ITC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Kristen ITC">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Kunstler Script">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Lucida Bright">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Lucida Calligraphy">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Lucida Fax">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Lucida Handwriting">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Lucida Sans">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Lucida Sans Typewriter">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Bigelow &amp; Holmes</Meta>
-  </Font>
-  <Font Family="Magneto">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Maiandra GD">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Galápagos Design Group</Meta>
-  </Font>
-  <Font Family="Matura MT Script Capitals">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Mistral">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Modern No. 20">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Monotype Corsiva">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography, Inc.</Meta>
-  </Font>
-  <Font Family="Niagara Engraved">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Niagara Solid">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="OCR A">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Old English Text MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Onyx">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Palace Script MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Papyrus">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Parchment">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Perpetua">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Perpetua Titling MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Playbill">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Poor Richard">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Pristina">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Rage">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Ravie">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Rockwell">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Typography</Meta>
-  </Font>
-  <Font Family="Script MT">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Showcard Gothic">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">The Font Bureau, Inc.</Meta>
-  </Font>
-  <Font Family="Snap ITC">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Stencil">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW++</Meta>
-  </Font>
-  <Font Family="Tempus Sans ITC">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Tw Cen MT">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Monotype Corporation</Meta>
-  </Font>
-  <Font Family="Viner Hand ITC">
-    <Meta Name="Category">2</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">International Typeface Corporation</Meta>
-  </Font>
-  <Font Family="Vivaldi">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Vladimir Script">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">URW</Meta>
-  </Font>
-  <Font Family="Latin">
-    <Meta Name="Category">1</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Wingdings 2">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Wingdings 3">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="DejaVu Sans">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Bitstream, Inc.</Meta>
-  </Font>
-  <Font Family="DejaVu Sans Mono">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Bitstream, Inc.</Meta>
-  </Font>
-  <Font Family="DejaVu Serif">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Bitstream, Inc.</Meta>
-  </Font>
-  <Font Family="OpenSymbol">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Bitstream, Inc.</Meta>
-  </Font>
-  <Font Family="SWGamekeys MT Regular">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">The Monotype Corporation</Meta>
-  </Font>
-  <Font Family="SWMacro Regular">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-  <Font Family="Sitka Banner">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks Ltd. and Carter + Cone</Meta>
-  </Font>
-  <Font Family="Sitka Display">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks Ltd. and Carter + Cone</Meta>
-  </Font>
-  <Font Family="Sitka Heading">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks Ltd. and Carter + Cone</Meta>
-  </Font>
-  <Font Family="Sitka Subheading">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks Ltd. and Carter + Cone</Meta>
-  </Font>
-  <Font Family="Sitka Small">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks Ltd. and Carter + Cone</Meta>
-  </Font>
-  <Font Family="Sitka Text">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Tiro Typeworks Ltd. and Carter + Cone</Meta>
-  </Font>
-  <Font Family="Arial Nova">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Monotype Imaging Inc.</Meta>
-  </Font>
-  <Font Family="Georgia Pro">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Monotype Imaging Inc.</Meta>
-  </Font>
-  <Font Family="Gill Sans Nova">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Monotype Imaging Inc.</Meta>
-  </Font>
-  <Font Family="Neue Haas Grotesk">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;</Meta>
-    <Meta Name="Vendor">Linotype GmbH</Meta>
-  </Font>
-  <Font Family="Rockwell Nova">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Monotype Imaging Inc.</Meta>
-  </Font>
-  <Font Family="Verdana Pro">
-    <Meta Name="Category">0</Meta>
-    <Meta Name="Scripts">Latn;Grek;Cyrl;</Meta>
-    <Meta Name="Vendor">Monotype Imaging Inc.</Meta>
-  </Font>
-  <Font Family="HoloLens MDL2 Assets">
-    <Meta Name="Category">3</Meta>
-    <Meta Name="Scripts">Zsym;</Meta>
-    <Meta Name="Vendor">Microsoft Corporation</Meta>
-  </Font>
-</MetaFile>
\ No newline at end of file
diff --git a/src/main/assets/Fonts/framd.ttf b/src/main/assets/Fonts/framd.ttf
deleted file mode 100644
index ca7e2ae..0000000
Binary files a/src/main/assets/Fonts/framd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/framdit.ttf b/src/main/assets/Fonts/framdit.ttf
deleted file mode 100644
index 44993d7..0000000
Binary files a/src/main/assets/Fonts/framdit.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/gadugi.ttf b/src/main/assets/Fonts/gadugi.ttf
deleted file mode 100644
index cd0c85b..0000000
Binary files a/src/main/assets/Fonts/gadugi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/gadugib.ttf b/src/main/assets/Fonts/gadugib.ttf
deleted file mode 100644
index 3361b93..0000000
Binary files a/src/main/assets/Fonts/gadugib.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/georgia.ttf b/src/main/assets/Fonts/georgia.ttf
deleted file mode 100644
index 43672d8..0000000
Binary files a/src/main/assets/Fonts/georgia.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/georgiab.ttf b/src/main/assets/Fonts/georgiab.ttf
deleted file mode 100644
index f460970..0000000
Binary files a/src/main/assets/Fonts/georgiab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/georgiai.ttf b/src/main/assets/Fonts/georgiai.ttf
deleted file mode 100644
index c9f60e7..0000000
Binary files a/src/main/assets/Fonts/georgiai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/georgiaz.ttf b/src/main/assets/Fonts/georgiaz.ttf
deleted file mode 100644
index 124d291..0000000
Binary files a/src/main/assets/Fonts/georgiaz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/h8514fix.fon b/src/main/assets/Fonts/h8514fix.fon
deleted file mode 100644
index 5f0d666..0000000
Binary files a/src/main/assets/Fonts/h8514fix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/h8514oem.fon b/src/main/assets/Fonts/h8514oem.fon
deleted file mode 100644
index 3885938..0000000
Binary files a/src/main/assets/Fonts/h8514oem.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/h8514sys.fon b/src/main/assets/Fonts/h8514sys.fon
deleted file mode 100644
index 93bb05d..0000000
Binary files a/src/main/assets/Fonts/h8514sys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/himalaya.ttf b/src/main/assets/Fonts/himalaya.ttf
deleted file mode 100644
index 7d687a1..0000000
Binary files a/src/main/assets/Fonts/himalaya.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/holomdl2.ttf b/src/main/assets/Fonts/holomdl2.ttf
deleted file mode 100644
index 8a28958..0000000
Binary files a/src/main/assets/Fonts/holomdl2.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/hvgafix.fon b/src/main/assets/Fonts/hvgafix.fon
deleted file mode 100644
index 227855e..0000000
Binary files a/src/main/assets/Fonts/hvgafix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/hvgasys.fon b/src/main/assets/Fonts/hvgasys.fon
deleted file mode 100644
index 2c72326..0000000
Binary files a/src/main/assets/Fonts/hvgasys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/impact.ttf b/src/main/assets/Fonts/impact.ttf
deleted file mode 100644
index 2675688..0000000
Binary files a/src/main/assets/Fonts/impact.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/iqiyi_logov8.ttf b/src/main/assets/Fonts/iqiyi_logov8.ttf
deleted file mode 100644
index bdcbe00..0000000
Binary files a/src/main/assets/Fonts/iqiyi_logov8.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/j8514fix.fon b/src/main/assets/Fonts/j8514fix.fon
deleted file mode 100644
index ab64370..0000000
Binary files a/src/main/assets/Fonts/j8514fix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/j8514oem.fon b/src/main/assets/Fonts/j8514oem.fon
deleted file mode 100644
index 3a9e4d4..0000000
Binary files a/src/main/assets/Fonts/j8514oem.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/j8514sys.fon b/src/main/assets/Fonts/j8514sys.fon
deleted file mode 100644
index f0bfa49..0000000
Binary files a/src/main/assets/Fonts/j8514sys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/javatext.ttf b/src/main/assets/Fonts/javatext.ttf
deleted file mode 100644
index cd51dd8..0000000
Binary files a/src/main/assets/Fonts/javatext.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/jsmalle.fon b/src/main/assets/Fonts/jsmalle.fon
deleted file mode 100644
index 3f56db7..0000000
Binary files a/src/main/assets/Fonts/jsmalle.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/jsmallf.fon b/src/main/assets/Fonts/jsmallf.fon
deleted file mode 100644
index 6f01451..0000000
Binary files a/src/main/assets/Fonts/jsmallf.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/jvgafix.fon b/src/main/assets/Fonts/jvgafix.fon
deleted file mode 100644
index 16d50de..0000000
Binary files a/src/main/assets/Fonts/jvgafix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/jvgasys.fon b/src/main/assets/Fonts/jvgasys.fon
deleted file mode 100644
index 1c7ce4b..0000000
Binary files a/src/main/assets/Fonts/jvgasys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/l_10646.ttf b/src/main/assets/Fonts/l_10646.ttf
deleted file mode 100644
index afb1c60..0000000
Binary files a/src/main/assets/Fonts/l_10646.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/lucon.ttf b/src/main/assets/Fonts/lucon.ttf
deleted file mode 100644
index db9fb00..0000000
Binary files a/src/main/assets/Fonts/lucon.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/malgun.ttf b/src/main/assets/Fonts/malgun.ttf
deleted file mode 100644
index f6d5902..0000000
Binary files a/src/main/assets/Fonts/malgun.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/malgunbd.ttf b/src/main/assets/Fonts/malgunbd.ttf
deleted file mode 100644
index 047cded..0000000
Binary files a/src/main/assets/Fonts/malgunbd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/malgunsl.ttf b/src/main/assets/Fonts/malgunsl.ttf
deleted file mode 100644
index b88df0a..0000000
Binary files a/src/main/assets/Fonts/malgunsl.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/marlett.ttf b/src/main/assets/Fonts/marlett.ttf
deleted file mode 100644
index bd326d5..0000000
Binary files a/src/main/assets/Fonts/marlett.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/micross.ttf b/src/main/assets/Fonts/micross.ttf
deleted file mode 100644
index 250ae5c..0000000
Binary files a/src/main/assets/Fonts/micross.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/mingliub.ttc b/src/main/assets/Fonts/mingliub.ttc
deleted file mode 100644
index 7bc1324..0000000
Binary files a/src/main/assets/Fonts/mingliub.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/mmrtext.ttf b/src/main/assets/Fonts/mmrtext.ttf
deleted file mode 100644
index 6648086..0000000
Binary files a/src/main/assets/Fonts/mmrtext.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/mmrtextb.ttf b/src/main/assets/Fonts/mmrtextb.ttf
deleted file mode 100644
index e45e92a..0000000
Binary files a/src/main/assets/Fonts/mmrtextb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/modern.fon b/src/main/assets/Fonts/modern.fon
deleted file mode 100644
index 440cbd7..0000000
Binary files a/src/main/assets/Fonts/modern.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/monbaiti.ttf b/src/main/assets/Fonts/monbaiti.ttf
deleted file mode 100644
index 96a59f7..0000000
Binary files a/src/main/assets/Fonts/monbaiti.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/msgothic.ttc b/src/main/assets/Fonts/msgothic.ttc
deleted file mode 100644
index 7bfcdf7..0000000
Binary files a/src/main/assets/Fonts/msgothic.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msjh.ttc b/src/main/assets/Fonts/msjh.ttc
deleted file mode 100644
index ee31089..0000000
Binary files a/src/main/assets/Fonts/msjh.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msjhbd.ttc b/src/main/assets/Fonts/msjhbd.ttc
deleted file mode 100644
index 03caafb..0000000
Binary files a/src/main/assets/Fonts/msjhbd.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msjhl.ttc b/src/main/assets/Fonts/msjhl.ttc
deleted file mode 100644
index fc31ca2..0000000
Binary files a/src/main/assets/Fonts/msjhl.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msyh.ttc b/src/main/assets/Fonts/msyh.ttc
deleted file mode 100644
index 37c28de..0000000
Binary files a/src/main/assets/Fonts/msyh.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msyhbd.ttc b/src/main/assets/Fonts/msyhbd.ttc
deleted file mode 100644
index 7949a5f..0000000
Binary files a/src/main/assets/Fonts/msyhbd.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msyhl.ttc b/src/main/assets/Fonts/msyhl.ttc
deleted file mode 100644
index 448e2ed..0000000
Binary files a/src/main/assets/Fonts/msyhl.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/msyi.ttf b/src/main/assets/Fonts/msyi.ttf
deleted file mode 100644
index b3f22ee..0000000
Binary files a/src/main/assets/Fonts/msyi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/mvboli.ttf b/src/main/assets/Fonts/mvboli.ttf
deleted file mode 100644
index ab87475..0000000
Binary files a/src/main/assets/Fonts/mvboli.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ntailu.ttf b/src/main/assets/Fonts/ntailu.ttf
deleted file mode 100644
index f4a1c07..0000000
Binary files a/src/main/assets/Fonts/ntailu.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/ntailub.ttf b/src/main/assets/Fonts/ntailub.ttf
deleted file mode 100644
index 8ad63a9..0000000
Binary files a/src/main/assets/Fonts/ntailub.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/pala.ttf b/src/main/assets/Fonts/pala.ttf
deleted file mode 100644
index 47e58ee..0000000
Binary files a/src/main/assets/Fonts/pala.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/palab.ttf b/src/main/assets/Fonts/palab.ttf
deleted file mode 100644
index 6e04caf..0000000
Binary files a/src/main/assets/Fonts/palab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/palabi.ttf b/src/main/assets/Fonts/palabi.ttf
deleted file mode 100644
index 5fe062f..0000000
Binary files a/src/main/assets/Fonts/palabi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/palai.ttf b/src/main/assets/Fonts/palai.ttf
deleted file mode 100644
index e987550..0000000
Binary files a/src/main/assets/Fonts/palai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/phagspa.ttf b/src/main/assets/Fonts/phagspa.ttf
deleted file mode 100644
index 3304342..0000000
Binary files a/src/main/assets/Fonts/phagspa.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/phagspab.ttf b/src/main/assets/Fonts/phagspab.ttf
deleted file mode 100644
index 173e997..0000000
Binary files a/src/main/assets/Fonts/phagspab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/roman.fon b/src/main/assets/Fonts/roman.fon
deleted file mode 100644
index cafc0a5..0000000
Binary files a/src/main/assets/Fonts/roman.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/s8514fix.fon b/src/main/assets/Fonts/s8514fix.fon
deleted file mode 100644
index e218092..0000000
Binary files a/src/main/assets/Fonts/s8514fix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/s8514oem.fon b/src/main/assets/Fonts/s8514oem.fon
deleted file mode 100644
index 2731e2d..0000000
Binary files a/src/main/assets/Fonts/s8514oem.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/s8514sys.fon b/src/main/assets/Fonts/s8514sys.fon
deleted file mode 100644
index 9eae046..0000000
Binary files a/src/main/assets/Fonts/s8514sys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/script.fon b/src/main/assets/Fonts/script.fon
deleted file mode 100644
index e491c51..0000000
Binary files a/src/main/assets/Fonts/script.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/segmdl2.ttf b/src/main/assets/Fonts/segmdl2.ttf
deleted file mode 100644
index 066f108..0000000
Binary files a/src/main/assets/Fonts/segmdl2.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoepr.ttf b/src/main/assets/Fonts/segoepr.ttf
deleted file mode 100644
index f72ba5c..0000000
Binary files a/src/main/assets/Fonts/segoepr.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeprb.ttf b/src/main/assets/Fonts/segoeprb.ttf
deleted file mode 100644
index 8111e18..0000000
Binary files a/src/main/assets/Fonts/segoeprb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoesc.ttf b/src/main/assets/Fonts/segoesc.ttf
deleted file mode 100644
index 6511a43..0000000
Binary files a/src/main/assets/Fonts/segoesc.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoescb.ttf b/src/main/assets/Fonts/segoescb.ttf
deleted file mode 100644
index 8240a7e..0000000
Binary files a/src/main/assets/Fonts/segoescb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeui.ttf b/src/main/assets/Fonts/segoeui.ttf
deleted file mode 100644
index 0f52cbd..0000000
Binary files a/src/main/assets/Fonts/segoeui.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeuib.ttf b/src/main/assets/Fonts/segoeuib.ttf
deleted file mode 100644
index ff196d6..0000000
Binary files a/src/main/assets/Fonts/segoeuib.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeuii.ttf b/src/main/assets/Fonts/segoeuii.ttf
deleted file mode 100644
index 5dd3c32..0000000
Binary files a/src/main/assets/Fonts/segoeuii.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeuil.ttf b/src/main/assets/Fonts/segoeuil.ttf
deleted file mode 100644
index 23fb04d..0000000
Binary files a/src/main/assets/Fonts/segoeuil.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeuisl.ttf b/src/main/assets/Fonts/segoeuisl.ttf
deleted file mode 100644
index a276476..0000000
Binary files a/src/main/assets/Fonts/segoeuisl.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/segoeuiz.ttf b/src/main/assets/Fonts/segoeuiz.ttf
deleted file mode 100644
index c393040..0000000
Binary files a/src/main/assets/Fonts/segoeuiz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguibl.ttf b/src/main/assets/Fonts/seguibl.ttf
deleted file mode 100644
index b296657..0000000
Binary files a/src/main/assets/Fonts/seguibl.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguibli.ttf b/src/main/assets/Fonts/seguibli.ttf
deleted file mode 100644
index d38c82c..0000000
Binary files a/src/main/assets/Fonts/seguibli.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguiemj.ttf b/src/main/assets/Fonts/seguiemj.ttf
deleted file mode 100644
index 3c6485d..0000000
Binary files a/src/main/assets/Fonts/seguiemj.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguihis.ttf b/src/main/assets/Fonts/seguihis.ttf
deleted file mode 100644
index b09deca..0000000
Binary files a/src/main/assets/Fonts/seguihis.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguili.ttf b/src/main/assets/Fonts/seguili.ttf
deleted file mode 100644
index 73bfedd..0000000
Binary files a/src/main/assets/Fonts/seguili.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguisb.ttf b/src/main/assets/Fonts/seguisb.ttf
deleted file mode 100644
index 90b39f7..0000000
Binary files a/src/main/assets/Fonts/seguisb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguisbi.ttf b/src/main/assets/Fonts/seguisbi.ttf
deleted file mode 100644
index 4d57335..0000000
Binary files a/src/main/assets/Fonts/seguisbi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguisli.ttf b/src/main/assets/Fonts/seguisli.ttf
deleted file mode 100644
index dbd8664..0000000
Binary files a/src/main/assets/Fonts/seguisli.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/seguisym.ttf b/src/main/assets/Fonts/seguisym.ttf
deleted file mode 100644
index d987ce5..0000000
Binary files a/src/main/assets/Fonts/seguisym.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/sere1255.fon b/src/main/assets/Fonts/sere1255.fon
deleted file mode 100644
index 4fb91aa..0000000
Binary files a/src/main/assets/Fonts/sere1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sere1256.fon b/src/main/assets/Fonts/sere1256.fon
deleted file mode 100644
index 20f0813..0000000
Binary files a/src/main/assets/Fonts/sere1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sere1257.fon b/src/main/assets/Fonts/sere1257.fon
deleted file mode 100644
index b3afbe0..0000000
Binary files a/src/main/assets/Fonts/sere1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serf1255.fon b/src/main/assets/Fonts/serf1255.fon
deleted file mode 100644
index 82c405a..0000000
Binary files a/src/main/assets/Fonts/serf1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serf1256.fon b/src/main/assets/Fonts/serf1256.fon
deleted file mode 100644
index cc612a6..0000000
Binary files a/src/main/assets/Fonts/serf1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serf1257.fon b/src/main/assets/Fonts/serf1257.fon
deleted file mode 100644
index d1ae3d9..0000000
Binary files a/src/main/assets/Fonts/serf1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serife.fon b/src/main/assets/Fonts/serife.fon
deleted file mode 100644
index 10eb985..0000000
Binary files a/src/main/assets/Fonts/serife.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serifee.fon b/src/main/assets/Fonts/serifee.fon
deleted file mode 100644
index 72b644a..0000000
Binary files a/src/main/assets/Fonts/serifee.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serifeg.fon b/src/main/assets/Fonts/serifeg.fon
deleted file mode 100644
index 846dfdd..0000000
Binary files a/src/main/assets/Fonts/serifeg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serifer.fon b/src/main/assets/Fonts/serifer.fon
deleted file mode 100644
index 9784414..0000000
Binary files a/src/main/assets/Fonts/serifer.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serifet.fon b/src/main/assets/Fonts/serifet.fon
deleted file mode 100644
index 84842d8..0000000
Binary files a/src/main/assets/Fonts/serifet.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/seriff.fon b/src/main/assets/Fonts/seriff.fon
deleted file mode 100644
index 8ccc309..0000000
Binary files a/src/main/assets/Fonts/seriff.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/seriffe.fon b/src/main/assets/Fonts/seriffe.fon
deleted file mode 100644
index f703f24..0000000
Binary files a/src/main/assets/Fonts/seriffe.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/seriffg.fon b/src/main/assets/Fonts/seriffg.fon
deleted file mode 100644
index 5249eb0..0000000
Binary files a/src/main/assets/Fonts/seriffg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/seriffr.fon b/src/main/assets/Fonts/seriffr.fon
deleted file mode 100644
index 32962af..0000000
Binary files a/src/main/assets/Fonts/seriffr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/serifft.fon b/src/main/assets/Fonts/serifft.fon
deleted file mode 100644
index cdb552c..0000000
Binary files a/src/main/assets/Fonts/serifft.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/simfang.ttf b/src/main/assets/Fonts/simfang.ttf
deleted file mode 100644
index 68334e2..0000000
Binary files a/src/main/assets/Fonts/simfang.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/simhei.ttf b/src/main/assets/Fonts/simhei.ttf
deleted file mode 100644
index 5bd4687..0000000
Binary files a/src/main/assets/Fonts/simhei.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/simkai.ttf b/src/main/assets/Fonts/simkai.ttf
deleted file mode 100644
index d7c3b90..0000000
Binary files a/src/main/assets/Fonts/simkai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/simsun.ttc b/src/main/assets/Fonts/simsun.ttc
deleted file mode 100644
index e360db7..0000000
Binary files a/src/main/assets/Fonts/simsun.ttc and /dev/null differ
diff --git a/src/main/assets/Fonts/simsunb.ttf b/src/main/assets/Fonts/simsunb.ttf
deleted file mode 100644
index 82161c8..0000000
Binary files a/src/main/assets/Fonts/simsunb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/smae1255.fon b/src/main/assets/Fonts/smae1255.fon
deleted file mode 100644
index 02537e6..0000000
Binary files a/src/main/assets/Fonts/smae1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smae1256.fon b/src/main/assets/Fonts/smae1256.fon
deleted file mode 100644
index f9ca6c0..0000000
Binary files a/src/main/assets/Fonts/smae1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smae1257.fon b/src/main/assets/Fonts/smae1257.fon
deleted file mode 100644
index 5dbb01d..0000000
Binary files a/src/main/assets/Fonts/smae1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smaf1255.fon b/src/main/assets/Fonts/smaf1255.fon
deleted file mode 100644
index d723cdb..0000000
Binary files a/src/main/assets/Fonts/smaf1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smaf1256.fon b/src/main/assets/Fonts/smaf1256.fon
deleted file mode 100644
index 4481d23..0000000
Binary files a/src/main/assets/Fonts/smaf1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smaf1257.fon b/src/main/assets/Fonts/smaf1257.fon
deleted file mode 100644
index f1c46a8..0000000
Binary files a/src/main/assets/Fonts/smaf1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smalle.fon b/src/main/assets/Fonts/smalle.fon
deleted file mode 100644
index 82182a4..0000000
Binary files a/src/main/assets/Fonts/smalle.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallee.fon b/src/main/assets/Fonts/smallee.fon
deleted file mode 100644
index 0b97d3c..0000000
Binary files a/src/main/assets/Fonts/smallee.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smalleg.fon b/src/main/assets/Fonts/smalleg.fon
deleted file mode 100644
index 26fdb24..0000000
Binary files a/src/main/assets/Fonts/smalleg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smaller.fon b/src/main/assets/Fonts/smaller.fon
deleted file mode 100644
index f8ae2dd..0000000
Binary files a/src/main/assets/Fonts/smaller.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallet.fon b/src/main/assets/Fonts/smallet.fon
deleted file mode 100644
index 16a5c28..0000000
Binary files a/src/main/assets/Fonts/smallet.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallf.fon b/src/main/assets/Fonts/smallf.fon
deleted file mode 100644
index f72feb9..0000000
Binary files a/src/main/assets/Fonts/smallf.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallfe.fon b/src/main/assets/Fonts/smallfe.fon
deleted file mode 100644
index e2a6e9e..0000000
Binary files a/src/main/assets/Fonts/smallfe.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallfg.fon b/src/main/assets/Fonts/smallfg.fon
deleted file mode 100644
index a85759f..0000000
Binary files a/src/main/assets/Fonts/smallfg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallfr.fon b/src/main/assets/Fonts/smallfr.fon
deleted file mode 100644
index 07cd832..0000000
Binary files a/src/main/assets/Fonts/smallfr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/smallft.fon b/src/main/assets/Fonts/smallft.fon
deleted file mode 100644
index 4fddd52..0000000
Binary files a/src/main/assets/Fonts/smallft.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssee1255.fon b/src/main/assets/Fonts/ssee1255.fon
deleted file mode 100644
index 47b8d4f..0000000
Binary files a/src/main/assets/Fonts/ssee1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssee1256.fon b/src/main/assets/Fonts/ssee1256.fon
deleted file mode 100644
index 95b0e77..0000000
Binary files a/src/main/assets/Fonts/ssee1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssee1257.fon b/src/main/assets/Fonts/ssee1257.fon
deleted file mode 100644
index 32287c1..0000000
Binary files a/src/main/assets/Fonts/ssee1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssee874.fon b/src/main/assets/Fonts/ssee874.fon
deleted file mode 100644
index d11ebfd..0000000
Binary files a/src/main/assets/Fonts/ssee874.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssef1255.fon b/src/main/assets/Fonts/ssef1255.fon
deleted file mode 100644
index bb7bd58..0000000
Binary files a/src/main/assets/Fonts/ssef1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssef1256.fon b/src/main/assets/Fonts/ssef1256.fon
deleted file mode 100644
index 57dc6f9..0000000
Binary files a/src/main/assets/Fonts/ssef1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssef1257.fon b/src/main/assets/Fonts/ssef1257.fon
deleted file mode 100644
index 1572298..0000000
Binary files a/src/main/assets/Fonts/ssef1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/ssef874.fon b/src/main/assets/Fonts/ssef874.fon
deleted file mode 100644
index 6bf185d..0000000
Binary files a/src/main/assets/Fonts/ssef874.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sserife.fon b/src/main/assets/Fonts/sserife.fon
deleted file mode 100644
index 55b0b4d..0000000
Binary files a/src/main/assets/Fonts/sserife.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sserifee.fon b/src/main/assets/Fonts/sserifee.fon
deleted file mode 100644
index 4d39915..0000000
Binary files a/src/main/assets/Fonts/sserifee.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sserifeg.fon b/src/main/assets/Fonts/sserifeg.fon
deleted file mode 100644
index a489fb6..0000000
Binary files a/src/main/assets/Fonts/sserifeg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sserifer.fon b/src/main/assets/Fonts/sserifer.fon
deleted file mode 100644
index ce3751a..0000000
Binary files a/src/main/assets/Fonts/sserifer.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sserifet.fon b/src/main/assets/Fonts/sserifet.fon
deleted file mode 100644
index aa4b644..0000000
Binary files a/src/main/assets/Fonts/sserifet.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sseriff.fon b/src/main/assets/Fonts/sseriff.fon
deleted file mode 100644
index 4ad1b4f..0000000
Binary files a/src/main/assets/Fonts/sseriff.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sseriffe.fon b/src/main/assets/Fonts/sseriffe.fon
deleted file mode 100644
index a76f6d6..0000000
Binary files a/src/main/assets/Fonts/sseriffe.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sseriffg.fon b/src/main/assets/Fonts/sseriffg.fon
deleted file mode 100644
index e67bdd4..0000000
Binary files a/src/main/assets/Fonts/sseriffg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sseriffr.fon b/src/main/assets/Fonts/sseriffr.fon
deleted file mode 100644
index 2ca96dc..0000000
Binary files a/src/main/assets/Fonts/sseriffr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sserifft.fon b/src/main/assets/Fonts/sserifft.fon
deleted file mode 100644
index 37e7010..0000000
Binary files a/src/main/assets/Fonts/sserifft.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/svgafix.fon b/src/main/assets/Fonts/svgafix.fon
deleted file mode 100644
index 7e14f72..0000000
Binary files a/src/main/assets/Fonts/svgafix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/svgasys.fon b/src/main/assets/Fonts/svgasys.fon
deleted file mode 100644
index 8573f0d..0000000
Binary files a/src/main/assets/Fonts/svgasys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/sylfaen.ttf b/src/main/assets/Fonts/sylfaen.ttf
deleted file mode 100644
index 556ef56..0000000
Binary files a/src/main/assets/Fonts/sylfaen.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/symbol.ttf b/src/main/assets/Fonts/symbol.ttf
deleted file mode 100644
index 897384a..0000000
Binary files a/src/main/assets/Fonts/symbol.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/tahoma.ttf b/src/main/assets/Fonts/tahoma.ttf
deleted file mode 100644
index b7b7086..0000000
Binary files a/src/main/assets/Fonts/tahoma.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/tahomabd.ttf b/src/main/assets/Fonts/tahomabd.ttf
deleted file mode 100644
index 2b694bf..0000000
Binary files a/src/main/assets/Fonts/tahomabd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/taile.ttf b/src/main/assets/Fonts/taile.ttf
deleted file mode 100644
index c0305bd..0000000
Binary files a/src/main/assets/Fonts/taile.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/taileb.ttf b/src/main/assets/Fonts/taileb.ttf
deleted file mode 100644
index 28fc396..0000000
Binary files a/src/main/assets/Fonts/taileb.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/times.ttf b/src/main/assets/Fonts/times.ttf
deleted file mode 100644
index fb113ba..0000000
Binary files a/src/main/assets/Fonts/times.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/timesbd.ttf b/src/main/assets/Fonts/timesbd.ttf
deleted file mode 100644
index 6d81387..0000000
Binary files a/src/main/assets/Fonts/timesbd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/timesbi.ttf b/src/main/assets/Fonts/timesbi.ttf
deleted file mode 100644
index 31ed20f..0000000
Binary files a/src/main/assets/Fonts/timesbi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/timesi.ttf b/src/main/assets/Fonts/timesi.ttf
deleted file mode 100644
index a6e84c1..0000000
Binary files a/src/main/assets/Fonts/timesi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/trebuc.ttf b/src/main/assets/Fonts/trebuc.ttf
deleted file mode 100644
index 549a507..0000000
Binary files a/src/main/assets/Fonts/trebuc.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/trebucbd.ttf b/src/main/assets/Fonts/trebucbd.ttf
deleted file mode 100644
index 45891de..0000000
Binary files a/src/main/assets/Fonts/trebucbd.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/trebucbi.ttf b/src/main/assets/Fonts/trebucbi.ttf
deleted file mode 100644
index 23e4b8b..0000000
Binary files a/src/main/assets/Fonts/trebucbi.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/trebucit.ttf b/src/main/assets/Fonts/trebucit.ttf
deleted file mode 100644
index 41edbfa..0000000
Binary files a/src/main/assets/Fonts/trebucit.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/verdana.ttf b/src/main/assets/Fonts/verdana.ttf
deleted file mode 100644
index 9a34997..0000000
Binary files a/src/main/assets/Fonts/verdana.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/verdanab.ttf b/src/main/assets/Fonts/verdanab.ttf
deleted file mode 100644
index fe8e687..0000000
Binary files a/src/main/assets/Fonts/verdanab.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/verdanai.ttf b/src/main/assets/Fonts/verdanai.ttf
deleted file mode 100644
index 23a6a03..0000000
Binary files a/src/main/assets/Fonts/verdanai.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/verdanaz.ttf b/src/main/assets/Fonts/verdanaz.ttf
deleted file mode 100644
index ff3b385..0000000
Binary files a/src/main/assets/Fonts/verdanaz.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/vga737.fon b/src/main/assets/Fonts/vga737.fon
deleted file mode 100644
index af74e93..0000000
Binary files a/src/main/assets/Fonts/vga737.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga775.fon b/src/main/assets/Fonts/vga775.fon
deleted file mode 100644
index 29e1df5..0000000
Binary files a/src/main/assets/Fonts/vga775.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga850.fon b/src/main/assets/Fonts/vga850.fon
deleted file mode 100644
index cb5c900..0000000
Binary files a/src/main/assets/Fonts/vga850.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga852.fon b/src/main/assets/Fonts/vga852.fon
deleted file mode 100644
index 16a127d..0000000
Binary files a/src/main/assets/Fonts/vga852.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga855.fon b/src/main/assets/Fonts/vga855.fon
deleted file mode 100644
index df7650a..0000000
Binary files a/src/main/assets/Fonts/vga855.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga857.fon b/src/main/assets/Fonts/vga857.fon
deleted file mode 100644
index 6d9abcb..0000000
Binary files a/src/main/assets/Fonts/vga857.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga860.fon b/src/main/assets/Fonts/vga860.fon
deleted file mode 100644
index 3fb7725..0000000
Binary files a/src/main/assets/Fonts/vga860.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga861.fon b/src/main/assets/Fonts/vga861.fon
deleted file mode 100644
index 449e86e..0000000
Binary files a/src/main/assets/Fonts/vga861.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga863.fon b/src/main/assets/Fonts/vga863.fon
deleted file mode 100644
index b078340..0000000
Binary files a/src/main/assets/Fonts/vga863.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga865.fon b/src/main/assets/Fonts/vga865.fon
deleted file mode 100644
index fabe23a..0000000
Binary files a/src/main/assets/Fonts/vga865.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga866.fon b/src/main/assets/Fonts/vga866.fon
deleted file mode 100644
index fdcbfe4..0000000
Binary files a/src/main/assets/Fonts/vga866.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga869.fon b/src/main/assets/Fonts/vga869.fon
deleted file mode 100644
index 5b0a5ad..0000000
Binary files a/src/main/assets/Fonts/vga869.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga932.fon b/src/main/assets/Fonts/vga932.fon
deleted file mode 100644
index cbdd38a..0000000
Binary files a/src/main/assets/Fonts/vga932.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga936.fon b/src/main/assets/Fonts/vga936.fon
deleted file mode 100644
index 7eb3561..0000000
Binary files a/src/main/assets/Fonts/vga936.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga949.fon b/src/main/assets/Fonts/vga949.fon
deleted file mode 100644
index e3d76c6..0000000
Binary files a/src/main/assets/Fonts/vga949.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vga950.fon b/src/main/assets/Fonts/vga950.fon
deleted file mode 100644
index dd77be5..0000000
Binary files a/src/main/assets/Fonts/vga950.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgaf1255.fon b/src/main/assets/Fonts/vgaf1255.fon
deleted file mode 100644
index b013ed2..0000000
Binary files a/src/main/assets/Fonts/vgaf1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgaf1256.fon b/src/main/assets/Fonts/vgaf1256.fon
deleted file mode 100644
index 3ccc5a2..0000000
Binary files a/src/main/assets/Fonts/vgaf1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgaf1257.fon b/src/main/assets/Fonts/vgaf1257.fon
deleted file mode 100644
index 3d398ba..0000000
Binary files a/src/main/assets/Fonts/vgaf1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgaf874.fon b/src/main/assets/Fonts/vgaf874.fon
deleted file mode 100644
index 6709c8e..0000000
Binary files a/src/main/assets/Fonts/vgaf874.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgafix.fon b/src/main/assets/Fonts/vgafix.fon
deleted file mode 100644
index ae925fb..0000000
Binary files a/src/main/assets/Fonts/vgafix.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgafixe.fon b/src/main/assets/Fonts/vgafixe.fon
deleted file mode 100644
index 6ba2584..0000000
Binary files a/src/main/assets/Fonts/vgafixe.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgafixg.fon b/src/main/assets/Fonts/vgafixg.fon
deleted file mode 100644
index f4f91b5..0000000
Binary files a/src/main/assets/Fonts/vgafixg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgafixr.fon b/src/main/assets/Fonts/vgafixr.fon
deleted file mode 100644
index d59ac2b..0000000
Binary files a/src/main/assets/Fonts/vgafixr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgafixt.fon b/src/main/assets/Fonts/vgafixt.fon
deleted file mode 100644
index e87929e..0000000
Binary files a/src/main/assets/Fonts/vgafixt.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgaoem.fon b/src/main/assets/Fonts/vgaoem.fon
deleted file mode 100644
index 70d3c90..0000000
Binary files a/src/main/assets/Fonts/vgaoem.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgas1255.fon b/src/main/assets/Fonts/vgas1255.fon
deleted file mode 100644
index c87486d..0000000
Binary files a/src/main/assets/Fonts/vgas1255.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgas1256.fon b/src/main/assets/Fonts/vgas1256.fon
deleted file mode 100644
index 4f09ccf..0000000
Binary files a/src/main/assets/Fonts/vgas1256.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgas1257.fon b/src/main/assets/Fonts/vgas1257.fon
deleted file mode 100644
index d4ce7f5..0000000
Binary files a/src/main/assets/Fonts/vgas1257.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgas874.fon b/src/main/assets/Fonts/vgas874.fon
deleted file mode 100644
index 730f06a..0000000
Binary files a/src/main/assets/Fonts/vgas874.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgasys.fon b/src/main/assets/Fonts/vgasys.fon
deleted file mode 100644
index 8c6d35c..0000000
Binary files a/src/main/assets/Fonts/vgasys.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgasyse.fon b/src/main/assets/Fonts/vgasyse.fon
deleted file mode 100644
index cf969a9..0000000
Binary files a/src/main/assets/Fonts/vgasyse.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgasysg.fon b/src/main/assets/Fonts/vgasysg.fon
deleted file mode 100644
index 070ed89..0000000
Binary files a/src/main/assets/Fonts/vgasysg.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgasysr.fon b/src/main/assets/Fonts/vgasysr.fon
deleted file mode 100644
index a438720..0000000
Binary files a/src/main/assets/Fonts/vgasysr.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/vgasyst.fon b/src/main/assets/Fonts/vgasyst.fon
deleted file mode 100644
index f9fabc0..0000000
Binary files a/src/main/assets/Fonts/vgasyst.fon and /dev/null differ
diff --git a/src/main/assets/Fonts/webdings.ttf b/src/main/assets/Fonts/webdings.ttf
deleted file mode 100644
index 73ae1a5..0000000
Binary files a/src/main/assets/Fonts/webdings.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/wingding.ttf b/src/main/assets/Fonts/wingding.ttf
deleted file mode 100644
index 6e38f7f..0000000
Binary files a/src/main/assets/Fonts/wingding.ttf and /dev/null differ
diff --git a/src/main/assets/Fonts/方正粗黑宋简体.ttf b/src/main/assets/Fonts/方正粗黑宋简体.ttf
deleted file mode 100644
index 0a4b4f4..0000000
Binary files a/src/main/assets/Fonts/方正粗黑宋简体.ttf and /dev/null differ
diff --git a/src/main/java/net/micode/notes/PaintView.java b/src/main/java/net/micode/notes/PaintView.java
deleted file mode 100644
index 5b121dd..0000000
--- a/src/main/java/net/micode/notes/PaintView.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package net.micode.notes;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.MotionEvent;
-import android.view.View;
-
-/**
- *
- * @category: View实现改变颜色、粗细、涂鸦、撤销以及重做功能
- * @author: dingruihua
- * @date: 2022.10.10
- *
- */
-
-public class PaintView extends View  {
-
-    private Canvas  mCanvas;
-    private Path    mPath;
-    private Paint   mBitmapPaint;
-    public Bitmap  mBitmap;
-    private Paint mPaint;
-
-    private ArrayList<DrawPath> savePath;
-    private ArrayList<DrawPath> deletePath;
-    private DrawPath dp;
-
-    private float mX, mY;
-    private static final float TOUCH_TOLERANCE = 4;
-
-    private int bitmapWidth;
-    private int bitmapHeight;
-
-    private int changed_width=0;
-    private int changed_color=0;
-
-    public PaintView(Context c) {
-        super(c);
-        //得到屏幕的分辨率
-        DisplayMetrics dm = new DisplayMetrics();
-        ((Activity) c).getWindowManager().getDefaultDisplay().getMetrics(dm);
-
-        bitmapWidth = dm.widthPixels;
-        bitmapHeight = dm.heightPixels - 2 * 45;
-
-        initCanvas();
-        savePath = new ArrayList<DrawPath>();
-        deletePath = new ArrayList<DrawPath>();
-
-    }
-    public PaintView(Context c, AttributeSet attrs) {
-        super(c,attrs);
-        //得到屏幕的分辨率
-        DisplayMetrics dm = new DisplayMetrics();
-        ((Activity) c).getWindowManager().getDefaultDisplay().getMetrics(dm);
-
-        bitmapWidth = dm.widthPixels;
-        bitmapHeight = dm.heightPixels - 2 * 45;
-
-        initCanvas();
-        savePath = new ArrayList<DrawPath>();
-        deletePath = new ArrayList<DrawPath>();
-    }
-    //初始化画布
-    public void initCanvas(){
-
-        mPaint = new Paint();
-        mPaint.setAntiAlias(true);
-        mPaint.setDither(true);
-        mPaint.setColor(0xFF000000);
-        mPaint.setStyle(Paint.Style.STROKE);
-        mPaint.setStrokeJoin(Paint.Join.ROUND);
-        mPaint.setStrokeCap(Paint.Cap.ROUND);
-        mPaint.setStrokeWidth(10);
-
-        mBitmapPaint = new Paint(Paint.DITHER_FLAG);
-
-
-
-        //画布大小
-        mBitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
-                Bitmap.Config.RGB_565);
-        mCanvas = new Canvas(mBitmap);  //所有mCanvas画的东西都被保存在了mBitmap中
-
-        mCanvas.drawColor(Color.WHITE);
-        mPath = new Path();
-        mBitmapPaint = new Paint(Paint.DITHER_FLAG);
-
-    }
-
-    public void changewidth(){
-        if (changed_width==0) {
-            mPaint.setStrokeWidth(50);
-            changed_width = 1;
-        }
-        else{
-            mPaint.setStrokeWidth(10);
-            changed_width = 0;
-        }
-
-    }
-
-    public void changecolor(){
-        if (changed_color==0) {
-            mPaint.setColor(0xFFFF0000);
-            changed_color = 1;
-        }
-        else{
-            mPaint.setColor(0xFF000000);
-            changed_color = 0;
-        }
-
-    }
-    @Override
-    protected void onDraw(Canvas canvas) {
-
-        canvas.drawBitmap(mBitmap, 0, 0, mBitmapPaint);     //显示旧的画布
-        if (mPath != null) {
-            // 实时的显示
-            canvas.drawPath(mPath, mPaint);
-        }
-    }
-    //路径对象
-    class DrawPath{
-        Path path;
-        Paint paint;
-    }
-
-    /**
-     * 撤销的核心思想就是将画布清空，
-     * 将保存下来的Path路径最后一个移除掉，
-     * 重新将路径画在画布上面。
-     */
-    public void undo(){
-
-        System.out.println(savePath.size()+"--------------");
-        if(savePath != null && savePath.size() > 0){
-            //清空画布
-            mBitmapPaint = new Paint(Paint.DITHER_FLAG);
-            //画布大小
-            mBitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
-                    Bitmap.Config.RGB_565);
-            mCanvas = new Canvas(mBitmap);  //所有mCanvas画的东西都被保存在了mBitmap中
-
-            mCanvas.drawColor(Color.WHITE);
-            mPath = new Path();
-            mBitmapPaint = new Paint(Paint.DITHER_FLAG);
-
-            //将路径保存列表中的最后一个元素删除 ,并将其保存在路径删除列表中
-            DrawPath drawPath = savePath.get(savePath.size() - 1);
-            deletePath.add(drawPath);
-            savePath.remove(savePath.size() - 1);
-
-            //将路径保存列表中的路径重绘在画布上
-            Iterator<DrawPath> iter = savePath.iterator();		//重复保存
-            while (iter.hasNext()) {
-                DrawPath dp = iter.next();
-                mCanvas.drawPath(dp.path, dp.paint);
-
-            }
-            invalidate();// 刷新
-        }
-    }
-    /**
-     * 恢复的核心思想就是将撤销的路径保存到另外一个列表里面(栈)，
-     * 然后从redo的列表里面取出最顶端对象，
-     * 画在画布上面即可
-     */
-    public void redo(){
-        if(deletePath.size() > 0){
-            //将删除的路径列表中的最后一个，也就是最顶端路径取出（栈）,并加入路径保存列表中
-            DrawPath dp = deletePath.get(deletePath.size() - 1);
-            savePath.add(dp);
-            //将取出的路径重绘在画布上
-            mCanvas.drawPath(dp.path, dp.paint);
-            //将该路径从删除的路径列表中去除
-            deletePath.remove(deletePath.size() - 1);
-            invalidate();
-        }
-    }
-    /*
-     * 清空的主要思想就是初始化画布
-     * 将保存路径的两个List清空
-     * */
-    public void removeAllPaint(){
-        //调用初始化画布函数以清空画布
-        initCanvas();
-        changed_color=0;
-        changed_width=0;
-        invalidate();//刷新
-        savePath.clear();
-        deletePath.clear();
-    }
-
-
-
-
-
-    private void touch_start(float x, float y) {
-        mPath.reset();//清空path
-        mPath.moveTo(x, y);
-        mX = x;
-        mY = y;
-    }
-    private void touch_move(float x, float y) {
-        float dx = Math.abs(x - mX);
-        float dy = Math.abs(y - mY);
-        if (dx >= TOUCH_TOLERANCE || dy >= TOUCH_TOLERANCE) {
-            //mPath.quadTo(mX, mY, x, y);
-            mPath.quadTo(mX, mY, (x + mX)/2, (y + mY)/2);//源代码是这样写的，可是我没有弄明白，为什么要这样？
-            mX = x;
-            mY = y;
-        }
-    }
-    private void touch_up() {
-        mPath.lineTo(mX, mY);
-        mCanvas.drawPath(mPath, mPaint);
-        savePath.add(dp);
-        mPath = null;
-
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        float x = event.getX();
-        float y = event.getY();
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-
-                mPath = new Path();
-                dp = new DrawPath();
-                dp.path = mPath;
-                dp.paint = mPaint;
-
-                touch_start(x, y);
-                invalidate(); //清屏
-                break;
-            case MotionEvent.ACTION_MOVE:
-                touch_move(x, y);
-                invalidate();
-                break;
-            case MotionEvent.ACTION_UP:
-                touch_up();
-                invalidate();
-                break;
-        }
-        return true;
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java
deleted file mode 100644
index d97ac5d..0000000
--- a/src/main/java/net/micode/notes/data/Contact.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.data;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Data;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-
-import java.util.HashMap;
-
-public class Contact {
-    private static HashMap<String, String> sContactCache;
-    private static final String TAG = "Contact";
-
-    private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
-    + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
-    + " AND " + Data.RAW_CONTACT_ID + " IN "
-            + "(SELECT raw_contact_id "
-            + " FROM phone_lookup"
-            + " WHERE min_match = '+')";
-
-    public static String getContact(Context context, String phoneNumber) {
-        if(sContactCache == null) {
-            sContactCache = new HashMap<String, String>();
-        }
-
-        if(sContactCache.containsKey(phoneNumber)) {
-            return sContactCache.get(phoneNumber);
-        }
-
-        String selection = CALLER_ID_SELECTION.replace("+",
-                PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
-        Cursor cursor = context.getContentResolver().query(
-                Data.CONTENT_URI,
-                new String [] { Phone.DISPLAY_NAME },
-                selection,
-                new String[] { phoneNumber },
-                null);
-
-        if (cursor != null && cursor.moveToFirst()) {
-            try {
-                String name = cursor.getString(0);
-                sContactCache.put(phoneNumber, name);
-                return name;
-            } catch (IndexOutOfBoundsException e) {
-                Log.e(TAG, " Cursor get string error " + e.toString());
-                return null;
-            } finally {
-                cursor.close();
-            }
-        } else {
-            Log.d(TAG, "No contact matched with number:" + phoneNumber);
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java
deleted file mode 100644
index f240604..0000000
--- a/src/main/java/net/micode/notes/data/Notes.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.data;
-
-import android.net.Uri;
-public class Notes {
-    public static final String AUTHORITY = "micode_notes";
-    public static final String TAG = "Notes";
-    public static final int TYPE_NOTE     = 0;
-    public static final int TYPE_FOLDER   = 1;
-    public static final int TYPE_SYSTEM   = 2;
-
-    /**
-     * Following IDs are system folders' identifiers
-     * {@link Notes#ID_ROOT_FOLDER } is default folder
-     * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
-     * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
-     */
-    public static final int ID_ROOT_FOLDER = 0;
-    public static final int ID_TEMPARAY_FOLDER = -1;
-    public static final int ID_CALL_RECORD_FOLDER = -2;
-    public static final int ID_TRASH_FOLER = -3;
-
-    public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
-    public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
-    public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
-    public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";
-    public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
-    public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
-
-    public static final int TYPE_WIDGET_INVALIDE      = -1;
-    public static final int TYPE_WIDGET_2X            = 0;
-    public static final int TYPE_WIDGET_4X            = 1;
-
-    public static class DataConstants {
-        public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
-        public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
-    }
-
-    /**
-     * Uri to query all notes and folders
-     */
-    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
-
-    /**
-     * Uri to query data
-     */
-    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-
-    public interface NoteColumns {
-        /**
-         * The unique ID for a row
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String ID = "_id";
-
-        /**
-         * The parent's id for note or folder
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String PARENT_ID = "parent_id";
-
-        /**
-         * Created data for note or folder
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String CREATED_DATE = "created_date";
-
-        /**
-         * Latest modified date
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String MODIFIED_DATE = "modified_date";
-
-
-        /**
-         * Alert date
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String ALERTED_DATE = "alert_date";
-
-        /**
-         * Folder's name or text content of note
-         * <P> Type: TEXT </P>
-         */
-        public static final String SNIPPET = "snippet";
-
-        /**
-         * Note's widget id
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String WIDGET_ID = "widget_id";
-
-        /**
-         * Note's widget type
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String WIDGET_TYPE = "widget_type";
-
-        /**
-         * Note's background color's id
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String BG_COLOR_ID = "bg_color_id";
-
-        /**
-         * For text note, it doesn't has attachment, for multi-media
-         * note, it has at least one attachment
-         * <P> Type: INTEGER </P>
-         */
-        public static final String HAS_ATTACHMENT = "has_attachment";
-
-        /**
-         * Folder's count of notes
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String NOTES_COUNT = "notes_count";
-
-        /**
-         * The file type: folder or note
-         * <P> Type: INTEGER </P>
-         */
-        public static final String TYPE = "type";
-
-        /**
-         * The last sync id
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String SYNC_ID = "sync_id";
-
-        /**
-         * Sign to indicate local modified or not
-         * <P> Type: INTEGER </P>
-         */
-        public static final String LOCAL_MODIFIED = "local_modified";
-
-        /**
-         * Original parent id before moving into temporary folder
-         * <P> Type : INTEGER </P>
-         */
-        public static final String ORIGIN_PARENT_ID = "origin_parent_id";
-
-        /**
-         * The gtask id
-         * <P> Type : TEXT </P>
-         */
-        public static final String GTASK_ID = "gtask_id";
-
-        /**
-         * The version code
-         * <P> Type : INTEGER (long) </P>
-         */
-        public static final String VERSION = "version";
-    }
-
-    public interface DataColumns {
-        /**
-         * The unique ID for a row
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String ID = "_id";
-
-        /**
-         * The MIME type of the item represented by this row.
-         * <P> Type: Text </P>
-         */
-        public static final String MIME_TYPE = "mime_type";
-
-        /**
-         * The reference id to note that this data belongs to
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String NOTE_ID = "note_id";
-
-        /**
-         * Created data for note or folder
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String CREATED_DATE = "created_date";
-
-        /**
-         * Latest modified date
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String MODIFIED_DATE = "modified_date";
-
-        /**
-         * Data's content
-         * <P> Type: TEXT </P>
-         */
-        public static final String CONTENT = "content";
-
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * integer data type
-         * <P> Type: INTEGER </P>
-         */
-        public static final String DATA1 = "data1";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * integer data type
-         * <P> Type: INTEGER </P>
-         */
-        public static final String DATA2 = "data2";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * TEXT data type
-         * <P> Type: TEXT </P>
-         */
-        public static final String DATA3 = "data3";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * TEXT data type
-         * <P> Type: TEXT </P>
-         */
-        public static final String DATA4 = "data4";
-
-        /**
-         * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
-         * TEXT data type
-         * <P> Type: TEXT </P>
-         */
-        public static final String DATA5 = "data5";
-    }
-
-    public static final class TextNote implements DataColumns {
-        /**
-         * Mode to indicate the text in check list mode or not
-         * <P> Type: Integer 1:check list mode 0: normal mode </P>
-         */
-        public static final String MODE = DATA1;
-
-        public static final int MODE_CHECK_LIST = 1;
-
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
-
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
-
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
-    }
-
-    public static final class CallNote implements DataColumns {
-        /**
-         * Call date for this record
-         * <P> Type: INTEGER (long) </P>
-         */
-        public static final String CALL_DATE = DATA1;
-
-        /**
-         * Phone number for this record
-         * <P> Type: TEXT </P>
-         */
-        public static final String PHONE_NUMBER = DATA3;
-
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
-
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
-
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
-    }
-}
diff --git a/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
deleted file mode 100644
index 877c32a..0000000
--- a/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.data;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class NotesDatabaseHelper extends SQLiteOpenHelper {
-    private static final String DB_NAME = "note.db";
-
-    private static final int DB_VERSION = 4;
-
-    public interface TABLE {
-        public static final String NOTE = "note";
-
-        public static final String DATA = "data";
-    }
-
-    private static final String TAG = "NotesDatabaseHelper";
-
-    private static NotesDatabaseHelper mInstance;
-
-    private static final String CREATE_NOTE_TABLE_SQL =
-            "CREATE TABLE " + TABLE.NOTE + "(" +
-                    NoteColumns.ID + " INTEGER PRIMARY KEY," +
-                    NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-                    NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-                    NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
-                    NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
-                    NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
-                    NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0,''" +
-                    ")";
-
-    private static final String CREATE_DATA_TABLE_SQL =
-            "CREATE TABLE " + TABLE.DATA + "(" +
-                    DataColumns.ID + " INTEGER PRIMARY KEY," +
-                    DataColumns.MIME_TYPE + " TEXT NOT NULL," +
-                    DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
-                    NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-                    NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
-                    DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
-                    DataColumns.DATA1 + " INTEGER," +
-                    DataColumns.DATA2 + " INTEGER," +
-                    DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
-                    DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
-                    DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
-                    ")";
-
-    private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
-            "CREATE INDEX IF NOT EXISTS note_id_index ON " +
-                    TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
-
-    /**
-     * Increase folder's note count when move note to the folder
-     */
-    private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
-            "CREATE TRIGGER increase_folder_count_on_update "+
-                    " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
-                    " BEGIN " +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
-                    "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
-                    " END";
-
-    /**
-     * Decrease folder's note count when move note from folder
-     */
-    private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
-            "CREATE TRIGGER decrease_folder_count_on_update " +
-                    " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
-                    " BEGIN " +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
-                    "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
-                    "  AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
-                    " END";
-
-    /**
-     * Increase folder's note count when insert new note to the folder
-     */
-    private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
-            "CREATE TRIGGER increase_folder_count_on_insert " +
-                    " AFTER INSERT ON " + TABLE.NOTE +
-                    " BEGIN " +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" +
-                    "  WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
-                    " END";
-
-    /**
-     * Decrease folder's note count when delete note from the folder
-     */
-    private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
-            "CREATE TRIGGER decrease_folder_count_on_delete " +
-                    " AFTER DELETE ON " + TABLE.NOTE +
-                    " BEGIN " +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
-                    "  WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
-                    "  AND " + NoteColumns.NOTES_COUNT + ">0;" +
-                    " END";
-
-    /**
-     * Update note's content when insert data with type {@link DataConstants#NOTE}
-     */
-    private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
-            "CREATE TRIGGER update_note_content_on_insert " +
-                    " AFTER INSERT ON " + TABLE.DATA +
-                    " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
-                    " BEGIN" +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
-                    "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
-                    " END";
-
-    /**
-     * Update note's content when data with {@link DataConstants#NOTE} type has changed
-     */
-    private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
-            "CREATE TRIGGER update_note_content_on_update " +
-                    " AFTER UPDATE ON " + TABLE.DATA +
-                    " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
-                    " BEGIN" +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT +
-                    "  WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
-                    " END";
-
-    /**
-     * Update note's content when data with {@link DataConstants#NOTE} type has deleted
-     */
-    private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
-            "CREATE TRIGGER update_note_content_on_delete " +
-                    " AFTER delete ON " + TABLE.DATA +
-                    " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
-                    " BEGIN" +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.SNIPPET + "=''" +
-                    "  WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
-                    " END";
-
-    /**
-     * Delete datas belong to note which has been deleted
-     */
-    private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
-            "CREATE TRIGGER delete_data_on_delete " +
-                    " AFTER DELETE ON " + TABLE.NOTE +
-                    " BEGIN" +
-                    "  DELETE FROM " + TABLE.DATA +
-                    "   WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
-                    " END";
-
-    /**
-     * Delete notes belong to folder which has been deleted
-     */
-    private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
-            "CREATE TRIGGER folder_delete_notes_on_delete " +
-                    " AFTER DELETE ON " + TABLE.NOTE +
-                    " BEGIN" +
-                    "  DELETE FROM " + TABLE.NOTE +
-                    "   WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-                    " END";
-
-    /**
-     * Move notes belong to folder which has been moved to trash folder
-     */
-    private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
-            "CREATE TRIGGER folder_move_notes_on_trash " +
-                    " AFTER UPDATE ON " + TABLE.NOTE +
-                    " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
-                    " BEGIN" +
-                    "  UPDATE " + TABLE.NOTE +
-                    "   SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
-                    "  WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
-                    " END";
-
-    public NotesDatabaseHelper(Context context) {
-        super(context, DB_NAME, null, DB_VERSION);
-    }
-
-    public void createNoteTable(SQLiteDatabase db) {
-        db.execSQL(CREATE_NOTE_TABLE_SQL);
-        reCreateNoteTableTriggers(db);
-        createSystemFolder(db);
-        Log.d(TAG, "note table has been created");
-    }
-
-    private void reCreateNoteTableTriggers(SQLiteDatabase db) {
-        db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
-        db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
-        db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
-        db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
-
-        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
-        db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
-        db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
-        db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
-        db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
-        db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
-        db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
-    }
-
-    private void createSystemFolder(SQLiteDatabase db) {
-        ContentValues values = new ContentValues();
-
-        /**
-         * call record foler for call notes
-         */
-        values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-
-        /**
-         * root folder which is default folder
-         */
-        values.clear();
-        values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-
-        /**
-         * temporary folder which is used for moving note
-         */
-        values.clear();
-        values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-
-        /**
-         * create trash folder
-         */
-        values.clear();
-        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-    }
-
-    public void createDataTable(SQLiteDatabase db) {
-        db.execSQL(CREATE_DATA_TABLE_SQL);
-        reCreateDataTableTriggers(db);
-        db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
-        Log.d(TAG, "data table has been created");
-    }
-
-    private void reCreateDataTableTriggers(SQLiteDatabase db) {
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
-
-        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
-        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
-        db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
-    }
-
-    static synchronized NotesDatabaseHelper getInstance(Context context) {
-        if (mInstance == null) {
-            mInstance = new NotesDatabaseHelper(context);
-        }
-        return mInstance;
-    }
-
-    @Override
-    public void onCreate(SQLiteDatabase db) {
-        createNoteTable(db);
-        createDataTable(db);
-    }
-
-    @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        boolean reCreateTriggers = false;
-        boolean skipV2 = false;
-
-        if (oldVersion == 1) {
-            upgradeToV2(db);
-            skipV2 = true; // this upgrade including the upgrade from v2 to v3
-            oldVersion++;
-        }
-
-        if (oldVersion == 2 && !skipV2) {
-            upgradeToV3(db);
-            reCreateTriggers = true;
-            oldVersion++;
-        }
-
-        if (oldVersion == 3) {
-            upgradeToV4(db);
-            oldVersion++;
-        }
-
-
-        if (reCreateTriggers) {
-            reCreateNoteTableTriggers(db);
-            reCreateDataTableTriggers(db);
-        }
-
-        if (oldVersion != newVersion) {
-            throw new IllegalStateException("Upgrade notes database to version " + newVersion
-                    + "fails");
-        }
-    }
-
-    private void upgradeToV2(SQLiteDatabase db) {
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
-        db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
-        createNoteTable(db);
-        createDataTable(db);
-    }
-
-    private void upgradeToV3(SQLiteDatabase db) {
-        // drop unused triggers
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
-        db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
-        // add a column for gtask id
-        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
-                + " TEXT NOT NULL DEFAULT ''");
-        // add a trash system folder
-        ContentValues values = new ContentValues();
-        values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
-        values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-        db.insert(TABLE.NOTE, null, values);
-    }
-
-    private void upgradeToV4(SQLiteDatabase db) {
-        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
-                + " INTEGER NOT NULL DEFAULT 0");
-    }
-
-
-}
diff --git a/src/main/java/net/micode/notes/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java
deleted file mode 100644
index edb0a60..0000000
--- a/src/main/java/net/micode/notes/data/NotesProvider.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.data;
-
-
-import android.app.SearchManager;
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-
-
-public class NotesProvider extends ContentProvider {
-    private static final UriMatcher mMatcher;
-
-    private NotesDatabaseHelper mHelper;
-
-    private static final String TAG = "NotesProvider";
-
-    private static final int URI_NOTE            = 1;
-    private static final int URI_NOTE_ITEM       = 2;
-    private static final int URI_DATA            = 3;
-    private static final int URI_DATA_ITEM       = 4;
-
-    private static final int URI_SEARCH          = 5;
-    private static final int URI_SEARCH_SUGGEST  = 6;
-
-    static {
-        mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-        mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
-        mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
-        mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
-        mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);
-        mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);
-        mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
-        mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
-    }
-
-    /**
-     * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
-     * we will trim '\n' and white space in order to show more information.
-     */
-    private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
-        + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
-        + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
-        + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
-        + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
-        + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
-        + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
-
-    private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
-        + " FROM " + TABLE.NOTE
-        + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
-        + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
-        + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
-
-    @Override
-    public boolean onCreate() {
-        mHelper = NotesDatabaseHelper.getInstance(getContext());
-        return true;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        Cursor c = null;
-        SQLiteDatabase db = mHelper.getReadableDatabase();
-        String id = null;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
-                        sortOrder);
-                break;
-            case URI_NOTE_ITEM:
-                id = uri.getPathSegments().get(1);
-                c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
-                break;
-            case URI_DATA:
-                c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
-                        sortOrder);
-                break;
-            case URI_DATA_ITEM:
-                id = uri.getPathSegments().get(1);
-                c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs, null, null, sortOrder);
-                break;
-            case URI_SEARCH:
-            case URI_SEARCH_SUGGEST:
-                if (sortOrder != null || projection != null) {
-                    throw new IllegalArgumentException(
-                            "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
-                }
-
-                String searchString = null;
-                if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
-                    if (uri.getPathSegments().size() > 1) {
-                        searchString = uri.getPathSegments().get(1);
-                    }
-                } else {
-                    searchString = uri.getQueryParameter("pattern");
-                }
-
-                if (TextUtils.isEmpty(searchString)) {
-                    return null;
-                }
-
-                try {
-                    searchString = String.format("%%%s%%", searchString);
-                    c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
-                            new String[] { searchString });
-                } catch (IllegalStateException ex) {
-                    Log.e(TAG, "got exception: " + ex.toString());
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        if (c != null) {
-            c.setNotificationUri(getContext().getContentResolver(), uri);
-        }
-        return c;
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        SQLiteDatabase db = mHelper.getWritableDatabase();
-        long dataId = 0, noteId = 0, insertedId = 0;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                insertedId = noteId = db.insert(TABLE.NOTE, null, values);
-                break;
-            case URI_DATA:
-                if (values.containsKey(DataColumns.NOTE_ID)) {
-                    noteId = values.getAsLong(DataColumns.NOTE_ID);
-                } else {
-                    Log.d(TAG, "Wrong data format without note id:" + values.toString());
-                }
-                insertedId = dataId = db.insert(TABLE.DATA, null, values);
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        // Notify the note uri
-        if (noteId > 0) {
-            getContext().getContentResolver().notifyChange(
-                    ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
-        }
-
-        // Notify the data uri
-        if (dataId > 0) {
-            getContext().getContentResolver().notifyChange(
-                    ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
-        }
-
-        return ContentUris.withAppendedId(uri, insertedId);
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        int count = 0;
-        String id = null;
-        SQLiteDatabase db = mHelper.getWritableDatabase();
-        boolean deleteData = false;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
-                count = db.delete(TABLE.NOTE, selection, selectionArgs);
-                break;
-            case URI_NOTE_ITEM:
-                id = uri.getPathSegments().get(1);
-                /**
-                 * ID that smaller than 0 is system folder which is not allowed to
-                 * trash
-                 */
-                long noteId = Long.valueOf(id);
-                if (noteId <= 0) {
-                    break;
-                }
-                count = db.delete(TABLE.NOTE,
-                        NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
-                break;
-            case URI_DATA:
-                count = db.delete(TABLE.DATA, selection, selectionArgs);
-                deleteData = true;
-                break;
-            case URI_DATA_ITEM:
-                id = uri.getPathSegments().get(1);
-                count = db.delete(TABLE.DATA,
-                        DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
-                deleteData = true;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-        if (count > 0) {
-            if (deleteData) {
-                getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
-            }
-            getContext().getContentResolver().notifyChange(uri, null);
-        }
-        return count;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        int count = 0;
-        String id = null;
-        SQLiteDatabase db = mHelper.getWritableDatabase();
-        boolean updateData = false;
-        switch (mMatcher.match(uri)) {
-            case URI_NOTE:
-                increaseNoteVersion(-1, selection, selectionArgs);
-                count = db.update(TABLE.NOTE, values, selection, selectionArgs);
-                break;
-            case URI_NOTE_ITEM:
-                id = uri.getPathSegments().get(1);
-                increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
-                count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs);
-                break;
-            case URI_DATA:
-                count = db.update(TABLE.DATA, values, selection, selectionArgs);
-                updateData = true;
-                break;
-            case URI_DATA_ITEM:
-                id = uri.getPathSegments().get(1);
-                count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
-                        + parseSelection(selection), selectionArgs);
-                updateData = true;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown URI " + uri);
-        }
-
-        if (count > 0) {
-            if (updateData) {
-                getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
-            }
-            getContext().getContentResolver().notifyChange(uri, null);
-        }
-        return count;
-    }
-
-    private String parseSelection(String selection) {
-        return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
-    }
-
-    private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
-        StringBuilder sql = new StringBuilder(120);
-        sql.append("UPDATE ");
-        sql.append(TABLE.NOTE);
-        sql.append(" SET ");
-        sql.append(NoteColumns.VERSION);
-        sql.append("=" + NoteColumns.VERSION + "+1 ");
-
-        if (id > 0 || !TextUtils.isEmpty(selection)) {
-            sql.append(" WHERE ");
-        }
-        if (id > 0) {
-            sql.append(NoteColumns.ID + "=" + String.valueOf(id));
-        }
-        if (!TextUtils.isEmpty(selection)) {
-            String selectString = id > 0 ? parseSelection(selection) : selection;
-            for (String args : selectionArgs) {
-                selectString = selectString.replaceFirst("\\?", args);
-            }
-            sql.append(selectString);
-        }
-
-        mHelper.getWritableDatabase().execSQL(sql.toString());
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java
deleted file mode 100644
index 3a2050b..0000000
--- a/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class MetaData extends Task {
-    private final static String TAG = MetaData.class.getSimpleName();
-
-    private String mRelatedGid = null;
-
-    public void setMeta(String gid, JSONObject metaInfo) {
-        try {
-            metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
-        } catch (JSONException e) {
-            Log.e(TAG, "failed to put related gid");
-        }
-        setNotes(metaInfo.toString());
-        setName(GTaskStringUtils.META_NOTE_NAME);
-    }
-
-    public String getRelatedGid() {
-        return mRelatedGid;
-    }
-
-    @Override
-    public boolean isWorthSaving() {
-        return getNotes() != null;
-    }
-
-    @Override
-    public void setContentByRemoteJSON(JSONObject js) {
-        super.setContentByRemoteJSON(js);
-        if (getNotes() != null) {
-            try {
-                JSONObject metaInfo = new JSONObject(getNotes().trim());
-                mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
-            } catch (JSONException e) {
-                Log.w(TAG, "failed to get related gid");
-                mRelatedGid = null;
-            }
-        }
-    }
-
-    @Override
-    public void setContentByLocalJSON(JSONObject js) {
-        // this function should not be called
-        throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
-    }
-
-    @Override
-    public JSONObject getLocalJSONFromContent() {
-        throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
-    }
-
-    @Override
-    public int getSyncAction(Cursor c) {
-        throw new IllegalAccessError("MetaData:getSyncAction should not be called");
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java
deleted file mode 100644
index 63950e0..0000000
--- a/src/main/java/net/micode/notes/gtask/data/Node.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-
-import org.json.JSONObject;
-
-public abstract class Node {
-    public static final int SYNC_ACTION_NONE = 0;
-
-    public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
-    public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
-    public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
-    public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
-    public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
-    public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
-    public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
-    public static final int SYNC_ACTION_ERROR = 8;
-
-    private String mGid;
-
-    private String mName;
-
-    private long mLastModified;
-
-    private boolean mDeleted;
-
-    public Node() {
-        mGid = null;
-        mName = "";
-        mLastModified = 0;
-        mDeleted = false;
-    }
-
-    public abstract JSONObject getCreateAction(int actionId);
-
-    public abstract JSONObject getUpdateAction(int actionId);
-
-    public abstract void setContentByRemoteJSON(JSONObject js);
-
-    public abstract void setContentByLocalJSON(JSONObject js);
-
-    public abstract JSONObject getLocalJSONFromContent();
-
-    public abstract int getSyncAction(Cursor c);
-
-    public void setGid(String gid) {
-        this.mGid = gid;
-    }
-
-    public void setName(String name) {
-        this.mName = name;
-    }
-
-    public void setLastModified(long lastModified) {
-        this.mLastModified = lastModified;
-    }
-
-    public void setDeleted(boolean deleted) {
-        this.mDeleted = deleted;
-    }
-
-    public String getGid() {
-        return this.mGid;
-    }
-
-    public String getName() {
-        return this.mName;
-    }
-
-    public long getLastModified() {
-        return this.mLastModified;
-    }
-
-    public boolean getDeleted() {
-        return this.mDeleted;
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java
deleted file mode 100644
index d3ec3be..0000000
--- a/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-import net.micode.notes.gtask.exception.ActionFailureException;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class SqlData {
-    private static final String TAG = SqlData.class.getSimpleName();
-
-    private static final int INVALID_ID = -99999;
-
-    public static final String[] PROJECTION_DATA = new String[] {
-            DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
-            DataColumns.DATA3
-    };
-
-    public static final int DATA_ID_COLUMN = 0;
-
-    public static final int DATA_MIME_TYPE_COLUMN = 1;
-
-    public static final int DATA_CONTENT_COLUMN = 2;
-
-    public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
-
-    public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
-
-    private ContentResolver mContentResolver;
-
-    private boolean mIsCreate;
-
-    private long mDataId;
-
-    private String mDataMimeType;
-
-    private String mDataContent;
-
-    private long mDataContentData1;
-
-    private String mDataContentData3;
-
-    private ContentValues mDiffDataValues;
-
-    public SqlData(Context context) {
-        mContentResolver = context.getContentResolver();
-        mIsCreate = true;
-        mDataId = INVALID_ID;
-        mDataMimeType = DataConstants.NOTE;
-        mDataContent = "";
-        mDataContentData1 = 0;
-        mDataContentData3 = "";
-        mDiffDataValues = new ContentValues();
-    }
-
-    public SqlData(Context context, Cursor c) {
-        mContentResolver = context.getContentResolver();
-        mIsCreate = false;
-        loadFromCursor(c);
-        mDiffDataValues = new ContentValues();
-    }
-
-    private void loadFromCursor(Cursor c) {
-        mDataId = c.getLong(DATA_ID_COLUMN);
-        mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
-        mDataContent = c.getString(DATA_CONTENT_COLUMN);
-        mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
-        mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
-    }
-
-    public void setContent(JSONObject js) throws JSONException {
-        long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
-        if (mIsCreate || mDataId != dataId) {
-            mDiffDataValues.put(DataColumns.ID, dataId);
-        }
-        mDataId = dataId;
-
-        String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
-                : DataConstants.NOTE;
-        if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
-            mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
-        }
-        mDataMimeType = dataMimeType;
-
-        String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
-        if (mIsCreate || !mDataContent.equals(dataContent)) {
-            mDiffDataValues.put(DataColumns.CONTENT, dataContent);
-        }
-        mDataContent = dataContent;
-
-        long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
-        if (mIsCreate || mDataContentData1 != dataContentData1) {
-            mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
-        }
-        mDataContentData1 = dataContentData1;
-
-        String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
-        if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
-            mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
-        }
-        mDataContentData3 = dataContentData3;
-    }
-
-    public JSONObject getContent() throws JSONException {
-        if (mIsCreate) {
-            Log.e(TAG, "it seems that we haven't created this in database yet");
-            return null;
-        }
-        JSONObject js = new JSONObject();
-        js.put(DataColumns.ID, mDataId);
-        js.put(DataColumns.MIME_TYPE, mDataMimeType);
-        js.put(DataColumns.CONTENT, mDataContent);
-        js.put(DataColumns.DATA1, mDataContentData1);
-        js.put(DataColumns.DATA3, mDataContentData3);
-        return js;
-    }
-
-    public void commit(long noteId, boolean validateVersion, long version) {
-
-        if (mIsCreate) {
-            if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
-                mDiffDataValues.remove(DataColumns.ID);
-            }
-
-            mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
-            Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
-            try {
-                mDataId = Long.valueOf(uri.getPathSegments().get(1));
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "Get note id error :" + e.toString());
-                throw new ActionFailureException("create note failed");
-            }
-        } else {
-            if (mDiffDataValues.size() > 0) {
-                int result = 0;
-                if (!validateVersion) {
-                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
-                } else {
-                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
-                            " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
-                                    + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
-                                    String.valueOf(noteId), String.valueOf(version)
-                            });
-                }
-                if (result == 0) {
-                    Log.w(TAG, "there is no update. maybe user updates note when syncing");
-                }
-            }
-        }
-
-        mDiffDataValues.clear();
-        mIsCreate = false;
-    }
-
-    public long getId() {
-        return mDataId;
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java
deleted file mode 100644
index 79a4095..0000000
--- a/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.tool.ResourceParser;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class SqlNote {
-    private static final String TAG = SqlNote.class.getSimpleName();
-
-    private static final int INVALID_ID = -99999;
-
-    public static final String[] PROJECTION_NOTE = new String[] {
-            NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
-            NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
-            NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
-            NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
-            NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
-            NoteColumns.VERSION
-    };
-
-    public static final int ID_COLUMN = 0;
-
-    public static final int ALERTED_DATE_COLUMN = 1;
-
-    public static final int BG_COLOR_ID_COLUMN = 2;
-
-    public static final int CREATED_DATE_COLUMN = 3;
-
-    public static final int HAS_ATTACHMENT_COLUMN = 4;
-
-    public static final int MODIFIED_DATE_COLUMN = 5;
-
-    public static final int NOTES_COUNT_COLUMN = 6;
-
-    public static final int PARENT_ID_COLUMN = 7;
-
-    public static final int SNIPPET_COLUMN = 8;
-
-    public static final int TYPE_COLUMN = 9;
-
-    public static final int WIDGET_ID_COLUMN = 10;
-
-    public static final int WIDGET_TYPE_COLUMN = 11;
-
-    public static final int SYNC_ID_COLUMN = 12;
-
-    public static final int LOCAL_MODIFIED_COLUMN = 13;
-
-    public static final int ORIGIN_PARENT_ID_COLUMN = 14;
-
-    public static final int GTASK_ID_COLUMN = 15;
-
-    public static final int VERSION_COLUMN = 16;
-
-    private Context mContext;
-
-    private ContentResolver mContentResolver;
-
-    private boolean mIsCreate;
-
-    private long mId;
-
-    private long mAlertDate;
-
-    private int mBgColorId;
-
-    private long mCreatedDate;
-
-    private int mHasAttachment;
-
-    private long mModifiedDate;
-
-    private long mParentId;
-
-    private String mSnippet;
-
-    private int mType;
-
-    private int mWidgetId;
-
-    private int mWidgetType;
-
-    private long mOriginParent;
-
-    private long mVersion;
-
-    private ContentValues mDiffNoteValues;
-
-    private ArrayList<SqlData> mDataList;
-
-    public SqlNote(Context context) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mIsCreate = true;
-        mId = INVALID_ID;
-        mAlertDate = 0;
-        mBgColorId = ResourceParser.getDefaultBgId(context);
-        mCreatedDate = System.currentTimeMillis();
-        mHasAttachment = 0;
-        mModifiedDate = System.currentTimeMillis();
-        mParentId = 0;
-        mSnippet = "";
-        mType = Notes.TYPE_NOTE;
-        mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
-        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
-        mOriginParent = 0;
-        mVersion = 0;
-        mDiffNoteValues = new ContentValues();
-        mDataList = new ArrayList<SqlData>();
-    }
-
-    public SqlNote(Context context, Cursor c) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mIsCreate = false;
-        loadFromCursor(c);
-        mDataList = new ArrayList<SqlData>();
-        if (mType == Notes.TYPE_NOTE)
-            loadDataContent();
-        mDiffNoteValues = new ContentValues();
-    }
-
-    public SqlNote(Context context, long id) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mIsCreate = false;
-        loadFromCursor(id);
-        mDataList = new ArrayList<SqlData>();
-        if (mType == Notes.TYPE_NOTE)
-            loadDataContent();
-        mDiffNoteValues = new ContentValues();
-
-    }
-
-    private void loadFromCursor(long id) {
-        Cursor c = null;
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
-                    new String[] {
-                        String.valueOf(id)
-                    }, null);
-            if (c != null) {
-                c.moveToNext();
-                loadFromCursor(c);
-            } else {
-                Log.w(TAG, "loadFromCursor: cursor = null");
-            }
-        } finally {
-            if (c != null)
-                c.close();
-        }
-    }
-
-    private void loadFromCursor(Cursor c) {
-        mId = c.getLong(ID_COLUMN);
-        mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
-        mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
-        mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
-        mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
-        mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
-        mParentId = c.getLong(PARENT_ID_COLUMN);
-        mSnippet = c.getString(SNIPPET_COLUMN);
-        mType = c.getInt(TYPE_COLUMN);
-        mWidgetId = c.getInt(WIDGET_ID_COLUMN);
-        mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
-        mVersion = c.getLong(VERSION_COLUMN);
-    }
-
-    private void loadDataContent() {
-        Cursor c = null;
-        mDataList.clear();
-        try {
-            c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
-                    "(note_id=?)", new String[] {
-                        String.valueOf(mId)
-                    }, null);
-            if (c != null) {
-                if (c.getCount() == 0) {
-                    Log.w(TAG, "it seems that the note has not data");
-                    return;
-                }
-                while (c.moveToNext()) {
-                    SqlData data = new SqlData(mContext, c);
-                    mDataList.add(data);
-                }
-            } else {
-                Log.w(TAG, "loadDataContent: cursor = null");
-            }
-        } finally {
-            if (c != null)
-                c.close();
-        }
-    }
-
-    public boolean setContent(JSONObject js) {
-        try {
-            JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-            if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
-                Log.w(TAG, "cannot set system folder");
-            } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
-                // for folder we can only update the snnipet and type
-                String snippet = note.has(NoteColumns.SNIPPET) ? note
-                        .getString(NoteColumns.SNIPPET) : "";
-                if (mIsCreate || !mSnippet.equals(snippet)) {
-                    mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
-                }
-                mSnippet = snippet;
-
-                int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
-                        : Notes.TYPE_NOTE;
-                if (mIsCreate || mType != type) {
-                    mDiffNoteValues.put(NoteColumns.TYPE, type);
-                }
-                mType = type;
-            } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
-                JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-                long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
-                if (mIsCreate || mId != id) {
-                    mDiffNoteValues.put(NoteColumns.ID, id);
-                }
-                mId = id;
-
-                long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
-                        .getLong(NoteColumns.ALERTED_DATE) : 0;
-                if (mIsCreate || mAlertDate != alertDate) {
-                    mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
-                }
-                mAlertDate = alertDate;
-
-                int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
-                        .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
-                if (mIsCreate || mBgColorId != bgColorId) {
-                    mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
-                }
-                mBgColorId = bgColorId;
-
-                long createDate = note.has(NoteColumns.CREATED_DATE) ? note
-                        .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
-                if (mIsCreate || mCreatedDate != createDate) {
-                    mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
-                }
-                mCreatedDate = createDate;
-
-                int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
-                        .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
-                if (mIsCreate || mHasAttachment != hasAttachment) {
-                    mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
-                }
-                mHasAttachment = hasAttachment;
-
-                long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
-                        .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
-                if (mIsCreate || mModifiedDate != modifiedDate) {
-                    mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
-                }
-                mModifiedDate = modifiedDate;
-
-                long parentId = note.has(NoteColumns.PARENT_ID) ? note
-                        .getLong(NoteColumns.PARENT_ID) : 0;
-                if (mIsCreate || mParentId != parentId) {
-                    mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
-                }
-                mParentId = parentId;
-
-                String snippet = note.has(NoteColumns.SNIPPET) ? note
-                        .getString(NoteColumns.SNIPPET) : "";
-                if (mIsCreate || !mSnippet.equals(snippet)) {
-                    mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
-                }
-                mSnippet = snippet;
-
-                int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
-                        : Notes.TYPE_NOTE;
-                if (mIsCreate || mType != type) {
-                    mDiffNoteValues.put(NoteColumns.TYPE, type);
-                }
-                mType = type;
-
-                int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
-                        : AppWidgetManager.INVALID_APPWIDGET_ID;
-                if (mIsCreate || mWidgetId != widgetId) {
-                    mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
-                }
-                mWidgetId = widgetId;
-
-                int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
-                        .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
-                if (mIsCreate || mWidgetType != widgetType) {
-                    mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
-                }
-                mWidgetType = widgetType;
-
-                long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
-                        .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
-                if (mIsCreate || mOriginParent != originParent) {
-                    mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
-                }
-                mOriginParent = originParent;
-
-                for (int i = 0; i < dataArray.length(); i++) {
-                    JSONObject data = dataArray.getJSONObject(i);
-                    SqlData sqlData = null;
-                    if (data.has(DataColumns.ID)) {
-                        long dataId = data.getLong(DataColumns.ID);
-                        for (SqlData temp : mDataList) {
-                            if (dataId == temp.getId()) {
-                                sqlData = temp;
-                            }
-                        }
-                    }
-
-                    if (sqlData == null) {
-                        sqlData = new SqlData(mContext);
-                        mDataList.add(sqlData);
-                    }
-
-                    sqlData.setContent(data);
-                }
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    public JSONObject getContent() {
-        try {
-            JSONObject js = new JSONObject();
-
-            if (mIsCreate) {
-                Log.e(TAG, "it seems that we haven't created this in database yet");
-                return null;
-            }
-
-            JSONObject note = new JSONObject();
-            if (mType == Notes.TYPE_NOTE) {
-                note.put(NoteColumns.ID, mId);
-                note.put(NoteColumns.ALERTED_DATE, mAlertDate);
-                note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
-                note.put(NoteColumns.CREATED_DATE, mCreatedDate);
-                note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
-                note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
-                note.put(NoteColumns.PARENT_ID, mParentId);
-                note.put(NoteColumns.SNIPPET, mSnippet);
-                note.put(NoteColumns.TYPE, mType);
-                note.put(NoteColumns.WIDGET_ID, mWidgetId);
-                note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
-                note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
-                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-
-                JSONArray dataArray = new JSONArray();
-                for (SqlData sqlData : mDataList) {
-                    JSONObject data = sqlData.getContent();
-                    if (data != null) {
-                        dataArray.put(data);
-                    }
-                }
-                js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
-            } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
-                note.put(NoteColumns.ID, mId);
-                note.put(NoteColumns.TYPE, mType);
-                note.put(NoteColumns.SNIPPET, mSnippet);
-                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-            }
-
-            return js;
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public void setParentId(long id) {
-        mParentId = id;
-        mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
-    }
-
-    public void setGtaskId(String gid) {
-        mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
-    }
-
-    public void setSyncId(long syncId) {
-        mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
-    }
-
-    public void resetLocalModified() {
-        mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
-    }
-
-    public long getId() {
-        return mId;
-    }
-
-    public long getParentId() {
-        return mParentId;
-    }
-
-    public String getSnippet() {
-        return mSnippet;
-    }
-
-    public boolean isNoteType() {
-        return mType == Notes.TYPE_NOTE;
-    }
-
-    public void commit(boolean validateVersion) {
-        if (mIsCreate) {
-            if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
-                mDiffNoteValues.remove(NoteColumns.ID);
-            }
-
-            Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
-            try {
-                mId = Long.valueOf(uri.getPathSegments().get(1));
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "Get note id error :" + e.toString());
-                throw new ActionFailureException("create note failed");
-            }
-            if (mId == 0) {
-                throw new IllegalStateException("Create thread id failed");
-            }
-
-            if (mType == Notes.TYPE_NOTE) {
-                for (SqlData sqlData : mDataList) {
-                    sqlData.commit(mId, false, -1);
-                }
-            }
-        } else {
-            if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
-                Log.e(TAG, "No such note");
-                throw new IllegalStateException("Try to update note with invalid id");
-            }
-            if (mDiffNoteValues.size() > 0) {
-                mVersion ++;
-                int result = 0;
-                if (!validateVersion) {
-                    result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
-                            + NoteColumns.ID + "=?)", new String[] {
-                        String.valueOf(mId)
-                    });
-                } else {
-                    result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
-                            + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
-                            new String[] {
-                                    String.valueOf(mId), String.valueOf(mVersion)
-                            });
-                }
-                if (result == 0) {
-                    Log.w(TAG, "there is no update. maybe user updates note when syncing");
-                }
-            }
-
-            if (mType == Notes.TYPE_NOTE) {
-                for (SqlData sqlData : mDataList) {
-                    sqlData.commit(mId, validateVersion, mVersion);
-                }
-            }
-        }
-
-        // refresh local info
-        loadFromCursor(mId);
-        if (mType == Notes.TYPE_NOTE)
-            loadDataContent();
-
-        mDiffNoteValues.clear();
-        mIsCreate = false;
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java
deleted file mode 100644
index 6a19454..0000000
--- a/src/main/java/net/micode/notes/gtask/data/Task.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class Task extends Node {
-    private static final String TAG = Task.class.getSimpleName();
-
-    private boolean mCompleted;
-
-    private String mNotes;
-
-    private JSONObject mMetaInfo;
-
-    private Task mPriorSibling;
-
-    private TaskList mParent;
-
-    public Task() {
-        super();
-        mCompleted = false;
-        mNotes = null;
-        mPriorSibling = null;
-        mParent = null;
-        mMetaInfo = null;
-    }
-
-    public JSONObject getCreateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // index
-            js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
-            entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
-                    GTaskStringUtils.GTASK_JSON_TYPE_TASK);
-            if (getNotes() != null) {
-                entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
-            }
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-            // parent_id
-            js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
-
-            // dest_parent_type
-            js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
-                    GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
-
-            // list_id
-            js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
-
-            // prior_sibling_id
-            if (mPriorSibling != null) {
-                js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
-            }
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate task-create jsonobject");
-        }
-
-        return js;
-    }
-
-    public JSONObject getUpdateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // id
-            js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            if (getNotes() != null) {
-                entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
-            }
-            entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate task-update jsonobject");
-        }
-
-        return js;
-    }
-
-    public void setContentByRemoteJSON(JSONObject js) {
-        if (js != null) {
-            try {
-                // id
-                if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
-                    setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
-                }
-
-                // last_modified
-                if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
-                    setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
-                }
-
-                // name
-                if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
-                    setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
-                }
-
-                // notes
-                if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
-                    setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
-                }
-
-                // deleted
-                if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
-                    setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
-                }
-
-                // completed
-                if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
-                    setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
-                }
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-                throw new ActionFailureException("fail to get task content from jsonobject");
-            }
-        }
-    }
-
-    public void setContentByLocalJSON(JSONObject js) {
-        if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
-                || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
-            Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
-        }
-
-        try {
-            JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-            JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
-            if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
-                Log.e(TAG, "invalid type");
-                return;
-            }
-
-            for (int i = 0; i < dataArray.length(); i++) {
-                JSONObject data = dataArray.getJSONObject(i);
-                if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
-                    setName(data.getString(DataColumns.CONTENT));
-                    break;
-                }
-            }
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-    }
-
-    public JSONObject getLocalJSONFromContent() {
-        String name = getName();
-        try {
-            if (mMetaInfo == null) {
-                // new task created from web
-                if (name == null) {
-                    Log.w(TAG, "the note seems to be an empty one");
-                    return null;
-                }
-
-                JSONObject js = new JSONObject();
-                JSONObject note = new JSONObject();
-                JSONArray dataArray = new JSONArray();
-                JSONObject data = new JSONObject();
-                data.put(DataColumns.CONTENT, name);
-                dataArray.put(data);
-                js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
-                note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-                js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-                return js;
-            } else {
-                // synced task
-                JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-                JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
-                for (int i = 0; i < dataArray.length(); i++) {
-                    JSONObject data = dataArray.getJSONObject(i);
-                    if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
-                        data.put(DataColumns.CONTENT, getName());
-                        break;
-                    }
-                }
-
-                note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-                return mMetaInfo;
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public void setMetaInfo(MetaData metaData) {
-        if (metaData != null && metaData.getNotes() != null) {
-            try {
-                mMetaInfo = new JSONObject(metaData.getNotes());
-            } catch (JSONException e) {
-                Log.w(TAG, e.toString());
-                mMetaInfo = null;
-            }
-        }
-    }
-
-    public int getSyncAction(Cursor c) {
-        try {
-            JSONObject noteInfo = null;
-            if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
-                noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-            }
-
-            if (noteInfo == null) {
-                Log.w(TAG, "it seems that note meta has been deleted");
-                return SYNC_ACTION_UPDATE_REMOTE;
-            }
-
-            if (!noteInfo.has(NoteColumns.ID)) {
-                Log.w(TAG, "remote note id seems to be deleted");
-                return SYNC_ACTION_UPDATE_LOCAL;
-            }
-
-            // validate the note id now
-            if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
-                Log.w(TAG, "note id doesn't match");
-                return SYNC_ACTION_UPDATE_LOCAL;
-            }
-
-            if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
-                // there is no local update
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // no update both side
-                    return SYNC_ACTION_NONE;
-                } else {
-                    // apply remote to local
-                    return SYNC_ACTION_UPDATE_LOCAL;
-                }
-            } else {
-                // validate gtask id
-                if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
-                    Log.e(TAG, "gtask id doesn't match");
-                    return SYNC_ACTION_ERROR;
-                }
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // local modification only
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                } else {
-                    return SYNC_ACTION_UPDATE_CONFLICT;
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-
-        return SYNC_ACTION_ERROR;
-    }
-
-    public boolean isWorthSaving() {
-        return mMetaInfo != null || (getName() != null && getName().trim().length() > 0)
-                || (getNotes() != null && getNotes().trim().length() > 0);
-    }
-
-    public void setCompleted(boolean completed) {
-        this.mCompleted = completed;
-    }
-
-    public void setNotes(String notes) {
-        this.mNotes = notes;
-    }
-
-    public void setPriorSibling(Task priorSibling) {
-        this.mPriorSibling = priorSibling;
-    }
-
-    public void setParent(TaskList parent) {
-        this.mParent = parent;
-    }
-
-    public boolean getCompleted() {
-        return this.mCompleted;
-    }
-
-    public String getNotes() {
-        return this.mNotes;
-    }
-
-    public Task getPriorSibling() {
-        return this.mPriorSibling;
-    }
-
-    public TaskList getParent() {
-        return this.mParent;
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java
deleted file mode 100644
index 4ea21c5..0000000
--- a/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class TaskList extends Node {
-    private static final String TAG = TaskList.class.getSimpleName();
-
-    private int mIndex;
-
-    private ArrayList<Task> mChildren;
-
-    public TaskList() {
-        super();
-        mChildren = new ArrayList<Task>();
-        mIndex = 1;
-    }
-
-    public JSONObject getCreateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // index
-            js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
-            entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
-                    GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate tasklist-create jsonobject");
-        }
-
-        return js;
-    }
-
-    public JSONObject getUpdateAction(int actionId) {
-        JSONObject js = new JSONObject();
-
-        try {
-            // action_type
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
-            // action_id
-            js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
-            // id
-            js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
-            // entity_delta
-            JSONObject entity = new JSONObject();
-            entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
-            entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
-            js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("fail to generate tasklist-update jsonobject");
-        }
-
-        return js;
-    }
-
-    public void setContentByRemoteJSON(JSONObject js) {
-        if (js != null) {
-            try {
-                // id
-                if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
-                    setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
-                }
-
-                // last_modified
-                if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
-                    setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
-                }
-
-                // name
-                if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
-                    setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
-                }
-
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-                throw new ActionFailureException("fail to get tasklist content from jsonobject");
-            }
-        }
-    }
-
-    public void setContentByLocalJSON(JSONObject js) {
-        if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
-            Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
-        }
-
-        try {
-            JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
-            if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
-                String name = folder.getString(NoteColumns.SNIPPET);
-                setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
-            } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
-                if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
-                    setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
-                else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
-                    setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                            + GTaskStringUtils.FOLDER_CALL_NOTE);
-                else
-                    Log.e(TAG, "invalid system folder");
-            } else {
-                Log.e(TAG, "error type");
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-    }
-
-    public JSONObject getLocalJSONFromContent() {
-        try {
-            JSONObject js = new JSONObject();
-            JSONObject folder = new JSONObject();
-
-            String folderName = getName();
-            if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX))
-                folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
-                        folderName.length());
-            folder.put(NoteColumns.SNIPPET, folderName);
-            if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT)
-                    || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE))
-                folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
-            else
-                folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-
-            js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
-
-            return js;
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public int getSyncAction(Cursor c) {
-        try {
-            if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
-                // there is no local update
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // no update both side
-                    return SYNC_ACTION_NONE;
-                } else {
-                    // apply remote to local
-                    return SYNC_ACTION_UPDATE_LOCAL;
-                }
-            } else {
-                // validate gtask id
-                if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
-                    Log.e(TAG, "gtask id doesn't match");
-                    return SYNC_ACTION_ERROR;
-                }
-                if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
-                    // local modification only
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                } else {
-                    // for folder conflicts, just apply local modification
-                    return SYNC_ACTION_UPDATE_REMOTE;
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-        }
-
-        return SYNC_ACTION_ERROR;
-    }
-
-    public int getChildTaskCount() {
-        return mChildren.size();
-    }
-
-    public boolean addChildTask(Task task) {
-        boolean ret = false;
-        if (task != null && !mChildren.contains(task)) {
-            ret = mChildren.add(task);
-            if (ret) {
-                // need to set prior sibling and parent
-                task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
-                        .get(mChildren.size() - 1));
-                task.setParent(this);
-            }
-        }
-        return ret;
-    }
-
-    public boolean addChildTask(Task task, int index) {
-        if (index < 0 || index > mChildren.size()) {
-            Log.e(TAG, "add child task: invalid index");
-            return false;
-        }
-
-        int pos = mChildren.indexOf(task);
-        if (task != null && pos == -1) {
-            mChildren.add(index, task);
-
-            // update the task list
-            Task preTask = null;
-            Task afterTask = null;
-            if (index != 0)
-                preTask = mChildren.get(index - 1);
-            if (index != mChildren.size() - 1)
-                afterTask = mChildren.get(index + 1);
-
-            task.setPriorSibling(preTask);
-            if (afterTask != null)
-                afterTask.setPriorSibling(task);
-        }
-
-        return true;
-    }
-
-    public boolean removeChildTask(Task task) {
-        boolean ret = false;
-        int index = mChildren.indexOf(task);
-        if (index != -1) {
-            ret = mChildren.remove(task);
-
-            if (ret) {
-                // reset prior sibling and parent
-                task.setPriorSibling(null);
-                task.setParent(null);
-
-                // update the task list
-                if (index != mChildren.size()) {
-                    mChildren.get(index).setPriorSibling(
-                            index == 0 ? null : mChildren.get(index - 1));
-                }
-            }
-        }
-        return ret;
-    }
-
-    public boolean moveChildTask(Task task, int index) {
-
-        if (index < 0 || index >= mChildren.size()) {
-            Log.e(TAG, "move child task: invalid index");
-            return false;
-        }
-
-        int pos = mChildren.indexOf(task);
-        if (pos == -1) {
-            Log.e(TAG, "move child task: the task should in the list");
-            return false;
-        }
-
-        if (pos == index)
-            return true;
-        return (removeChildTask(task) && addChildTask(task, index));
-    }
-
-    public Task findChildTaskByGid(String gid) {
-        for (int i = 0; i < mChildren.size(); i++) {
-            Task t = mChildren.get(i);
-            if (t.getGid().equals(gid)) {
-                return t;
-            }
-        }
-        return null;
-    }
-
-    public int getChildTaskIndex(Task task) {
-        return mChildren.indexOf(task);
-    }
-
-    public Task getChildTaskByIndex(int index) {
-        if (index < 0 || index >= mChildren.size()) {
-            Log.e(TAG, "getTaskByIndex: invalid index");
-            return null;
-        }
-        return mChildren.get(index);
-    }
-
-    public Task getChilTaskByGid(String gid) {
-        for (Task task : mChildren) {
-            if (task.getGid().equals(gid))
-                return task;
-        }
-        return null;
-    }
-
-    public ArrayList<Task> getChildTaskList() {
-        return this.mChildren;
-    }
-
-    public void setIndex(int index) {
-        this.mIndex = index;
-    }
-
-    public int getIndex() {
-        return this.mIndex;
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
deleted file mode 100644
index 15504be..0000000
--- a/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.exception;
-
-public class ActionFailureException extends RuntimeException {
-    private static final long serialVersionUID = 4425249765923293627L;
-
-    public ActionFailureException() {
-        super();
-    }
-
-    public ActionFailureException(String paramString) {
-        super(paramString);
-    }
-
-    public ActionFailureException(String paramString, Throwable paramThrowable) {
-        super(paramString, paramThrowable);
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
deleted file mode 100644
index b08cfb1..0000000
--- a/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.exception;
-
-public class NetworkFailureException extends Exception {
-    private static final long serialVersionUID = 2107610287180234136L;
-
-    public NetworkFailureException() {
-        super();
-    }
-
-    public NetworkFailureException(String paramString) {
-        super(paramString);
-    }
-
-    public NetworkFailureException(String paramString, Throwable paramThrowable) {
-        super(paramString, paramThrowable);
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
deleted file mode 100644
index 7aaa66a..0000000
--- a/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-
-public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
-
-    private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
-
-    public interface OnCompleteListener {
-        void onComplete();
-    }
-
-    private Context mContext;
-
-    private NotificationManager mNotifiManager;
-
-    private GTaskManager mTaskManager;
-
-    private OnCompleteListener mOnCompleteListener;
-
-    public GTaskASyncTask(Context context, OnCompleteListener listener) {
-        mContext = context;
-        mOnCompleteListener = listener;
-        mNotifiManager = (NotificationManager) mContext
-                .getSystemService(Context.NOTIFICATION_SERVICE);
-        mTaskManager = GTaskManager.getInstance();
-    }
-
-    public void cancelSync() {
-        mTaskManager.cancelSync();
-    }
-
-    public void publishProgess(String message) {
-        publishProgress(new String[] {
-            message
-        });
-    }
-
-    private void showNotification(int tickerId, String content) {
-        PendingIntent pendingIntent;
-        if (tickerId != R.string.ticker_success) {
-            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesPreferenceActivity.class), 0);
-
-        } else {
-            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesListActivity.class), 0);
-        }
-        Notification notification = new Notification.Builder(mContext)
-                .setAutoCancel(true)
-                .setContentTitle("title")
-                .setContentText("describe")
-                .setContentIntent(pendingIntent)
-                .setWhen(System.currentTimeMillis())
-                .build();
-        notification.defaults = Notification.DEFAULT_LIGHTS;
-        notification.flags = Notification.FLAG_AUTO_CANCEL;
-        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
-    }
-
-    @Override
-    protected Integer doInBackground(Void... unused) {
-        publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
-                .getSyncAccountName(mContext)));
-        return mTaskManager.sync(mContext, this);
-    }
-
-    @Override
-    protected void onProgressUpdate(String... progress) {
-        showNotification(R.string.ticker_syncing, progress[0]);
-        if (mContext instanceof GTaskSyncService) {
-            ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
-        }
-    }
-
-    @Override
-    protected void onPostExecute(Integer result) {
-        if (result == GTaskManager.STATE_SUCCESS) {
-            showNotification(R.string.ticker_success, mContext.getString(
-                    R.string.success_sync_account, mTaskManager.getSyncAccount()));
-            NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
-        } else if (result == GTaskManager.STATE_NETWORK_ERROR) {
-            showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
-        } else if (result == GTaskManager.STATE_INTERNAL_ERROR) {
-            showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal));
-        } else if (result == GTaskManager.STATE_SYNC_CANCELLED) {
-            showNotification(R.string.ticker_cancel, mContext
-                    .getString(R.string.error_sync_cancelled));
-        }
-        if (mOnCompleteListener != null) {
-            new Thread(new Runnable() {
-
-                public void run() {
-                    mOnCompleteListener.onComplete();
-                }
-            }).start();
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
deleted file mode 100644
index c67dfdf..0000000
--- a/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerFuture;
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-
-public class GTaskClient {
-    private static final String TAG = GTaskClient.class.getSimpleName();
-
-    private static final String GTASK_URL = "https://mail.google.com/tasks/";
-
-    private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig";
-
-    private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig";
-
-    private static GTaskClient mInstance = null;
-
-    private DefaultHttpClient mHttpClient;
-
-    private String mGetUrl;
-
-    private String mPostUrl;
-
-    private long mClientVersion;
-
-    private boolean mLoggedin;
-
-    private long mLastLoginTime;
-
-    private int mActionId;
-
-    private Account mAccount;
-
-    private JSONArray mUpdateArray;
-
-    private GTaskClient() {
-        mHttpClient = null;
-        mGetUrl = GTASK_GET_URL;
-        mPostUrl = GTASK_POST_URL;
-        mClientVersion = -1;
-        mLoggedin = false;
-        mLastLoginTime = 0;
-        mActionId = 1;
-        mAccount = null;
-        mUpdateArray = null;
-    }
-
-    public static synchronized GTaskClient getInstance() {
-        if (mInstance == null) {
-            mInstance = new GTaskClient();
-        }
-        return mInstance;
-    }
-
-    public boolean login(Activity activity) {
-        // we suppose that the cookie would expire after 5 minutes
-        // then we need to re-login
-        final long interval = 1000 * 60 * 5;
-        if (mLastLoginTime + interval < System.currentTimeMillis()) {
-            mLoggedin = false;
-        }
-
-        // need to re-login after account switch
-        if (mLoggedin
-                && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
-                        .getSyncAccountName(activity))) {
-            mLoggedin = false;
-        }
-
-        if (mLoggedin) {
-            Log.d(TAG, "already logged in");
-            return true;
-        }
-
-        mLastLoginTime = System.currentTimeMillis();
-        String authToken = loginGoogleAccount(activity, false);
-        if (authToken == null) {
-            Log.e(TAG, "login google account failed");
-            return false;
-        }
-
-        // login with custom domain if necessary
-        if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
-                .endsWith("googlemail.com"))) {
-            StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
-            int index = mAccount.name.indexOf('@') + 1;
-            String suffix = mAccount.name.substring(index);
-            url.append(suffix + "/");
-            mGetUrl = url.toString() + "ig";
-            mPostUrl = url.toString() + "r/ig";
-
-            if (tryToLoginGtask(activity, authToken)) {
-                mLoggedin = true;
-            }
-        }
-
-        // try to login with google official url
-        if (!mLoggedin) {
-            mGetUrl = GTASK_GET_URL;
-            mPostUrl = GTASK_POST_URL;
-            if (!tryToLoginGtask(activity, authToken)) {
-                return false;
-            }
-        }
-
-        mLoggedin = true;
-        return true;
-    }
-
-    private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
-        String authToken;
-        AccountManager accountManager = AccountManager.get(activity);
-        Account[] accounts = accountManager.getAccountsByType("com.google");
-
-        if (accounts.length == 0) {
-            Log.e(TAG, "there is no available google account");
-            return null;
-        }
-
-        String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
-        Account account = null;
-        for (Account a : accounts) {
-            if (a.name.equals(accountName)) {
-                account = a;
-                break;
-            }
-        }
-        if (account != null) {
-            mAccount = account;
-        } else {
-            Log.e(TAG, "unable to get an account with the same name in the settings");
-            return null;
-        }
-
-        // get the token now
-        AccountManagerFuture<Bundle> accountManagerFuture = accountManager.getAuthToken(account,
-                "goanna_mobile", null, activity, null, null);
-        try {
-            Bundle authTokenBundle = accountManagerFuture.getResult();
-            authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
-            if (invalidateToken) {
-                accountManager.invalidateAuthToken("com.google", authToken);
-                loginGoogleAccount(activity, false);
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "get auth token failed");
-            authToken = null;
-        }
-
-        return authToken;
-    }
-
-    private boolean tryToLoginGtask(Activity activity, String authToken) {
-        if (!loginGtask(authToken)) {
-            // maybe the auth token is out of date, now let's invalidate the
-            // token and try again
-            authToken = loginGoogleAccount(activity, true);
-            if (authToken == null) {
-                Log.e(TAG, "login google account failed");
-                return false;
-            }
-
-            if (!loginGtask(authToken)) {
-                Log.e(TAG, "login gtask failed");
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean loginGtask(String authToken) {
-        int timeoutConnection = 10000;
-        int timeoutSocket = 15000;
-        HttpParams httpParameters = new BasicHttpParams();
-        HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
-        HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
-        mHttpClient = new DefaultHttpClient(httpParameters);
-        BasicCookieStore localBasicCookieStore = new BasicCookieStore();
-        mHttpClient.setCookieStore(localBasicCookieStore);
-        HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
-
-        // login gtask
-        try {
-            String loginUrl = mGetUrl + "?auth=" + authToken;
-            HttpGet httpGet = new HttpGet(loginUrl);
-            HttpResponse response = null;
-            response = mHttpClient.execute(httpGet);
-
-            // get the cookie now
-            List<Cookie> cookies = mHttpClient.getCookieStore().getCookies();
-            boolean hasAuthCookie = false;
-            for (Cookie cookie : cookies) {
-                if (cookie.getName().contains("GTL")) {
-                    hasAuthCookie = true;
-                }
-            }
-            if (!hasAuthCookie) {
-                Log.w(TAG, "it seems that there is no auth cookie");
-            }
-
-            // get the client version
-            String resString = getResponseContent(response.getEntity());
-            String jsBegin = "_setup(";
-            String jsEnd = ")}</script>";
-            int begin = resString.indexOf(jsBegin);
-            int end = resString.lastIndexOf(jsEnd);
-            String jsString = null;
-            if (begin != -1 && end != -1 && begin < end) {
-                jsString = resString.substring(begin + jsBegin.length(), end);
-            }
-            JSONObject js = new JSONObject(jsString);
-            mClientVersion = js.getLong("v");
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return false;
-        } catch (Exception e) {
-            // simply catch all exceptions
-            Log.e(TAG, "httpget gtask_url failed");
-            return false;
-        }
-
-        return true;
-    }
-
-    private int getActionId() {
-        return mActionId++;
-    }
-
-    private HttpPost createHttpPost() {
-        HttpPost httpPost = new HttpPost(mPostUrl);
-        httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
-        httpPost.setHeader("AT", "1");
-        return httpPost;
-    }
-
-    private String getResponseContent(HttpEntity entity) throws IOException {
-        String contentEncoding = null;
-        if (entity.getContentEncoding() != null) {
-            contentEncoding = entity.getContentEncoding().getValue();
-            Log.d(TAG, "encoding: " + contentEncoding);
-        }
-
-        InputStream input = entity.getContent();
-        if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
-            input = new GZIPInputStream(entity.getContent());
-        } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
-            Inflater inflater = new Inflater(true);
-            input = new InflaterInputStream(entity.getContent(), inflater);
-        }
-
-        try {
-            InputStreamReader isr = new InputStreamReader(input);
-            BufferedReader br = new BufferedReader(isr);
-            StringBuilder sb = new StringBuilder();
-
-            while (true) {
-                String buff = br.readLine();
-                if (buff == null) {
-                    return sb.toString();
-                }
-                sb = sb.append(buff);
-            }
-        } finally {
-            input.close();
-        }
-    }
-
-    private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
-        if (!mLoggedin) {
-            Log.e(TAG, "please login first");
-            throw new ActionFailureException("not logged in");
-        }
-
-        HttpPost httpPost = createHttpPost();
-        try {
-            LinkedList<BasicNameValuePair> list = new LinkedList<BasicNameValuePair>();
-            list.add(new BasicNameValuePair("r", js.toString()));
-            UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
-            httpPost.setEntity(entity);
-
-            // execute the post
-            HttpResponse response = mHttpClient.execute(httpPost);
-            String jsString = getResponseContent(response.getEntity());
-            return new JSONObject(jsString);
-
-        } catch (ClientProtocolException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("postRequest failed");
-        } catch (IOException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("postRequest failed");
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("unable to convert response content to jsonobject");
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("error occurs when posting request");
-        }
-    }
-
-    public void createTask(Task task) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-
-            // action_list
-            actionList.put(task.getCreateAction(getActionId()));
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            // post
-            JSONObject jsResponse = postRequest(jsPost);
-            JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
-                    GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
-            task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("create task: handing jsonobject failed");
-        }
-    }
-
-    public void createTaskList(TaskList tasklist) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-
-            // action_list
-            actionList.put(tasklist.getCreateAction(getActionId()));
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            // post
-            JSONObject jsResponse = postRequest(jsPost);
-            JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
-                    GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
-            tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("create tasklist: handing jsonobject failed");
-        }
-    }
-
-    public void commitUpdate() throws NetworkFailureException {
-        if (mUpdateArray != null) {
-            try {
-                JSONObject jsPost = new JSONObject();
-
-                // action_list
-                jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray);
-
-                // client_version
-                jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-                postRequest(jsPost);
-                mUpdateArray = null;
-            } catch (JSONException e) {
-                Log.e(TAG, e.toString());
-                e.printStackTrace();
-                throw new ActionFailureException("commit update: handing jsonobject failed");
-            }
-        }
-    }
-
-    public void addUpdateNode(Node node) throws NetworkFailureException {
-        if (node != null) {
-            // too many update items may result in an error
-            // set max to 10 items
-            if (mUpdateArray != null && mUpdateArray.length() > 10) {
-                commitUpdate();
-            }
-
-            if (mUpdateArray == null)
-                mUpdateArray = new JSONArray();
-            mUpdateArray.put(node.getUpdateAction(getActionId()));
-        }
-    }
-
-    public void moveTask(Task task, TaskList preParent, TaskList curParent)
-            throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-            JSONObject action = new JSONObject();
-
-            // action_list
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE);
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
-            action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid());
-            if (preParent == curParent && task.getPriorSibling() != null) {
-                // put prioring_sibing_id only if moving within the tasklist and
-                // it is not the first one
-                action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
-            }
-            action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid());
-            action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid());
-            if (preParent != curParent) {
-                // put the dest_list only if moving between tasklists
-                action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
-            }
-            actionList.put(action);
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            postRequest(jsPost);
-
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("move task: handing jsonobject failed");
-        }
-    }
-
-    public void deleteNode(Node node) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-
-            // action_list
-            node.setDeleted(true);
-            actionList.put(node.getUpdateAction(getActionId()));
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            postRequest(jsPost);
-            mUpdateArray = null;
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("delete node: handing jsonobject failed");
-        }
-    }
-
-    public JSONArray getTaskLists() throws NetworkFailureException {
-        if (!mLoggedin) {
-            Log.e(TAG, "please login first");
-            throw new ActionFailureException("not logged in");
-        }
-
-        try {
-            HttpGet httpGet = new HttpGet(mGetUrl);
-            HttpResponse response = null;
-            response = mHttpClient.execute(httpGet);
-
-            // get the task list
-            String resString = getResponseContent(response.getEntity());
-            String jsBegin = "_setup(";
-            String jsEnd = ")}</script>";
-            int begin = resString.indexOf(jsBegin);
-            int end = resString.lastIndexOf(jsEnd);
-            String jsString = null;
-            if (begin != -1 && end != -1 && begin < end) {
-                jsString = resString.substring(begin + jsBegin.length(), end);
-            }
-            JSONObject js = new JSONObject(jsString);
-            return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
-        } catch (ClientProtocolException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("gettasklists: httpget failed");
-        } catch (IOException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new NetworkFailureException("gettasklists: httpget failed");
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("get task lists: handing jasonobject failed");
-        }
-    }
-
-    public JSONArray getTaskList(String listGid) throws NetworkFailureException {
-        commitUpdate();
-        try {
-            JSONObject jsPost = new JSONObject();
-            JSONArray actionList = new JSONArray();
-            JSONObject action = new JSONObject();
-
-            // action_list
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
-                    GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
-            action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
-            action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
-            action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
-            actionList.put(action);
-            jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
-            // client_version
-            jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
-            JSONObject jsResponse = postRequest(jsPost);
-            return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS);
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("get task list: handing jsonobject failed");
-        }
-    }
-
-    public Account getSyncAccount() {
-        return mAccount;
-    }
-
-    public void resetUpdateArray() {
-        mUpdateArray = null;
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
deleted file mode 100644
index d2b4082..0000000
--- a/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ /dev/null
@@ -1,800 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.data.MetaData;
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.SqlNote;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
-
-public class GTaskManager {
-    private static final String TAG = GTaskManager.class.getSimpleName();
-
-    public static final int STATE_SUCCESS = 0;
-
-    public static final int STATE_NETWORK_ERROR = 1;
-
-    public static final int STATE_INTERNAL_ERROR = 2;
-
-    public static final int STATE_SYNC_IN_PROGRESS = 3;
-
-    public static final int STATE_SYNC_CANCELLED = 4;
-
-    private static GTaskManager mInstance = null;
-
-    private Activity mActivity;
-
-    private Context mContext;
-
-    private ContentResolver mContentResolver;
-
-    private boolean mSyncing;
-
-    private boolean mCancelled;
-
-    private HashMap<String, TaskList> mGTaskListHashMap;
-
-    private HashMap<String, Node> mGTaskHashMap;
-
-    private HashMap<String, MetaData> mMetaHashMap;
-
-    private TaskList mMetaList;
-
-    private HashSet<Long> mLocalDeleteIdMap;
-
-    private HashMap<String, Long> mGidToNid;
-
-    private HashMap<Long, String> mNidToGid;
-
-    private GTaskManager() {
-        mSyncing = false;
-        mCancelled = false;
-        mGTaskListHashMap = new HashMap<String, TaskList>();
-        mGTaskHashMap = new HashMap<String, Node>();
-        mMetaHashMap = new HashMap<String, MetaData>();
-        mMetaList = null;
-        mLocalDeleteIdMap = new HashSet<Long>();
-        mGidToNid = new HashMap<String, Long>();
-        mNidToGid = new HashMap<Long, String>();
-    }
-
-    public static synchronized GTaskManager getInstance() {
-        if (mInstance == null) {
-            mInstance = new GTaskManager();
-        }
-        return mInstance;
-    }
-
-    public synchronized void setActivityContext(Activity activity) {
-        // used for getting authtoken
-        mActivity = activity;
-    }
-
-    public int sync(Context context, GTaskASyncTask asyncTask) {
-        if (mSyncing) {
-            Log.d(TAG, "Sync is in progress");
-            return STATE_SYNC_IN_PROGRESS;
-        }
-        mContext = context;
-        mContentResolver = mContext.getContentResolver();
-        mSyncing = true;
-        mCancelled = false;
-        mGTaskListHashMap.clear();
-        mGTaskHashMap.clear();
-        mMetaHashMap.clear();
-        mLocalDeleteIdMap.clear();
-        mGidToNid.clear();
-        mNidToGid.clear();
-
-        try {
-            GTaskClient client = GTaskClient.getInstance();
-            client.resetUpdateArray();
-
-            // login google task
-            if (!mCancelled) {
-                if (!client.login(mActivity)) {
-                    throw new NetworkFailureException("login google task failed");
-                }
-            }
-
-            // get the task list from google
-            asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
-            initGTaskList();
-
-            // do content sync work
-            asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
-            syncContent();
-        } catch (NetworkFailureException e) {
-            Log.e(TAG, e.toString());
-            return STATE_NETWORK_ERROR;
-        } catch (ActionFailureException e) {
-            Log.e(TAG, e.toString());
-            return STATE_INTERNAL_ERROR;
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            return STATE_INTERNAL_ERROR;
-        } finally {
-            mGTaskListHashMap.clear();
-            mGTaskHashMap.clear();
-            mMetaHashMap.clear();
-            mLocalDeleteIdMap.clear();
-            mGidToNid.clear();
-            mNidToGid.clear();
-            mSyncing = false;
-        }
-
-        return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
-    }
-
-    private void initGTaskList() throws NetworkFailureException {
-        if (mCancelled)
-            return;
-        GTaskClient client = GTaskClient.getInstance();
-        try {
-            JSONArray jsTaskLists = client.getTaskLists();
-
-            // init meta list first
-            mMetaList = null;
-            for (int i = 0; i < jsTaskLists.length(); i++) {
-                JSONObject object = jsTaskLists.getJSONObject(i);
-                String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
-                String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
-                if (name
-                        .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
-                    mMetaList = new TaskList();
-                    mMetaList.setContentByRemoteJSON(object);
-
-                    // load meta data
-                    JSONArray jsMetas = client.getTaskList(gid);
-                    for (int j = 0; j < jsMetas.length(); j++) {
-                        object = (JSONObject) jsMetas.getJSONObject(j);
-                        MetaData metaData = new MetaData();
-                        metaData.setContentByRemoteJSON(object);
-                        if (metaData.isWorthSaving()) {
-                            mMetaList.addChildTask(metaData);
-                            if (metaData.getGid() != null) {
-                                mMetaHashMap.put(metaData.getRelatedGid(), metaData);
-                            }
-                        }
-                    }
-                }
-            }
-
-            // create meta list if not existed
-            if (mMetaList == null) {
-                mMetaList = new TaskList();
-                mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                        + GTaskStringUtils.FOLDER_META);
-                GTaskClient.getInstance().createTaskList(mMetaList);
-            }
-
-            // init task list
-            for (int i = 0; i < jsTaskLists.length(); i++) {
-                JSONObject object = jsTaskLists.getJSONObject(i);
-                String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
-                String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
-                if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
-                        && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                                + GTaskStringUtils.FOLDER_META)) {
-                    TaskList tasklist = new TaskList();
-                    tasklist.setContentByRemoteJSON(object);
-                    mGTaskListHashMap.put(gid, tasklist);
-                    mGTaskHashMap.put(gid, tasklist);
-
-                    // load tasks
-                    JSONArray jsTasks = client.getTaskList(gid);
-                    for (int j = 0; j < jsTasks.length(); j++) {
-                        object = (JSONObject) jsTasks.getJSONObject(j);
-                        gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
-                        Task task = new Task();
-                        task.setContentByRemoteJSON(object);
-                        if (task.isWorthSaving()) {
-                            task.setMetaInfo(mMetaHashMap.get(gid));
-                            tasklist.addChildTask(task);
-                            mGTaskHashMap.put(gid, task);
-                        }
-                    }
-                }
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, e.toString());
-            e.printStackTrace();
-            throw new ActionFailureException("initGTaskList: handing JSONObject failed");
-        }
-    }
-
-    private void syncContent() throws NetworkFailureException {
-        int syncType;
-        Cursor c = null;
-        String gid;
-        Node node;
-
-        mLocalDeleteIdMap.clear();
-
-        if (mCancelled) {
-            return;
-        }
-
-        // for local deleted note
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type<>? AND parent_id=?)", new String[] {
-                            String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, null);
-            if (c != null) {
-                while (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c);
-                    }
-
-                    mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
-                }
-            } else {
-                Log.w(TAG, "failed to query trash folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // sync folder first
-        syncFolder();
-
-        // for note existing in database
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type=? AND parent_id<>?)", new String[] {
-                            String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, NoteColumns.TYPE + " DESC");
-            if (c != null) {
-                while (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
-                        mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
-                        syncType = node.getSyncAction(c);
-                    } else {
-                        if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
-                            // local add
-                            syncType = Node.SYNC_ACTION_ADD_REMOTE;
-                        } else {
-                            // remote delete
-                            syncType = Node.SYNC_ACTION_DEL_LOCAL;
-                        }
-                    }
-                    doContentSync(syncType, node, c);
-                }
-            } else {
-                Log.w(TAG, "failed to query existing note in database");
-            }
-
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // go through remaining items
-        Iterator<Map.Entry<String, Node>> iter = mGTaskHashMap.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, Node> entry = iter.next();
-            node = entry.getValue();
-            doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
-        }
-
-        // mCancelled can be set by another thread, so we neet to check one by
-        // one
-        // clear local delete table
-        if (!mCancelled) {
-            if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
-                throw new ActionFailureException("failed to batch-delete local deleted notes");
-            }
-        }
-
-        // refresh local sync id
-        if (!mCancelled) {
-            GTaskClient.getInstance().commitUpdate();
-            refreshLocalSyncId();
-        }
-
-    }
-
-    private void syncFolder() throws NetworkFailureException {
-        Cursor c = null;
-        String gid;
-        Node node;
-        int syncType;
-
-        if (mCancelled) {
-            return;
-        }
-
-        // for root folder
-        try {
-            c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
-                    Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
-            if (c != null) {
-                c.moveToNext();
-                gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                node = mGTaskHashMap.get(gid);
-                if (node != null) {
-                    mGTaskHashMap.remove(gid);
-                    mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
-                    mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
-                    // for system folder, only update remote name if necessary
-                    if (!node.getName().equals(
-                            GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
-                        doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
-                } else {
-                    doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
-                }
-            } else {
-                Log.w(TAG, "failed to query root folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // for call-note folder
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
-                    new String[] {
-                        String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
-                    }, null);
-            if (c != null) {
-                if (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
-                        mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
-                        // for system folder, only update remote name if
-                        // necessary
-                        if (!node.getName().equals(
-                                GTaskStringUtils.MIUI_FOLDER_PREFFIX
-                                        + GTaskStringUtils.FOLDER_CALL_NOTE))
-                            doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
-                    } else {
-                        doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
-                    }
-                }
-            } else {
-                Log.w(TAG, "failed to query call note folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // for local existing folders
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type=? AND parent_id<>?)", new String[] {
-                            String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, NoteColumns.TYPE + " DESC");
-            if (c != null) {
-                while (c.moveToNext()) {
-                    gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
-                        mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
-                        syncType = node.getSyncAction(c);
-                    } else {
-                        if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
-                            // local add
-                            syncType = Node.SYNC_ACTION_ADD_REMOTE;
-                        } else {
-                            // remote delete
-                            syncType = Node.SYNC_ACTION_DEL_LOCAL;
-                        }
-                    }
-                    doContentSync(syncType, node, c);
-                }
-            } else {
-                Log.w(TAG, "failed to query existing folder");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-
-        // for remote add folders
-        Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
-        while (iter.hasNext()) {
-            Map.Entry<String, TaskList> entry = iter.next();
-            gid = entry.getKey();
-            node = entry.getValue();
-            if (mGTaskHashMap.containsKey(gid)) {
-                mGTaskHashMap.remove(gid);
-                doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
-            }
-        }
-
-        if (!mCancelled)
-            GTaskClient.getInstance().commitUpdate();
-    }
-
-    private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        MetaData meta;
-        switch (syncType) {
-            case Node.SYNC_ACTION_ADD_LOCAL:
-                addLocalNode(node);
-                break;
-            case Node.SYNC_ACTION_ADD_REMOTE:
-                addRemoteNode(node, c);
-                break;
-            case Node.SYNC_ACTION_DEL_LOCAL:
-                meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN));
-                if (meta != null) {
-                    GTaskClient.getInstance().deleteNode(meta);
-                }
-                mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
-                break;
-            case Node.SYNC_ACTION_DEL_REMOTE:
-                meta = mMetaHashMap.get(node.getGid());
-                if (meta != null) {
-                    GTaskClient.getInstance().deleteNode(meta);
-                }
-                GTaskClient.getInstance().deleteNode(node);
-                break;
-            case Node.SYNC_ACTION_UPDATE_LOCAL:
-                updateLocalNode(node, c);
-                break;
-            case Node.SYNC_ACTION_UPDATE_REMOTE:
-                updateRemoteNode(node, c);
-                break;
-            case Node.SYNC_ACTION_UPDATE_CONFLICT:
-                // merging both modifications maybe a good idea
-                // right now just use local update simply
-                updateRemoteNode(node, c);
-                break;
-            case Node.SYNC_ACTION_NONE:
-                break;
-            case Node.SYNC_ACTION_ERROR:
-            default:
-                throw new ActionFailureException("unkown sync action type");
-        }
-    }
-
-    private void addLocalNode(Node node) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote;
-        if (node instanceof TaskList) {
-            if (node.getName().equals(
-                    GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) {
-                sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER);
-            } else if (node.getName().equals(
-                    GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) {
-                sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
-            } else {
-                sqlNote = new SqlNote(mContext);
-                sqlNote.setContent(node.getLocalJSONFromContent());
-                sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
-            }
-        } else {
-            sqlNote = new SqlNote(mContext);
-            JSONObject js = node.getLocalJSONFromContent();
-            try {
-                if (js.has(GTaskStringUtils.META_HEAD_NOTE)) {
-                    JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-                    if (note.has(NoteColumns.ID)) {
-                        long id = note.getLong(NoteColumns.ID);
-                        if (DataUtils.existInNoteDatabase(mContentResolver, id)) {
-                            // the id is not available, have to create a new one
-                            note.remove(NoteColumns.ID);
-                        }
-                    }
-                }
-
-                if (js.has(GTaskStringUtils.META_HEAD_DATA)) {
-                    JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-                    for (int i = 0; i < dataArray.length(); i++) {
-                        JSONObject data = dataArray.getJSONObject(i);
-                        if (data.has(DataColumns.ID)) {
-                            long dataId = data.getLong(DataColumns.ID);
-                            if (DataUtils.existInDataDatabase(mContentResolver, dataId)) {
-                                // the data id is not available, have to create
-                                // a new one
-                                data.remove(DataColumns.ID);
-                            }
-                        }
-                    }
-
-                }
-            } catch (JSONException e) {
-                Log.w(TAG, e.toString());
-                e.printStackTrace();
-            }
-            sqlNote.setContent(js);
-
-            Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
-            if (parentId == null) {
-                Log.e(TAG, "cannot find task's parent id locally");
-                throw new ActionFailureException("cannot add local node");
-            }
-            sqlNote.setParentId(parentId.longValue());
-        }
-
-        // create the local node
-        sqlNote.setGtaskId(node.getGid());
-        sqlNote.commit(false);
-
-        // update gid-nid mapping
-        mGidToNid.put(node.getGid(), sqlNote.getId());
-        mNidToGid.put(sqlNote.getId(), node.getGid());
-
-        // update meta
-        updateRemoteMeta(node.getGid(), sqlNote);
-    }
-
-    private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote;
-        // update the note locally
-        sqlNote = new SqlNote(mContext, c);
-        sqlNote.setContent(node.getLocalJSONFromContent());
-
-        Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid())
-                : new Long(Notes.ID_ROOT_FOLDER);
-        if (parentId == null) {
-            Log.e(TAG, "cannot find task's parent id locally");
-            throw new ActionFailureException("cannot update local node");
-        }
-        sqlNote.setParentId(parentId.longValue());
-        sqlNote.commit(true);
-
-        // update meta info
-        updateRemoteMeta(node.getGid(), sqlNote);
-    }
-
-    private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote = new SqlNote(mContext, c);
-        Node n;
-
-        // update remotely
-        if (sqlNote.isNoteType()) {
-            Task task = new Task();
-            task.setContentByLocalJSON(sqlNote.getContent());
-
-            String parentGid = mNidToGid.get(sqlNote.getParentId());
-            if (parentGid == null) {
-                Log.e(TAG, "cannot find task's parent tasklist");
-                throw new ActionFailureException("cannot add remote task");
-            }
-            mGTaskListHashMap.get(parentGid).addChildTask(task);
-
-            GTaskClient.getInstance().createTask(task);
-            n = (Node) task;
-
-            // add meta
-            updateRemoteMeta(task.getGid(), sqlNote);
-        } else {
-            TaskList tasklist = null;
-
-            // we need to skip folder if it has already existed
-            String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX;
-            if (sqlNote.getId() == Notes.ID_ROOT_FOLDER)
-                folderName += GTaskStringUtils.FOLDER_DEFAULT;
-            else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER)
-                folderName += GTaskStringUtils.FOLDER_CALL_NOTE;
-            else
-                folderName += sqlNote.getSnippet();
-
-            Iterator<Map.Entry<String, TaskList>> iter = mGTaskListHashMap.entrySet().iterator();
-            while (iter.hasNext()) {
-                Map.Entry<String, TaskList> entry = iter.next();
-                String gid = entry.getKey();
-                TaskList list = entry.getValue();
-
-                if (list.getName().equals(folderName)) {
-                    tasklist = list;
-                    if (mGTaskHashMap.containsKey(gid)) {
-                        mGTaskHashMap.remove(gid);
-                    }
-                    break;
-                }
-            }
-
-            // no match we can add now
-            if (tasklist == null) {
-                tasklist = new TaskList();
-                tasklist.setContentByLocalJSON(sqlNote.getContent());
-                GTaskClient.getInstance().createTaskList(tasklist);
-                mGTaskListHashMap.put(tasklist.getGid(), tasklist);
-            }
-            n = (Node) tasklist;
-        }
-
-        // update local note
-        sqlNote.setGtaskId(n.getGid());
-        sqlNote.commit(false);
-        sqlNote.resetLocalModified();
-        sqlNote.commit(true);
-
-        // gid-id mapping
-        mGidToNid.put(n.getGid(), sqlNote.getId());
-        mNidToGid.put(sqlNote.getId(), n.getGid());
-    }
-
-    private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        SqlNote sqlNote = new SqlNote(mContext, c);
-
-        // update remotely
-        node.setContentByLocalJSON(sqlNote.getContent());
-        GTaskClient.getInstance().addUpdateNode(node);
-
-        // update meta
-        updateRemoteMeta(node.getGid(), sqlNote);
-
-        // move task if necessary
-        if (sqlNote.isNoteType()) {
-            Task task = (Task) node;
-            TaskList preParentList = task.getParent();
-
-            String curParentGid = mNidToGid.get(sqlNote.getParentId());
-            if (curParentGid == null) {
-                Log.e(TAG, "cannot find task's parent tasklist");
-                throw new ActionFailureException("cannot update remote task");
-            }
-            TaskList curParentList = mGTaskListHashMap.get(curParentGid);
-
-            if (preParentList != curParentList) {
-                preParentList.removeChildTask(task);
-                curParentList.addChildTask(task);
-                GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
-            }
-        }
-
-        // clear local modified flag
-        sqlNote.resetLocalModified();
-        sqlNote.commit(true);
-    }
-
-    private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
-        if (sqlNote != null && sqlNote.isNoteType()) {
-            MetaData metaData = mMetaHashMap.get(gid);
-            if (metaData != null) {
-                metaData.setMeta(gid, sqlNote.getContent());
-                GTaskClient.getInstance().addUpdateNode(metaData);
-            } else {
-                metaData = new MetaData();
-                metaData.setMeta(gid, sqlNote.getContent());
-                mMetaList.addChildTask(metaData);
-                mMetaHashMap.put(gid, metaData);
-                GTaskClient.getInstance().createTask(metaData);
-            }
-        }
-    }
-
-    private void refreshLocalSyncId() throws NetworkFailureException {
-        if (mCancelled) {
-            return;
-        }
-
-        // get the latest gtask list
-        mGTaskHashMap.clear();
-        mGTaskListHashMap.clear();
-        mMetaHashMap.clear();
-        initGTaskList();
-
-        Cursor c = null;
-        try {
-            c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
-                    "(type<>? AND parent_id<>?)", new String[] {
-                            String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
-                    }, NoteColumns.TYPE + " DESC");
-            if (c != null) {
-                while (c.moveToNext()) {
-                    String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
-                    Node node = mGTaskHashMap.get(gid);
-                    if (node != null) {
-                        mGTaskHashMap.remove(gid);
-                        ContentValues values = new ContentValues();
-                        values.put(NoteColumns.SYNC_ID, node.getLastModified());
-                        mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
-                                c.getLong(SqlNote.ID_COLUMN)), values, null, null);
-                    } else {
-                        Log.e(TAG, "something is missed");
-                        throw new ActionFailureException(
-                                "some local items don't have gid after sync");
-                    }
-                }
-            } else {
-                Log.w(TAG, "failed to query local note to refresh sync id");
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-                c = null;
-            }
-        }
-    }
-
-    public String getSyncAccount() {
-        return GTaskClient.getInstance().getSyncAccount().name;
-    }
-
-    public void cancelSync() {
-        mCancelled = true;
-    }
-}
diff --git a/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
deleted file mode 100644
index cca36f7..0000000
--- a/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.gtask.remote;
-
-import android.app.Activity;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-
-public class GTaskSyncService extends Service {
-    public final static String ACTION_STRING_NAME = "sync_action_type";
-
-    public final static int ACTION_START_SYNC = 0;
-
-    public final static int ACTION_CANCEL_SYNC = 1;
-
-    public final static int ACTION_INVALID = 2;
-
-    public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
-
-    public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
-
-    public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
-
-    private static GTaskASyncTask mSyncTask = null;
-
-    private static String mSyncProgress = "";
-
-    private void startSync() {
-        if (mSyncTask == null) {
-            mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
-                public void onComplete() {
-                    mSyncTask = null;
-                    sendBroadcast("");
-                    stopSelf();
-                }
-            });
-            sendBroadcast("");
-            mSyncTask.execute();
-        }
-    }
-
-    private void cancelSync() {
-        if (mSyncTask != null) {
-            mSyncTask.cancelSync();
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        mSyncTask = null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Bundle bundle = intent.getExtras();
-        if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
-            switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
-                case ACTION_START_SYNC:
-                    startSync();
-                    break;
-                case ACTION_CANCEL_SYNC:
-                    cancelSync();
-                    break;
-                default:
-                    break;
-            }
-            return START_STICKY;
-        }
-        return super.onStartCommand(intent, flags, startId);
-    }
-
-    @Override
-    public void onLowMemory() {
-        if (mSyncTask != null) {
-            mSyncTask.cancelSync();
-        }
-    }
-
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    public void sendBroadcast(String msg) {
-        mSyncProgress = msg;
-        Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);
-        intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
-        intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
-        sendBroadcast(intent);
-    }
-
-    public static void startSync(Activity activity) {
-        GTaskManager.getInstance().setActivityContext(activity);
-        Intent intent = new Intent(activity, GTaskSyncService.class);
-        intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
-        activity.startService(intent);
-    }
-
-    public static void cancelSync(Context context) {
-        Intent intent = new Intent(context, GTaskSyncService.class);
-        intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
-        context.startService(intent);
-    }
-
-    public static boolean isSyncing() {
-        return mSyncTask != null;
-    }
-
-    public static String getProgressString() {
-        return mSyncProgress;
-    }
-}
diff --git a/src/main/java/net/micode/notes/model/Note.java b/src/main/java/net/micode/notes/model/Note.java
deleted file mode 100644
index 6706cf6..0000000
--- a/src/main/java/net/micode/notes/model/Note.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.model;
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.Notes.TextNote;
-
-import java.util.ArrayList;
-
-
-public class Note {
-    private ContentValues mNoteDiffValues;
-    private NoteData mNoteData;
-    private static final String TAG = "Note";
-    /**
-     * Create a new note id for adding a new note to databases
-     */
-    public static synchronized long getNewNoteId(Context context, long folderId) {
-        // Create a new note in the database
-        ContentValues values = new ContentValues();
-        long createdTime = System.currentTimeMillis();
-        values.put(NoteColumns.CREATED_DATE, createdTime);
-        values.put(NoteColumns.MODIFIED_DATE, createdTime);
-        values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-        values.put(NoteColumns.LOCAL_MODIFIED, 1);
-        values.put(NoteColumns.PARENT_ID, folderId);
-        Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
-
-        long noteId = 0;
-        try {
-            noteId = Long.valueOf(uri.getPathSegments().get(1));
-        } catch (NumberFormatException e) {
-            Log.e(TAG, "Get note id error :" + e.toString());
-            noteId = 0;
-        }
-        if (noteId == -1) {
-            throw new IllegalStateException("Wrong note id:" + noteId);
-        }
-        return noteId;
-    }
-
-    public Note() {
-        mNoteDiffValues = new ContentValues();
-        mNoteData = new NoteData();
-    }
-
-    public void setNoteValue(String key, String value) {
-        mNoteDiffValues.put(key, value);
-        mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
-        mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
-    }
-
-    public void setTextData(String key, String value) {
-        mNoteData.setTextData(key, value);
-    }
-
-    public void setTextDataId(long id) {
-        mNoteData.setTextDataId(id);
-    }
-
-    public long getTextDataId() {
-        return mNoteData.mTextDataId;
-    }
-
-    public void setCallDataId(long id) {
-        mNoteData.setCallDataId(id);
-    }
-
-    public void setCallData(String key, String value) {
-        mNoteData.setCallData(key, value);
-    }
-
-    public boolean isLocalModified() {
-        return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
-    }
-
-    public boolean syncNote(Context context, long noteId) {
-        if (noteId <= 0) {
-            throw new IllegalArgumentException("Wrong note id:" + noteId);
-        }
-
-        if (!isLocalModified()) {
-            return true;
-        }
-
-        /**
-         * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and
-         * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
-         * note data info
-         */
-        if (context.getContentResolver().update(
-                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
-                null) == 0) {
-            Log.e(TAG, "Update note error, should not happen");
-            // Do not return, fall through
-        }
-        mNoteDiffValues.clear();
-
-        if (mNoteData.isLocalModified()
-                && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private class NoteData {
-        private long mTextDataId;
-
-        private ContentValues mTextDataValues;
-
-        private long mCallDataId;
-
-        private ContentValues mCallDataValues;
-
-        private static final String TAG = "NoteData";
-
-        public NoteData() {
-            mTextDataValues = new ContentValues();
-            mCallDataValues = new ContentValues();
-            mTextDataId = 0;
-            mCallDataId = 0;
-        }
-
-        boolean isLocalModified() {
-            return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
-        }
-
-        void setTextDataId(long id) {
-            if(id <= 0) {
-                throw new IllegalArgumentException("Text data id should larger than 0");
-            }
-            mTextDataId = id;
-        }
-
-        void setCallDataId(long id) {
-            if (id <= 0) {
-                throw new IllegalArgumentException("Call data id should larger than 0");
-            }
-            mCallDataId = id;
-        }
-
-        void setCallData(String key, String value) {
-            mCallDataValues.put(key, value);
-            mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
-            mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
-        }
-
-        void setTextData(String key, String value) {
-            mTextDataValues.put(key, value);
-            mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
-            mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
-        }
-
-        Uri pushIntoContentResolver(Context context, long noteId) {
-            /**
-             * Check for safety
-             */
-            if (noteId <= 0) {
-                throw new IllegalArgumentException("Wrong note id:" + noteId);
-            }
-
-            ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-            ContentProviderOperation.Builder builder = null;
-
-            if(mTextDataValues.size() > 0) {
-                mTextDataValues.put(DataColumns.NOTE_ID, noteId);
-                if (mTextDataId == 0) {
-                    mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE);
-                    Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
-                            mTextDataValues);
-                    try {
-                        setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
-                    } catch (NumberFormatException e) {
-                        Log.e(TAG, "Insert new text data fail with noteId" + noteId);
-                        mTextDataValues.clear();
-                        return null;
-                    }
-                } else {
-                    builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mTextDataId));
-                    builder.withValues(mTextDataValues);
-                    operationList.add(builder.build());
-                }
-                mTextDataValues.clear();
-            }
-
-            if(mCallDataValues.size() > 0) {
-                mCallDataValues.put(DataColumns.NOTE_ID, noteId);
-                if (mCallDataId == 0) {
-                    mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE);
-                    Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI,
-                            mCallDataValues);
-                    try {
-                        setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
-                    } catch (NumberFormatException e) {
-                        Log.e(TAG, "Insert new call data fail with noteId" + noteId);
-                        mCallDataValues.clear();
-                        return null;
-                    }
-                } else {
-                    builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mCallDataId));
-                    builder.withValues(mCallDataValues);
-                    operationList.add(builder.build());
-                }
-                mCallDataValues.clear();
-            }
-
-            if (operationList.size() > 0) {
-                try {
-                    ContentProviderResult[] results = context.getContentResolver().applyBatch(
-                            Notes.AUTHORITY, operationList);
-                    return (results == null || results.length == 0 || results[0] == null) ? null
-                            : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
-                } catch (RemoteException e) {
-                    Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-                    return null;
-                } catch (OperationApplicationException e) {
-                    Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-                    return null;
-                }
-            }
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java
deleted file mode 100644
index 04b114b..0000000
--- a/src/main/java/net/micode/notes/model/WorkingNote.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.model;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentUris;
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.tool.ResourceParser.NoteBgResources;
-
-
-public class WorkingNote {
-    // Note for the working note
-    private Note mNote;
-    // Note Id
-    private long mNoteId;
-    // Note content
-    public String mContent;
-    // Note mode
-    private int mMode;
-
-    private long mAlertDate;
-
-    private long mModifiedDate;
-
-    private int mBgColorId;
-
-    private int mWidgetId;
-
-    private int mWidgetType;
-
-    private long mFolderId;
-
-    private Context mContext;
-
-    private static final String TAG = "WorkingNote";
-
-    private boolean mIsDeleted;
-
-
-    private NoteSettingChangedListener mNoteSettingStatusListener;
-
-    public static final String[] DATA_PROJECTION = new String[] {
-            DataColumns.ID,
-            DataColumns.CONTENT,
-            DataColumns.MIME_TYPE,
-            DataColumns.DATA1,
-            DataColumns.DATA2,
-            DataColumns.DATA3,
-            DataColumns.DATA4,
-    };
-
-    public static final String[] NOTE_PROJECTION = new String[] {
-            NoteColumns.PARENT_ID,
-            NoteColumns.ALERTED_DATE,
-            NoteColumns.BG_COLOR_ID,
-            NoteColumns.WIDGET_ID,
-            NoteColumns.WIDGET_TYPE,
-            NoteColumns.MODIFIED_DATE
-    };
-
-    private static final int DATA_ID_COLUMN = 0;
-
-    private static final int DATA_CONTENT_COLUMN = 1;
-
-    private static final int DATA_MIME_TYPE_COLUMN = 2;
-
-    private static final int DATA_MODE_COLUMN = 3;
-
-    private static final int NOTE_PARENT_ID_COLUMN = 0;
-
-    private static final int NOTE_ALERTED_DATE_COLUMN = 1;
-
-    private static final int NOTE_BG_COLOR_ID_COLUMN = 2;
-
-    private static final int NOTE_WIDGET_ID_COLUMN = 3;
-
-    private static final int NOTE_WIDGET_TYPE_COLUMN = 4;
-
-    private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
-
-
-
-    // New note construct
-    private WorkingNote(Context context, long folderId) {
-        mContext = context;
-        mAlertDate = 0;
-        mModifiedDate = System.currentTimeMillis();
-        mFolderId = folderId;
-        mNote = new Note();
-        mNoteId = 0;
-        mIsDeleted = false;
-        mMode = 0;
-        mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
-    }
-
-
-    // Existing note construct
-    private WorkingNote(Context context, long noteId, long folderId) {
-        mContext = context;
-        mNoteId = noteId;
-        mFolderId = folderId;
-        mIsDeleted = false;
-        mNote = new Note();
-        loadNote();
-    }
-
-    private void loadNote() {
-        Cursor cursor = mContext.getContentResolver().query(
-                ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
-                null, null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
-                mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
-                mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
-                mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
-                mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
-                mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
-            }
-            cursor.close();
-        } else {
-            Log.e(TAG, "No note with id:" + mNoteId);
-            throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
-        }
-        loadNoteData();
-    }
-
-    private void loadNoteData() {
-        Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
-                DataColumns.NOTE_ID + "=?", new String[] {
-                    String.valueOf(mNoteId)
-                }, null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                do {
-                    String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
-                    if (DataConstants.NOTE.equals(type)) {
-                        mContent = cursor.getString(DATA_CONTENT_COLUMN);
-                        mMode = cursor.getInt(DATA_MODE_COLUMN);
-                        mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
-                    } else if (DataConstants.CALL_NOTE.equals(type)) {
-                        mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
-                    } else {
-                        Log.d(TAG, "Wrong note type with type:" + type);
-                    }
-                } while (cursor.moveToNext());
-            }
-            cursor.close();
-        } else {
-            Log.e(TAG, "No data with id:" + mNoteId);
-            throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
-        }
-    }
-
-    public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
-            int widgetType, int defaultBgColorId) {
-        WorkingNote note = new WorkingNote(context, folderId);
-        note.setBgColorId(defaultBgColorId);
-        note.setWidgetId(widgetId);
-        note.setWidgetType(widgetType);
-        return note;
-    }
-
-    public static WorkingNote load(Context context, long id) {
-        return new WorkingNote(context, id, 0);
-    }
-
-    public synchronized boolean saveNote() {
-        if (isWorthSaving()) {
-            if (!existInDatabase()) {
-                if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
-                    Log.e(TAG, "Create new note fail with id:" + mNoteId);
-                    return false;
-                }
-            }
-
-            mNote.syncNote(mContext, mNoteId);
-
-            /**
-             * Update widget content if there exist any widget of this note
-             */
-            if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                    && mWidgetType != Notes.TYPE_WIDGET_INVALIDE
-                    && mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onWidgetChanged();
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public boolean existInDatabase() {
-        return mNoteId > 0;
-    }
-
-    private boolean isWorthSaving() {
-        if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
-                || (existInDatabase() && !mNote.isLocalModified())) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
-        mNoteSettingStatusListener = l;
-    }
-
-    public void setAlertDate(long date, boolean set) {
-        if (date != mAlertDate) {
-            mAlertDate = date;
-            mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
-        }
-        if (mNoteSettingStatusListener != null) {
-            mNoteSettingStatusListener.onClockAlertChanged(date, set);
-        }
-    }
-
-    public void markDeleted(boolean mark) {
-        mIsDeleted = mark;
-        if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onWidgetChanged();
-        }
-    }
-
-    public void setBgColorId(int id) {
-        if (id != mBgColorId) {
-            mBgColorId = id;
-            if (mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onBackgroundColorChanged();
-            }
-            mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
-        }
-    }
-
-    public void setCheckListMode(int mode) {
-        if (mMode != mode) {
-            if (mNoteSettingStatusListener != null) {
-                mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
-            }
-            mMode = mode;
-            mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
-        }
-    }
-
-    public void setWidgetType(int type) {
-        if (type != mWidgetType) {
-            mWidgetType = type;
-            mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
-        }
-    }
-
-    public void setWidgetId(int id) {
-        if (id != mWidgetId) {
-            mWidgetId = id;
-            mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
-        }
-    }
-
-    public void setWorkingText(String text) {
-        if (!TextUtils.equals(mContent, text)) {
-            mContent = text;
-            mNote.setTextData(DataColumns.CONTENT, mContent);
-        }
-    }
-
-    public void convertToCallNote(String phoneNumber, long callDate) {
-        mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
-        mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
-        mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
-    }
-
-    public boolean hasClockAlert() {
-        return (mAlertDate > 0 ? true : false);
-    }
-
-    public String getContent() {
-        return mContent;
-    }
-
-    public long getAlertDate() {
-        return mAlertDate;
-    }
-
-    public long getModifiedDate() {
-        return mModifiedDate;
-    }
-
-    public int getBgColorResId() {
-        return NoteBgResources.getNoteBgResource(mBgColorId);
-    }
-
-    public int getBgColorId() {
-        return mBgColorId;
-    }
-
-    public int getTitleBgResId() {
-        return NoteBgResources.getNoteTitleBgResource(mBgColorId);
-    }
-
-    public int getCheckListMode() {
-        return mMode;
-    }
-
-    public long getNoteId() {
-        return mNoteId;
-    }
-
-    public long getFolderId() {
-        return mFolderId;
-    }
-
-    public int getWidgetId() {
-        return mWidgetId;
-    }
-
-    public int getWidgetType() {
-        return mWidgetType;
-    }
-
-    public interface NoteSettingChangedListener {
-        /**
-         * Called when the background color of current note has just changed
-         */
-        void onBackgroundColorChanged();
-
-        /**
-         * Called when user set clock
-         */
-        void onClockAlertChanged(long date, boolean set);
-
-        /**
-         * Call when user create note from widget
-         */
-        void onWidgetChanged();
-
-        /**
-         * Call when switch between check list mode and normal mode
-         * @param oldMode is previous mode before change
-         * @param newMode is new mode
-         */
-        void onCheckListModeChanged(int oldMode, int newMode);
-    }
-}
diff --git a/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java
deleted file mode 100644
index 39f6ec4..0000000
--- a/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.tool;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-
-public class BackupUtils {
-    private static final String TAG = "BackupUtils";
-    // Singleton stuff
-    private static BackupUtils sInstance;
-
-    public static synchronized BackupUtils getInstance(Context context) {
-        if (sInstance == null) {
-            sInstance = new BackupUtils(context);
-        }
-        return sInstance;
-    }
-
-    /**
-     * Following states are signs to represents backup or restore
-     * status
-     */
-    // Currently, the sdcard is not mounted
-    public static final int STATE_SD_CARD_UNMOUONTED           = 0;
-    // The backup file not exist
-    public static final int STATE_BACKUP_FILE_NOT_EXIST        = 1;
-    // The data is not well formated, may be changed by other programs
-    public static final int STATE_DATA_DESTROIED               = 2;
-    // Some run-time exception which causes restore or backup fails
-    public static final int STATE_SYSTEM_ERROR                 = 3;
-    // Backup or restore success
-    public static final int STATE_SUCCESS                      = 4;
-
-    private TextExport mTextExport;
-
-    private BackupUtils(Context context) {
-        mTextExport = new TextExport(context);
-    }
-
-    private static boolean externalStorageAvailable() {
-        return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
-    }
-
-    public int exportToText() {
-        return mTextExport.exportToText();
-    }
-
-    public String getExportedTextFileName() {
-        return mTextExport.mFileName;
-    }
-
-    public String getExportedTextFileDir() {
-        return mTextExport.mFileDirectory;
-    }
-
-    private static class TextExport {
-        private static final String[] NOTE_PROJECTION = {
-                NoteColumns.ID,
-                NoteColumns.MODIFIED_DATE,
-                NoteColumns.SNIPPET,
-                NoteColumns.TYPE
-        };
-
-        private static final int NOTE_COLUMN_ID = 0;
-
-        private static final int NOTE_COLUMN_MODIFIED_DATE = 1;
-
-        private static final int NOTE_COLUMN_SNIPPET = 2;
-
-        private static final String[] DATA_PROJECTION = {
-                DataColumns.CONTENT,
-                DataColumns.MIME_TYPE,
-                DataColumns.DATA1,
-                DataColumns.DATA2,
-                DataColumns.DATA3,
-                DataColumns.DATA4,
-        };
-
-        private static final int DATA_COLUMN_CONTENT = 0;
-
-        private static final int DATA_COLUMN_MIME_TYPE = 1;
-
-        private static final int DATA_COLUMN_CALL_DATE = 2;
-
-        private static final int DATA_COLUMN_PHONE_NUMBER = 4;
-
-        private final String [] TEXT_FORMAT;
-        private static final int FORMAT_FOLDER_NAME          = 0;
-        private static final int FORMAT_NOTE_DATE            = 1;
-        private static final int FORMAT_NOTE_CONTENT         = 2;
-
-        private Context mContext;
-        private String mFileName;
-        private String mFileDirectory;
-
-        public TextExport(Context context) {
-            TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
-            mContext = context;
-            mFileName = "";
-            mFileDirectory = "";
-        }
-
-        private String getFormat(int id) {
-            return TEXT_FORMAT[id];
-        }
-
-        /**
-         * Export the folder identified by folder id to text
-         */
-        private void exportFolderToText(String folderId, PrintStream ps) {
-            // Query notes belong to this folder
-            Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI,
-                    NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] {
-                        folderId
-                    }, null);
-
-            if (notesCursor != null) {
-                if (notesCursor.moveToFirst()) {
-                    do {
-                        // Print note's last modified date
-                        ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
-                                mContext.getString(R.string.format_datetime_mdhm),
-                                notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
-                        // Query data belong to this note
-                        String noteId = notesCursor.getString(NOTE_COLUMN_ID);
-                        exportNoteToText(noteId, ps);
-                    } while (notesCursor.moveToNext());
-                }
-                notesCursor.close();
-            }
-        }
-
-        /**
-         * Export note identified by id to a print stream
-         */
-        private void exportNoteToText(String noteId, PrintStream ps) {
-            Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
-                    DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
-                        noteId
-                    }, null);
-
-            if (dataCursor != null) {
-                if (dataCursor.moveToFirst()) {
-                    do {
-                        String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
-                        if (DataConstants.CALL_NOTE.equals(mimeType)) {
-                            // Print phone number
-                            String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER);
-                            long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
-                            String location = dataCursor.getString(DATA_COLUMN_CONTENT);
-
-                            if (!TextUtils.isEmpty(phoneNumber)) {
-                                ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
-                                        phoneNumber));
-                            }
-                            // Print call date
-                            ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat
-                                    .format(mContext.getString(R.string.format_datetime_mdhm),
-                                            callDate)));
-                            // Print call attachment location
-                            if (!TextUtils.isEmpty(location)) {
-                                ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
-                                        location));
-                            }
-                        } else if (DataConstants.NOTE.equals(mimeType)) {
-                            String content = dataCursor.getString(DATA_COLUMN_CONTENT);
-                            if (!TextUtils.isEmpty(content)) {
-                                ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
-                                        content));
-                            }
-                        }
-                    } while (dataCursor.moveToNext());
-                }
-                dataCursor.close();
-            }
-            // print a line separator between note
-            try {
-                ps.write(new byte[] {
-                        Character.LINE_SEPARATOR, Character.LETTER_NUMBER
-                });
-            } catch (IOException e) {
-                Log.e(TAG, e.toString());
-            }
-        }
-
-        /**
-         * Note will be exported as text which is user readable
-         */
-        public int exportToText() {
-            if (!externalStorageAvailable()) {
-                Log.d(TAG, "Media was not mounted");
-                return STATE_SD_CARD_UNMOUONTED;
-            }
-
-            PrintStream ps = getExportToTextPrintStream();
-            if (ps == null) {
-                Log.e(TAG, "get print stream error");
-                return STATE_SYSTEM_ERROR;
-            }
-            // First export folder and its notes
-            Cursor folderCursor = mContext.getContentResolver().query(
-                    Notes.CONTENT_NOTE_URI,
-                    NOTE_PROJECTION,
-                    "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
-                            + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
-                            + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
-
-            if (folderCursor != null) {
-                if (folderCursor.moveToFirst()) {
-                    do {
-                        // Print folder's name
-                        String folderName = "";
-                        if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) {
-                            folderName = mContext.getString(R.string.call_record_folder_name);
-                        } else {
-                            folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET);
-                        }
-                        if (!TextUtils.isEmpty(folderName)) {
-                            ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName));
-                        }
-                        String folderId = folderCursor.getString(NOTE_COLUMN_ID);
-                        exportFolderToText(folderId, ps);
-                    } while (folderCursor.moveToNext());
-                }
-                folderCursor.close();
-            }
-
-            // Export notes in root's folder
-            Cursor noteCursor = mContext.getContentResolver().query(
-                    Notes.CONTENT_NOTE_URI,
-                    NOTE_PROJECTION,
-                    NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID
-                            + "=0", null, null);
-
-            if (noteCursor != null) {
-                if (noteCursor.moveToFirst()) {
-                    do {
-                        ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
-                                mContext.getString(R.string.format_datetime_mdhm),
-                                noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
-                        // Query data belong to this note
-                        String noteId = noteCursor.getString(NOTE_COLUMN_ID);
-                        exportNoteToText(noteId, ps);
-                    } while (noteCursor.moveToNext());
-                }
-                noteCursor.close();
-            }
-            ps.close();
-
-            return STATE_SUCCESS;
-        }
-
-        /**
-         * Get a print stream pointed to the file {@generateExportedTextFile}
-         */
-        private PrintStream getExportToTextPrintStream() {
-            File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
-                    R.string.file_name_txt_format);
-            if (file == null) {
-                Log.e(TAG, "create file to exported failed");
-                return null;
-            }
-            mFileName = file.getName();
-            mFileDirectory = mContext.getString(R.string.file_path);
-            PrintStream ps = null;
-            try {
-                FileOutputStream fos = new FileOutputStream(file);
-                ps = new PrintStream(fos);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                return null;
-            } catch (NullPointerException e) {
-                e.printStackTrace();
-                return null;
-            }
-            return ps;
-        }
-    }
-
-    /**
-     * Generate the text file to store imported data
-     */
-    private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(Environment.getExternalStorageDirectory());
-        sb.append(context.getString(filePathResId));
-        File filedir = new File(sb.toString());
-        sb.append(context.getString(
-                fileNameFormatResId,
-                DateFormat.format(context.getString(R.string.format_date_ymd),
-                        System.currentTimeMillis())));
-        File file = new File(sb.toString());
-
-        try {
-            if (!filedir.exists()) {
-                filedir.mkdir();
-            }
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-            return file;
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-}
-
-
diff --git a/src/main/java/net/micode/notes/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java
deleted file mode 100644
index 2a14982..0000000
--- a/src/main/java/net/micode/notes/tool/DataUtils.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.tool;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.os.RemoteException;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.CallNote;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-
-public class DataUtils {
-    public static final String TAG = "DataUtils";
-    public static boolean batchDeleteNotes(ContentResolver resolver, HashSet<Long> ids) {
-        if (ids == null) {
-            Log.d(TAG, "the ids is null");
-            return true;
-        }
-        if (ids.size() == 0) {
-            Log.d(TAG, "no id is in the hashset");
-            return true;
-        }
-
-        ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-        for (long id : ids) {
-            if(id == Notes.ID_ROOT_FOLDER) {
-                Log.e(TAG, "Don't delete system folder root");
-                continue;
-            }
-            ContentProviderOperation.Builder builder = ContentProviderOperation
-                    .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
-            operationList.add(builder.build());
-        }
-        try {
-            ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
-            if (results == null || results.length == 0 || results[0] == null) {
-                Log.d(TAG, "delete notes failed, ids:" + ids.toString());
-                return false;
-            }
-            return true;
-        } catch (RemoteException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        } catch (OperationApplicationException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        }
-        return false;
-    }
-
-    public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
-        ContentValues values = new ContentValues();
-        values.put(NoteColumns.PARENT_ID, desFolderId);
-        values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
-        values.put(NoteColumns.LOCAL_MODIFIED, 1);
-        resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null);
-    }
-
-    public static boolean batchMoveToFolder(ContentResolver resolver, HashSet<Long> ids,
-            long folderId) {
-        if (ids == null) {
-            Log.d(TAG, "the ids is null");
-            return true;
-        }
-
-        ArrayList<ContentProviderOperation> operationList = new ArrayList<ContentProviderOperation>();
-        for (long id : ids) {
-            ContentProviderOperation.Builder builder = ContentProviderOperation
-                    .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
-            builder.withValue(NoteColumns.PARENT_ID, folderId);
-            builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
-            operationList.add(builder.build());
-        }
-
-        try {
-            ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);
-            if (results == null || results.length == 0 || results[0] == null) {
-                Log.d(TAG, "delete notes failed, ids:" + ids.toString());
-                return false;
-            }
-            return true;
-        } catch (RemoteException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        } catch (OperationApplicationException e) {
-            Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
-        }
-        return false;
-    }
-
-    /**
-     * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}}
-     */
-    public static int getUserFolderCount(ContentResolver resolver) {
-        Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI,
-                new String[] { "COUNT(*)" },
-                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
-                new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
-                null);
-
-        int count = 0;
-        if(cursor != null) {
-            if(cursor.moveToFirst()) {
-                try {
-                    count = cursor.getInt(0);
-                } catch (IndexOutOfBoundsException e) {
-                    Log.e(TAG, "get folder count failed:" + e.toString());
-                } finally {
-                    cursor.close();
-                }
-            }
-        }
-        return count;
-    }
-
-    public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
-        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
-                null,
-                NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
-                new String [] {String.valueOf(type)},
-                null);
-
-        boolean exist = false;
-        if (cursor != null) {
-            if (cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
-        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
-                null, null, null, null);
-
-        boolean exist = false;
-        if (cursor != null) {
-            if (cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
-        Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
-                null, null, null, null);
-
-        boolean exist = false;
-        if (cursor != null) {
-            if (cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
-        Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
-                NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
-                " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
-                " AND " + NoteColumns.SNIPPET + "=?",
-                new String[] { name }, null);
-        boolean exist = false;
-        if(cursor != null) {
-            if(cursor.getCount() > 0) {
-                exist = true;
-            }
-            cursor.close();
-        }
-        return exist;
-    }
-
-    public static HashSet<AppWidgetAttribute> getFolderNoteWidget(ContentResolver resolver, long folderId) {
-        Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
-                new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
-                NoteColumns.PARENT_ID + "=?",
-                new String[] { String.valueOf(folderId) },
-                null);
-
-        HashSet<AppWidgetAttribute> set = null;
-        if (c != null) {
-            if (c.moveToFirst()) {
-                set = new HashSet<AppWidgetAttribute>();
-                do {
-                    try {
-                        AppWidgetAttribute widget = new AppWidgetAttribute();
-                        widget.widgetId = c.getInt(0);
-                        widget.widgetType = c.getInt(1);
-                        set.add(widget);
-                    } catch (IndexOutOfBoundsException e) {
-                        Log.e(TAG, e.toString());
-                    }
-                } while (c.moveToNext());
-            }
-            c.close();
-        }
-        return set;
-    }
-
-    public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
-        Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
-                new String [] { CallNote.PHONE_NUMBER },
-                CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
-                new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE },
-                null);
-
-        if (cursor != null && cursor.moveToFirst()) {
-            try {
-                return cursor.getString(0);
-            } catch (IndexOutOfBoundsException e) {
-                Log.e(TAG, "Get call number fails " + e.toString());
-            } finally {
-                cursor.close();
-            }
-        }
-        return "";
-    }
-
-    public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
-        Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
-                new String [] { CallNote.NOTE_ID },
-                CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
-                + CallNote.PHONE_NUMBER + ",?)",
-                new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
-                null);
-
-        if (cursor != null) {
-            if (cursor.moveToFirst()) {
-                try {
-                    return cursor.getLong(0);
-                } catch (IndexOutOfBoundsException e) {
-                    Log.e(TAG, "Get call note id fails " + e.toString());
-                }
-            }
-            cursor.close();
-        }
-        return 0;
-    }
-
-    public static String getSnippetById(ContentResolver resolver, long noteId) {
-        Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
-                new String [] { NoteColumns.SNIPPET },
-                NoteColumns.ID + "=?",
-                new String [] { String.valueOf(noteId)},
-                null);
-
-        if (cursor != null) {
-            String snippet = "";
-            if (cursor.moveToFirst()) {
-                snippet = cursor.getString(0);
-            }
-            cursor.close();
-            return snippet;
-        }
-        throw new IllegalArgumentException("Note is not found with id: " + noteId);
-    }
-
-    public static String getFormattedSnippet(String snippet) {
-        if (snippet != null) {
-            snippet = snippet.trim();
-            int index = snippet.indexOf('\n');
-            if (index != -1) {
-                snippet = snippet.substring(0, index);
-            }
-        }
-        return snippet;
-    }
-}
diff --git a/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
deleted file mode 100644
index 666b729..0000000
--- a/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.tool;
-
-public class GTaskStringUtils {
-
-    public final static String GTASK_JSON_ACTION_ID = "action_id";
-
-    public final static String GTASK_JSON_ACTION_LIST = "action_list";
-
-    public final static String GTASK_JSON_ACTION_TYPE = "action_type";
-
-    public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";
-
-    public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
-
-    public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";
-
-    public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
-
-    public final static String GTASK_JSON_CREATOR_ID = "creator_id";
-
-    public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";
-
-    public final static String GTASK_JSON_CLIENT_VERSION = "client_version";
-
-    public final static String GTASK_JSON_COMPLETED = "completed";
-
-    public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
-
-    public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
-
-    public final static String GTASK_JSON_DELETED = "deleted";
-
-    public final static String GTASK_JSON_DEST_LIST = "dest_list";
-
-    public final static String GTASK_JSON_DEST_PARENT = "dest_parent";
-
-    public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
-
-    public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";
-
-    public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";
-
-    public final static String GTASK_JSON_GET_DELETED = "get_deleted";
-
-    public final static String GTASK_JSON_ID = "id";
-
-    public final static String GTASK_JSON_INDEX = "index";
-
-    public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";
-
-    public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
-
-    public final static String GTASK_JSON_LIST_ID = "list_id";
-
-    public final static String GTASK_JSON_LISTS = "lists";
-
-    public final static String GTASK_JSON_NAME = "name";
-
-    public final static String GTASK_JSON_NEW_ID = "new_id";
-
-    public final static String GTASK_JSON_NOTES = "notes";
-
-    public final static String GTASK_JSON_PARENT_ID = "parent_id";
-
-    public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
-
-    public final static String GTASK_JSON_RESULTS = "results";
-
-    public final static String GTASK_JSON_SOURCE_LIST = "source_list";
-
-    public final static String GTASK_JSON_TASKS = "tasks";
-
-    public final static String GTASK_JSON_TYPE = "type";
-
-    public final static String GTASK_JSON_TYPE_GROUP = "GROUP";
-
-    public final static String GTASK_JSON_TYPE_TASK = "TASK";
-
-    public final static String GTASK_JSON_USER = "user";
-
-    public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
-
-    public final static String FOLDER_DEFAULT = "Default";
-
-    public final static String FOLDER_CALL_NOTE = "Call_Note";
-
-    public final static String FOLDER_META = "METADATA";
-
-    public final static String META_HEAD_GTASK_ID = "meta_gid";
-
-    public final static String META_HEAD_NOTE = "meta_note";
-
-    public final static String META_HEAD_DATA = "meta_data";
-
-    public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
-
-}
diff --git a/src/main/java/net/micode/notes/tool/Point.java b/src/main/java/net/micode/notes/tool/Point.java
deleted file mode 100644
index f3d8e4e..0000000
--- a/src/main/java/net/micode/notes/tool/Point.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package net.micode.notes.tool;
-
-public class Point {
-    public static int BITMAP_NORMAL = 0; // 正常
-    public static int BITMAP_ERROR = 1;  // 错误
-    public static int BITMAP_PRESS = 2;  // 按下
-
-    //九宫格中的点的下标（即每个点代表一个值）
-    private String index;
-    //点的状态
-    private int state;
-    //点的坐标
-    private float x;
-    private float y;
-
-    public Point() {
-        super();
-    }
-
-    public Point(int x, int y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    public String getIndex() {
-        return index;
-    }
-
-    public int getState() {
-        return state;
-    }
-
-    public float getX() {
-        return x;
-    }
-
-    public float getY() {
-        return y;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
-    public void setState(int state) {
-        this.state = state;
-    }
-
-    public void setX(float x) {
-        this.x = x;
-    }
-
-    public void setY(float y) {
-        this.y = y;
-    }
-
-    /**
-     * 判断屏幕上的九宫格中的点能否可以进行连线
-     *
-     * @param a
-     * @param moveX
-     * @param moveY
-     * @param radius 点bitmap的半径
-     * @return 布尔型
-     */
-    public boolean isWith(Point a, float moveX, float moveY, float radius) {
-        float result = (float) Math.sqrt((a.getX() - moveX)
-                * (a.getX() - moveX) + (a.getY() - moveY)
-                * (a.getY() - moveY));
-        if (result < 5 * radius / 4) {
-            return true;
-        }
-        return false;
-    }
-
-    public static float getDegrees(Point a, Point b) {
-        float degrees = 0;
-        float ax = a.getX();
-        float ay = a.getY();
-        float bx = b.getX();
-        float by = b.getY();
-
-        if (ax == bx) {
-            if (by > ay) {
-                degrees = 90;
-            } else {
-                degrees = 270;
-            }
-        } else if (by == ay) {
-            if (ax > bx) {
-                degrees = 180;
-            } else {
-                degrees = 0;
-            }
-        } else {
-            if (ax > bx) {
-                if (ay > by) { // 第三象限
-                    degrees = 180 + (float) (Math.atan2(ay - by, ax - bx) * 180 / Math.PI);
-                } else { // 第二象限
-                    degrees = 180 - (float) (Math.atan2(by - ay, ax - bx) * 180 / Math.PI);
-                }
-            } else {
-                if (ay > by) { // 第四象限
-                    degrees = 360 - (float) (Math.atan2(ay - by, bx - ax) * 180 / Math.PI);
-                } else { // 第一象限
-                    degrees = (float) (Math.atan2(by - ay, bx - ax) * 180 / Math.PI);
-                }
-            }
-        }
-        return degrees;
-    }
-}
-
diff --git a/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java
deleted file mode 100644
index 1ad3ad6..0000000
--- a/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.tool;
-
-import android.content.Context;
-import android.preference.PreferenceManager;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-public class ResourceParser {
-
-    public static final int YELLOW           = 0;
-    public static final int BLUE             = 1;
-    public static final int WHITE            = 2;
-    public static final int GREEN            = 3;
-    public static final int RED              = 4;
-
-    public static final int BG_DEFAULT_COLOR = YELLOW;
-
-    public static final int TEXT_SMALL       = 0;
-    public static final int TEXT_MEDIUM      = 1;
-    public static final int TEXT_LARGE       = 2;
-    public static final int TEXT_SUPER       = 3;
-
-    public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
-
-    public static class NoteBgResources {
-        private final static int [] BG_EDIT_RESOURCES = new int [] {
-            R.drawable.edit_yellow,
-            R.drawable.edit_blue,
-            R.drawable.edit_white,
-            R.drawable.edit_green,
-            R.drawable.edit_red
-        };
-
-        private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
-            R.drawable.edit_title_yellow,
-            R.drawable.edit_title_blue,
-            R.drawable.edit_title_white,
-            R.drawable.edit_title_green,
-            R.drawable.edit_title_red
-        };
-
-        public static int getNoteBgResource(int id) {
-            return BG_EDIT_RESOURCES[id];
-        }
-
-        public static int getNoteTitleBgResource(int id) {
-            return BG_EDIT_TITLE_RESOURCES[id];
-        }
-    }
-
-    public static int getDefaultBgId(Context context) {
-        if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
-                NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
-            return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
-        } else {
-            return BG_DEFAULT_COLOR;
-        }
-    }
-
-    public static class NoteItemBgResources {
-        private final static int [] BG_FIRST_RESOURCES = new int [] {
-            R.drawable.list_yellow_up,
-            R.drawable.list_blue_up,
-            R.drawable.list_white_up,
-            R.drawable.list_green_up,
-            R.drawable.list_red_up
-        };
-
-        private final static int [] BG_NORMAL_RESOURCES = new int [] {
-            R.drawable.list_yellow_middle,
-            R.drawable.list_blue_middle,
-            R.drawable.list_white_middle,
-            R.drawable.list_green_middle,
-            R.drawable.list_red_middle
-        };
-
-        private final static int [] BG_LAST_RESOURCES = new int [] {
-            R.drawable.list_yellow_down,
-            R.drawable.list_blue_down,
-            R.drawable.list_white_down,
-            R.drawable.list_green_down,
-            R.drawable.list_red_down,
-        };
-
-        private final static int [] BG_SINGLE_RESOURCES = new int [] {
-            R.drawable.list_yellow_single,
-            R.drawable.list_blue_single,
-            R.drawable.list_white_single,
-            R.drawable.list_green_single,
-            R.drawable.list_red_single
-        };
-
-        public static int getNoteBgFirstRes(int id) {
-            return BG_FIRST_RESOURCES[id];
-        }
-
-        public static int getNoteBgLastRes(int id) {
-            return BG_LAST_RESOURCES[id];
-        }
-
-        public static int getNoteBgSingleRes(int id) {
-            return BG_SINGLE_RESOURCES[id];
-        }
-
-        public static int getNoteBgNormalRes(int id) {
-            return BG_NORMAL_RESOURCES[id];
-        }
-
-        public static int getFolderBgRes() {
-            return R.drawable.list_folder;
-        }
-    }
-
-    public static class WidgetBgResources {
-        private final static int [] BG_2X_RESOURCES = new int [] {
-            R.drawable.widget_2x_yellow,
-            R.drawable.widget_2x_blue,
-            R.drawable.widget_2x_white,
-            R.drawable.widget_2x_green,
-            R.drawable.widget_2x_red,
-        };
-
-        public static int getWidget2xBgResource(int id) {
-            return BG_2X_RESOURCES[id];
-        }
-
-        private final static int [] BG_4X_RESOURCES = new int [] {
-            R.drawable.widget_4x_yellow,
-            R.drawable.widget_4x_blue,
-            R.drawable.widget_4x_white,
-            R.drawable.widget_4x_green,
-            R.drawable.widget_4x_red
-        };
-
-        public static int getWidget4xBgResource(int id) {
-            return BG_4X_RESOURCES[id];
-        }
-    }
-
-    public static class TextAppearanceResources {
-        private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
-            R.style.TextAppearanceNormal,
-            R.style.TextAppearanceMedium,
-            R.style.TextAppearanceLarge,
-            R.style.TextAppearanceSuper
-        };
-
-        public static int getTexAppearanceResource(int id) {
-            /**
-             * HACKME: Fix bug of store the resource id in shared preference.
-             * The id may larger than the length of resources, in this case,
-             * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
-             */
-            if (id >= TEXTAPPEARANCE_RESOURCES.length) {
-                return BG_DEFAULT_FONT_SIZE;
-            }
-            return TEXTAPPEARANCE_RESOURCES[id];
-        }
-
-        public static int getResourcesSize() {
-            return TEXTAPPEARANCE_RESOURCES.length;
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/ASRresponse.java b/src/main/java/net/micode/notes/ui/ASRresponse.java
deleted file mode 100644
index a8885b7..0000000
--- a/src/main/java/net/micode/notes/ui/ASRresponse.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package net.micode.notes.ui;
-
-import java.util.List;
-
-public class ASRresponse {
-
-    /**
-     * results_recognition : ["你好，"]
-     * result_type : final_result
-     * best_result : 你好，
-     * origin_result : {"asr_align_begin":80,"asr_align_end":130,"corpus_no":6835867007181645805,"err_no":0,"raf":133,"result":{"word":["你好，"]},"sn":"82d975e0-6eb4-43ac-a0e7-850bb149f28e"}
-     * error : 0
-     */
-
-    private String result_type;
-    private String best_result;
-    private OriginResultBean origin_result;
-    private int error;
-    private List<String> results_recognition;
-
-    public String getResult_type() {
-        return result_type;
-    }
-
-    public void setResult_type(String result_type) {
-        this.result_type = result_type;
-    }
-
-    public String getBest_result() {
-        return best_result;
-    }
-
-    public void setBest_result(String best_result) {
-        this.best_result = best_result;
-    }
-
-    public OriginResultBean getOrigin_result() {
-        return origin_result;
-    }
-
-    public void setOrigin_result(OriginResultBean origin_result) {
-        this.origin_result = origin_result;
-    }
-
-    public int getError() {
-        return error;
-    }
-
-    public void setError(int error) {
-        this.error = error;
-    }
-
-    public List<String> getResults_recognition() {
-        return results_recognition;
-    }
-
-    public void setResults_recognition(List<String> results_recognition) {
-        this.results_recognition = results_recognition;
-    }
-
-    public static class OriginResultBean {
-        /**
-         * asr_align_begin : 80
-         * asr_align_end : 130
-         * corpus_no : 6835867007181645805
-         * err_no : 0
-         * raf : 133
-         * result : {"word":["你好，"]}
-         * sn : 82d975e0-6eb4-43ac-a0e7-850bb149f28e
-         */
-
-        private int asr_align_begin;
-        private int asr_align_end;
-        private long corpus_no;
-        private int err_no;
-        private int raf;
-        private ResultBean result;
-        private String sn;
-
-        public int getAsr_align_begin() {
-            return asr_align_begin;
-        }
-
-        public void setAsr_align_begin(int asr_align_begin) {
-            this.asr_align_begin = asr_align_begin;
-        }
-
-        public int getAsr_align_end() {
-            return asr_align_end;
-        }
-
-        public void setAsr_align_end(int asr_align_end) {
-            this.asr_align_end = asr_align_end;
-        }
-
-        public long getCorpus_no() {
-            return corpus_no;
-        }
-
-        public void setCorpus_no(long corpus_no) {
-            this.corpus_no = corpus_no;
-        }
-
-        public int getErr_no() {
-            return err_no;
-        }
-
-        public void setErr_no(int err_no) {
-            this.err_no = err_no;
-        }
-
-        public int getRaf() {
-            return raf;
-        }
-
-        public void setRaf(int raf) {
-            this.raf = raf;
-        }
-
-        public ResultBean getResult() {
-            return result;
-        }
-
-        public void setResult(ResultBean result) {
-            this.result = result;
-        }
-
-        public String getSn() {
-            return sn;
-        }
-
-        public void setSn(String sn) {
-            this.sn = sn;
-        }
-
-        public static class ResultBean {
-            private List<String> word;
-
-            public List<String> getWord() {
-                return word;
-            }
-
-            public void setWord(List<String> word) {
-                this.word = word;
-            }
-        }
-    }
-}
-
diff --git a/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
deleted file mode 100644
index 85723be..0000000
--- a/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.view.Window;
-import android.view.WindowManager;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.DataUtils;
-
-import java.io.IOException;
-
-
-public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
-    private long mNoteId;
-    private String mSnippet;
-    private static final int SNIPPET_PREW_MAX_LEN = 60;
-    MediaPlayer mPlayer;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        final Window win = getWindow();
-        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-
-        if (!isScreenOn()) {
-            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                    | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
-                    | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
-        }
-
-        Intent intent = getIntent();
-
-        try {
-            mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
-            mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
-            mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
-                    SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
-                    : mSnippet;
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-            return;
-        }
-
-        mPlayer = new MediaPlayer();
-        if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
-            showActionDialog();
-            playAlarmSound();
-        } else {
-            finish();
-        }
-    }
-
-    private boolean isScreenOn() {
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        return pm.isScreenOn();
-    }
-
-    private void playAlarmSound() {
-        Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
-
-        int silentModeStreams = Settings.System.getInt(getContentResolver(),
-                Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
-
-        if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
-            mPlayer.setAudioStreamType(silentModeStreams);
-        } else {
-            mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
-        }
-        try {
-            mPlayer.setDataSource(this, url);
-            mPlayer.prepare();
-            mPlayer.setLooping(true);
-            mPlayer.start();
-        } catch (IllegalArgumentException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (SecurityException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IllegalStateException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-
-    private void showActionDialog() {
-        AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-        dialog.setTitle(R.string.app_name);
-        dialog.setMessage(mSnippet);
-        dialog.setPositiveButton(R.string.notealert_ok, this);
-        if (isScreenOn()) {
-            dialog.setNegativeButton(R.string.notealert_enter, this);
-        }
-        dialog.show().setOnDismissListener(this);
-    }
-
-    public void onClick(DialogInterface dialog, int which) {
-        switch (which) {
-            case DialogInterface.BUTTON_NEGATIVE:
-                Intent intent = new Intent(this, NoteEditActivity.class);
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.putExtra(Intent.EXTRA_UID, mNoteId);
-                startActivity(intent);
-                break;
-            default:
-                break;
-        }
-    }
-
-    public void onDismiss(DialogInterface dialog) {
-        stopAlarmSound();
-        finish();
-    }
-
-    private void stopAlarmSound() {
-        if (mPlayer != null) {
-            mPlayer.stop();
-            mPlayer.release();
-            mPlayer = null;
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
deleted file mode 100644
index f221202..0000000
--- a/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class AlarmInitReceiver extends BroadcastReceiver {
-
-    private static final String [] PROJECTION = new String [] {
-        NoteColumns.ID,
-        NoteColumns.ALERTED_DATE
-    };
-
-    private static final int COLUMN_ID                = 0;
-    private static final int COLUMN_ALERTED_DATE      = 1;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        long currentDate = System.currentTimeMillis();
-        Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
-                PROJECTION,
-                NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
-                new String[] { String.valueOf(currentDate) },
-                null);
-
-        if (c != null) {
-            if (c.moveToFirst()) {
-                do {
-                    long alertDate = c.getLong(COLUMN_ALERTED_DATE);
-                    Intent sender = new Intent(context, AlarmReceiver.class);
-                    sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
-                    PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
-                    AlarmManager alermManager = (AlarmManager) context
-                            .getSystemService(Context.ALARM_SERVICE);
-                    alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
-                } while (c.moveToNext());
-            }
-            c.close();
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java
deleted file mode 100644
index 54e503b..0000000
--- a/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class AlarmReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        intent.setClass(context, AlarmAlertActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/BoardActivity.java b/src/main/java/net/micode/notes/ui/BoardActivity.java
deleted file mode 100644
index c09957d..0000000
--- a/src/main/java/net/micode/notes/ui/BoardActivity.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageButton;
-
-import net.micode.notes.PaintView;
-import net.micode.notes.R;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class BoardActivity extends Activity {
-    private PaintView paintView;
-
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState); //调用父类的功能
-        this.setContentView(R.layout.activity_paint);
-        //根据id获取添加图片按钮
-        final ImageButton undo = (ImageButton) findViewById(R.id.undo);
-        //为点击图片按钮设置监听器
-        undo.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paintView.undo();
-            }
-        });
-
-        final ImageButton paint_reset = (ImageButton) findViewById(R.id.paint_reset);
-        //为点击图片按钮设置监听器
-        paint_reset.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paintView.redo();
-            }
-        });
-
-        final ImageButton paint_delete = (ImageButton) findViewById(R.id.paint_delete);
-        //为点击图片按钮设置监听器
-        paint_delete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paintView.removeAllPaint();
-            }
-        });
-
-        final ImageButton paint_save = (ImageButton) findViewById(R.id.save);
-        //为点击图片按钮设置监听器
-        paint_save.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                saveBitmap();
-            }
-        });
-
-        final ImageButton paint_width = (ImageButton) findViewById(R.id.paint_width);
-        //为点击图片按钮设置监听器
-        paint_width.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paintView.changewidth();
-            }
-        });
-
-        final ImageButton paint_color = (ImageButton) findViewById(R.id.paint_color);
-        //为点击图片按钮设置监听器
-        paint_color.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                paintView.changecolor();
-            }
-        });
-
-        final ImageButton paint_back = (ImageButton) findViewById(R.id.paint_back);
-        //为点击图片按钮设置监听器
-        paint_back.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                /* 新建一个Intent对象 */
-                Intent intent = new Intent();
-                /* 指定intent要启动的类 */
-                intent.setClass(BoardActivity.this, NotesListActivity.class);
-                /* 启动一个新的Activity */
-                startActivity(intent);
-                /* 关闭当前的Activity */
-                BoardActivity.this.finish();
-            }
-        });
-
-        paintView = (PaintView)findViewById(R.id.paint_layout);
-    }
-    /* 保存所绘图形
-     * 返回绘图文件的存储路径
-     */
-    public String saveBitmap(){
-        //获得系统当前时间，并以该时间作为文件名
-        SimpleDateFormat formatter   =   new   SimpleDateFormat   ("yyyyMMddHHmmss");
-        Date curDate   =   new   Date(System.currentTimeMillis());//获取当前时间
-        String   str   =   formatter.format(curDate);
-        String paintPath = "";
-        str = str + "paint.png";
-        File dir = new File("/storage/emulated/0/DCIM/Camera");
-        File file = new File("/storage/emulated/0/DCIM/Camera",str);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-        else{
-            if(file.exists()){
-                file.delete();
-            }
-        }
-
-        try {
-            FileOutputStream out = new FileOutputStream(file);
-            paintView.mBitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            out.flush();
-            out.close();
-            //保存绘图文件路径
-            paintPath = "/sdcard/notes/" + str;
-
-
-        } catch (FileNotFoundException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-        return paintPath;
-    }
-}
-
-
diff --git a/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java b/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java
deleted file mode 100644
index 6cbc61e..0000000
--- a/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-
-public class ChangedLoginPassword extends Activity{
-    EditText OldPassword;
-    EditText NewPassword;
-    EditText AckPassword;
-    Button Acknowledged;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_change_loginpassword);
-        getWindow().setSoftInputMode(
-                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
-                        | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        OldPassword=(EditText) findViewById(R.id.old_password);
-        NewPassword=(EditText) findViewById(R.id.new_password);
-        AckPassword=(EditText) findViewById(R.id.ack_password);
-        Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged);
-        Acknowledged.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String old_password = OldPassword.getText().toString();
-                String new_password = NewPassword.getText().toString();
-                String ack_password = AckPassword.getText().toString();
-                SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
-                String login_password=pref.getString("password","");
-                if(old_password.equals("")==true || new_password.equals("")==true || ack_password.equals("")==true) {
-                    Toast.makeText(ChangedLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
-                }else if (new_password.equals(ack_password) == false) {
-                    Toast.makeText(ChangedLoginPassword.this, "新建密码与重复密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show();
-                    AckPassword.setText("");
-                }else if(old_password.equals(login_password) == false){
-                    Toast.makeText(ChangedLoginPassword.this, "原有密码错误，请重新输入密码", Toast.LENGTH_SHORT).show();
-                    OldPassword.setText("");
-                }
-                else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true){
-                    SharedPreferences.Editor editor=getSharedPreferences("user management", MODE_PRIVATE).edit();
-                    editor.putString("password",new_password);
-                    editor.apply();
-                    Toast.makeText(ChangedLoginPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show();
-                    Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class);
-                    startActivity(intent);
-                    finish();
-                }
-            }
-        });
-    }
-
-    @Override
-    public void onBackPressed() {
-        Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java
deleted file mode 100644
index 496b0cd..0000000
--- a/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import java.text.DateFormatSymbols;
-import java.util.Calendar;
-
-import net.micode.notes.R;
-
-
-import android.content.Context;
-import android.text.format.DateFormat;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.NumberPicker;
-
-public class DateTimePicker extends FrameLayout {
-
-    private static final boolean DEFAULT_ENABLE_STATE = true;
-
-    private static final int HOURS_IN_HALF_DAY = 12;
-    private static final int HOURS_IN_ALL_DAY = 24;
-    private static final int DAYS_IN_ALL_WEEK = 7;
-    private static final int DATE_SPINNER_MIN_VAL = 0;
-    private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1;
-    private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0;
-    private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23;
-    private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1;
-    private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12;
-    private static final int MINUT_SPINNER_MIN_VAL = 0;
-    private static final int MINUT_SPINNER_MAX_VAL = 59;
-    private static final int AMPM_SPINNER_MIN_VAL = 0;
-    private static final int AMPM_SPINNER_MAX_VAL = 1;
-
-    private final NumberPicker mDateSpinner;
-    private final NumberPicker mHourSpinner;
-    private final NumberPicker mMinuteSpinner;
-    private final NumberPicker mAmPmSpinner;
-    private Calendar mDate;
-
-    private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
-
-    private boolean mIsAm;
-
-    private boolean mIs24HourView;
-
-    private boolean mIsEnabled = DEFAULT_ENABLE_STATE;
-
-    private boolean mInitialising;
-
-    private OnDateTimeChangedListener mOnDateTimeChangedListener;
-
-    private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() {
-        @Override
-        public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
-            mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal);
-            updateDateControl();
-            onDateTimeChanged();
-        }
-    };
-
-    private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
-        @Override
-        public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
-            boolean isDateChanged = false;
-            Calendar cal = Calendar.getInstance();
-            if (!mIs24HourView) {
-                if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) {
-                    cal.setTimeInMillis(mDate.getTimeInMillis());
-                    cal.add(Calendar.DAY_OF_YEAR, 1);
-                    isDateChanged = true;
-                } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
-                    cal.setTimeInMillis(mDate.getTimeInMillis());
-                    cal.add(Calendar.DAY_OF_YEAR, -1);
-                    isDateChanged = true;
-                }
-                if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
-                        oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
-                    mIsAm = !mIsAm;
-                    updateAmPmControl();
-                }
-            } else {
-                if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
-                    cal.setTimeInMillis(mDate.getTimeInMillis());
-                    cal.add(Calendar.DAY_OF_YEAR, 1);
-                    isDateChanged = true;
-                } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
-                    cal.setTimeInMillis(mDate.getTimeInMillis());
-                    cal.add(Calendar.DAY_OF_YEAR, -1);
-                    isDateChanged = true;
-                }
-            }
-            int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
-            mDate.set(Calendar.HOUR_OF_DAY, newHour);
-            onDateTimeChanged();
-            if (isDateChanged) {
-                setCurrentYear(cal.get(Calendar.YEAR));
-                setCurrentMonth(cal.get(Calendar.MONTH));
-                setCurrentDay(cal.get(Calendar.DAY_OF_MONTH));
-            }
-        }
-    };
-
-    private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
-        @Override
-        public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
-            int minValue = mMinuteSpinner.getMinValue();
-            int maxValue = mMinuteSpinner.getMaxValue();
-            int offset = 0;
-            if (oldVal == maxValue && newVal == minValue) {
-                offset += 1;
-            } else if (oldVal == minValue && newVal == maxValue) {
-                offset -= 1;
-            }
-            if (offset != 0) {
-                mDate.add(Calendar.HOUR_OF_DAY, offset);
-                mHourSpinner.setValue(getCurrentHour());
-                updateDateControl();
-                int newHour = getCurrentHourOfDay();
-                if (newHour >= HOURS_IN_HALF_DAY) {
-                    mIsAm = false;
-                    updateAmPmControl();
-                } else {
-                    mIsAm = true;
-                    updateAmPmControl();
-                }
-            }
-            mDate.set(Calendar.MINUTE, newVal);
-            onDateTimeChanged();
-        }
-    };
-
-    private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
-        @Override
-        public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
-            mIsAm = !mIsAm;
-            if (mIsAm) {
-                mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY);
-            } else {
-                mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY);
-            }
-            updateAmPmControl();
-            onDateTimeChanged();
-        }
-    };
-
-    public interface OnDateTimeChangedListener {
-        void onDateTimeChanged(DateTimePicker view, int year, int month,
-                int dayOfMonth, int hourOfDay, int minute);
-    }
-
-    public DateTimePicker(Context context) {
-        this(context, System.currentTimeMillis());
-    }
-
-    public DateTimePicker(Context context, long date) {
-        this(context, date, DateFormat.is24HourFormat(context));
-    }
-
-    public DateTimePicker(Context context, long date, boolean is24HourView) {
-        super(context);
-        mDate = Calendar.getInstance();
-        mInitialising = true;
-        mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
-        inflate(context, R.layout.datetime_picker, this);
-
-        mDateSpinner = (NumberPicker) findViewById(R.id.date);
-        mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
-        mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
-        mDateSpinner.setOnValueChangedListener(mOnDateChangedListener);
-
-        mHourSpinner = (NumberPicker) findViewById(R.id.hour);
-        mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);
-        mMinuteSpinner =  (NumberPicker) findViewById(R.id.minute);
-        mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);
-        mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
-        mMinuteSpinner.setOnLongPressUpdateInterval(100);
-        mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);
-
-        String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
-        mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
-        mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
-        mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);
-        mAmPmSpinner.setDisplayedValues(stringsForAmPm);
-        mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener);
-
-        // update controls to initial state
-        updateDateControl();
-        updateHourControl();
-        updateAmPmControl();
-
-        set24HourView(is24HourView);
-
-        // set to current time
-        setCurrentDate(date);
-
-        setEnabled(isEnabled());
-
-        // set the content descriptions
-        mInitialising = false;
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        if (mIsEnabled == enabled) {
-            return;
-        }
-        super.setEnabled(enabled);
-        mDateSpinner.setEnabled(enabled);
-        mMinuteSpinner.setEnabled(enabled);
-        mHourSpinner.setEnabled(enabled);
-        mAmPmSpinner.setEnabled(enabled);
-        mIsEnabled = enabled;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return mIsEnabled;
-    }
-
-    /**
-     * Get the current date in millis
-     *
-     * @return the current date in millis
-     */
-    public long getCurrentDateInTimeMillis() {
-        return mDate.getTimeInMillis();
-    }
-
-    /**
-     * Set the current date
-     *
-     * @param date The current date in millis
-     */
-    public void setCurrentDate(long date) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(date);
-        setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
-                cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
-    }
-
-    /**
-     * Set the current date
-     *
-     * @param year The current year
-     * @param month The current month
-     * @param dayOfMonth The current dayOfMonth
-     * @param hourOfDay The current hourOfDay
-     * @param minute The current minute
-     */
-    public void setCurrentDate(int year, int month,
-            int dayOfMonth, int hourOfDay, int minute) {
-        setCurrentYear(year);
-        setCurrentMonth(month);
-        setCurrentDay(dayOfMonth);
-        setCurrentHour(hourOfDay);
-        setCurrentMinute(minute);
-    }
-
-    /**
-     * Get current year
-     *
-     * @return The current year
-     */
-    public int getCurrentYear() {
-        return mDate.get(Calendar.YEAR);
-    }
-
-    /**
-     * Set current year
-     *
-     * @param year The current year
-     */
-    public void setCurrentYear(int year) {
-        if (!mInitialising && year == getCurrentYear()) {
-            return;
-        }
-        mDate.set(Calendar.YEAR, year);
-        updateDateControl();
-        onDateTimeChanged();
-    }
-
-    /**
-     * Get current month in the year
-     *
-     * @return The current month in the year
-     */
-    public int getCurrentMonth() {
-        return mDate.get(Calendar.MONTH);
-    }
-
-    /**
-     * Set current month in the year
-     *
-     * @param month The month in the year
-     */
-    public void setCurrentMonth(int month) {
-        if (!mInitialising && month == getCurrentMonth()) {
-            return;
-        }
-        mDate.set(Calendar.MONTH, month);
-        updateDateControl();
-        onDateTimeChanged();
-    }
-
-    /**
-     * Get current day of the month
-     *
-     * @return The day of the month
-     */
-    public int getCurrentDay() {
-        return mDate.get(Calendar.DAY_OF_MONTH);
-    }
-
-    /**
-     * Set current day of the month
-     *
-     * @param dayOfMonth The day of the month
-     */
-    public void setCurrentDay(int dayOfMonth) {
-        if (!mInitialising && dayOfMonth == getCurrentDay()) {
-            return;
-        }
-        mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-        updateDateControl();
-        onDateTimeChanged();
-    }
-
-    /**
-     * Get current hour in 24 hour mode, in the range (0~23)
-     * @return The current hour in 24 hour mode
-     */
-    public int getCurrentHourOfDay() {
-        return mDate.get(Calendar.HOUR_OF_DAY);
-    }
-
-    private int getCurrentHour() {
-        if (mIs24HourView){
-            return getCurrentHourOfDay();
-        } else {
-            int hour = getCurrentHourOfDay();
-            if (hour > HOURS_IN_HALF_DAY) {
-                return hour - HOURS_IN_HALF_DAY;
-            } else {
-                return hour == 0 ? HOURS_IN_HALF_DAY : hour;
-            }
-        }
-    }
-
-    /**
-     * Set current hour in 24 hour mode, in the range (0~23)
-     *
-     * @param hourOfDay
-     */
-    public void setCurrentHour(int hourOfDay) {
-        if (!mInitialising && hourOfDay == getCurrentHourOfDay()) {
-            return;
-        }
-        mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
-        if (!mIs24HourView) {
-            if (hourOfDay >= HOURS_IN_HALF_DAY) {
-                mIsAm = false;
-                if (hourOfDay > HOURS_IN_HALF_DAY) {
-                    hourOfDay -= HOURS_IN_HALF_DAY;
-                }
-            } else {
-                mIsAm = true;
-                if (hourOfDay == 0) {
-                    hourOfDay = HOURS_IN_HALF_DAY;
-                }
-            }
-            updateAmPmControl();
-        }
-        mHourSpinner.setValue(hourOfDay);
-        onDateTimeChanged();
-    }
-
-    /**
-     * Get currentMinute
-     *
-     * @return The Current Minute
-     */
-    public int getCurrentMinute() {
-        return mDate.get(Calendar.MINUTE);
-    }
-
-    /**
-     * Set current minute
-     */
-    public void setCurrentMinute(int minute) {
-        if (!mInitialising && minute == getCurrentMinute()) {
-            return;
-        }
-        mMinuteSpinner.setValue(minute);
-        mDate.set(Calendar.MINUTE, minute);
-        onDateTimeChanged();
-    }
-
-    /**
-     * @return true if this is in 24 hour view else false.
-     */
-    public boolean is24HourView () {
-        return mIs24HourView;
-    }
-
-    /**
-     * Set whether in 24 hour or AM/PM mode.
-     *
-     * @param is24HourView True for 24 hour mode. False for AM/PM mode.
-     */
-    public void set24HourView(boolean is24HourView) {
-        if (mIs24HourView == is24HourView) {
-            return;
-        }
-        mIs24HourView = is24HourView;
-        mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE);
-        int hour = getCurrentHourOfDay();
-        updateHourControl();
-        setCurrentHour(hour);
-        updateAmPmControl();
-    }
-
-    private void updateDateControl() {
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(mDate.getTimeInMillis());
-        cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1);
-        mDateSpinner.setDisplayedValues(null);
-        for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) {
-            cal.add(Calendar.DAY_OF_YEAR, 1);
-            mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal);
-        }
-        mDateSpinner.setDisplayedValues(mDateDisplayValues);
-        mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2);
-        mDateSpinner.invalidate();
-    }
-
-    private void updateAmPmControl() {
-        if (mIs24HourView) {
-            mAmPmSpinner.setVisibility(View.GONE);
-        } else {
-            int index = mIsAm ? Calendar.AM : Calendar.PM;
-            mAmPmSpinner.setValue(index);
-            mAmPmSpinner.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private void updateHourControl() {
-        if (mIs24HourView) {
-            mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW);
-            mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW);
-        } else {
-            mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW);
-            mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW);
-        }
-    }
-
-    /**
-     * Set the callback that indicates the 'Set' button has been pressed.
-     * @param callback the callback, if null will do nothing
-     */
-    public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) {
-        mOnDateTimeChangedListener = callback;
-    }
-
-    private void onDateTimeChanged() {
-        if (mOnDateTimeChangedListener != null) {
-            mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(),
-                    getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute());
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
deleted file mode 100644
index 2c47ba4..0000000
--- a/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import java.util.Calendar;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.DateTimePicker;
-import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-
-public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
-
-    private Calendar mDate = Calendar.getInstance();
-    private boolean mIs24HourView;
-    private OnDateTimeSetListener mOnDateTimeSetListener;
-    private DateTimePicker mDateTimePicker;
-
-    public interface OnDateTimeSetListener {
-        void OnDateTimeSet(AlertDialog dialog, long date);
-    }
-
-    public DateTimePickerDialog(Context context, long date) {
-        super(context);
-        mDateTimePicker = new DateTimePicker(context);
-        setView(mDateTimePicker);
-        mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
-            public void onDateTimeChanged(DateTimePicker view, int year, int month,
-                    int dayOfMonth, int hourOfDay, int minute) {
-                mDate.set(Calendar.YEAR, year);
-                mDate.set(Calendar.MONTH, month);
-                mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-                mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
-                mDate.set(Calendar.MINUTE, minute);
-                updateTitle(mDate.getTimeInMillis());
-            }
-        });
-        mDate.setTimeInMillis(date);
-        mDate.set(Calendar.SECOND, 0);
-        mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
-        setButton(context.getString(R.string.datetime_dialog_ok), this);
-        setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
-        set24HourView(DateFormat.is24HourFormat(this.getContext()));
-        updateTitle(mDate.getTimeInMillis());
-    }
-
-    public void set24HourView(boolean is24HourView) {
-        mIs24HourView = is24HourView;
-    }
-
-    public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
-        mOnDateTimeSetListener = callBack;
-    }
-
-    private void updateTitle(long date) {
-        int flag =
-            DateUtils.FORMAT_SHOW_YEAR |
-            DateUtils.FORMAT_SHOW_DATE |
-            DateUtils.FORMAT_SHOW_TIME;
-        flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
-        setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
-    }
-
-    public void onClick(DialogInterface arg0, int arg1) {
-        if (mOnDateTimeSetListener != null) {
-            mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java b/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java
deleted file mode 100644
index 025ebf3..0000000
--- a/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-
-public class DeleteLoginPassword extends Activity{
-    EditText password01;
-    Button Acknowledged;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_delete_loginpassword);
-        getWindow().setSoftInputMode(
-                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
-                        | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        password01=(EditText) findViewById(R.id.old_password);
-        Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged);
-        Acknowledged.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String text02 = password01.getText().toString();
-                if(text02.equals("")==true)
-                    Toast.makeText(DeleteLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
-                SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
-                String password = pref.getString("password","");
-                if(password.equals("")==false&&password.equals(text02)==true){
-                    SharedPreferences.Editor editor=getSharedPreferences("user management",
-                            MODE_PRIVATE).edit();
-                    editor.putBoolean("user",false);//false表示已经设置登录密码
-                    editor.putString("password","");
-                    editor.apply();
-
-                    Toast.makeText(DeleteLoginPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show();
-                    Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class);
-                    startActivity(intent);
-                    finish();
-                }
-                else{
-                    Toast.makeText(DeleteLoginPassword.this, "密码错误", Toast.LENGTH_SHORT).show();
-                    password01.setText("");//把密码框内输入过的错误密码清空
-                }
-            }
-        });
-    }
-
-    @Override
-    public void onBackPressed() {
-        Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java
deleted file mode 100644
index 613dc74..0000000
--- a/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-
-import net.micode.notes.R;
-
-public class DropdownMenu {
-    private Button mButton;
-    private PopupMenu mPopupMenu;
-    private Menu mMenu;
-
-    public DropdownMenu(Context context, Button button, int menuId) {
-        mButton = button;
-        mButton.setBackgroundResource(R.drawable.dropdown_icon);
-        mPopupMenu = new PopupMenu(context, mButton);
-        mMenu = mPopupMenu.getMenu();
-        mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
-        mButton.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                mPopupMenu.show();
-            }
-        });
-    }
-
-    public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
-        if (mPopupMenu != null) {
-            mPopupMenu.setOnMenuItemClickListener(listener);
-        }
-    }
-
-    public MenuItem findItem(int id) {
-        return mMenu.findItem(id);
-    }
-
-    public void setTitle(CharSequence title) {
-        mButton.setText(title);
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
deleted file mode 100644
index 96b77da..0000000
--- a/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class FoldersListAdapter extends CursorAdapter {
-    public static final String [] PROJECTION = {
-        NoteColumns.ID,
-        NoteColumns.SNIPPET
-    };
-
-    public static final int ID_COLUMN   = 0;
-    public static final int NAME_COLUMN = 1;
-
-    public FoldersListAdapter(Context context, Cursor c) {
-        super(context, c);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return new FolderListItem(context);
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        if (view instanceof FolderListItem) {
-            String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
-                    .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
-            ((FolderListItem) view).bind(folderName);
-        }
-    }
-
-    public String getFolderName(Context context, int position) {
-        Cursor cursor = (Cursor) getItem(position);
-        return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
-                .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
-    }
-
-    private class FolderListItem extends LinearLayout {
-        private TextView mName;
-
-        public FolderListItem(Context context) {
-            super(context);
-            inflate(context, R.layout.folder_list_item, this);
-            mName = (TextView) findViewById(R.id.tv_folder_name);
-        }
-
-        public void bind(String name) {
-            mName.setText(name);
-        }
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/main/java/net/micode/notes/ui/LoginActivity.java
deleted file mode 100644
index 0e83ae1..0000000
--- a/src/main/java/net/micode/notes/ui/LoginActivity.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-import net.micode.notes.R;
-
-
-public class LoginActivity extends Activity {
-
-    EditText lg_password;
-    Button lg_login;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
-        boolean User_boolean = pref.getBoolean("user",false);//获取用户是否设置了密码
-        if(!User_boolean) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面
-        {
-            Intent intent=new Intent(LoginActivity.this, NotesListActivity.class);
-            startActivity(intent);
-            finish();
-        }
-
-        setContentView(R.layout.activity_login);
-        getWindow().setSoftInputMode(
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
-                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        lg_password=(EditText) findViewById(R.id.lg_password);
-        lg_login=(Button)findViewById(R.id.login);
-        lg_login.setOnClickListener(new View.OnClickListener() {
-                                        @Override
-                                        public void onClick(View v) {
-                                            SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
-                                            String password=pref.getString("password","");
-                                            if(password.equals("")==false&& password.equals(lg_password.getText().toString())==true){
-                                                Intent intent=new Intent(LoginActivity.this,NotesListActivity.class);
-                                                startActivity(intent);
-                                                finish();
-                                            }
-                                            else{
-                                                Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
-                                                lg_password.setText("");//把密码框内输入过的错误密码清空
-                                            }
-                                        }
-                                    }
-        );
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
deleted file mode 100644
index 8a8c837..0000000
--- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ /dev/null
@@ -1,1366 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.AlarmManager;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.PendingIntent;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Paint;
-import android.graphics.Typeface;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.speech.tts.TextToSpeech;
-import android.text.Editable;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.text.format.DateUtils;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.ImageSpan;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.baidu.speech.EventListener;
-import com.baidu.speech.EventManager;
-import com.baidu.speech.EventManagerFactory;
-import com.baidu.speech.asr.SpeechConstant;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
-import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
-import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.FileNotFoundException;
-import java.text.BreakIterator;
-import java.util.Locale;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class NoteEditActivity extends Activity implements OnClickListener,
-        NoteSettingChangedListener, OnTextViewChangeListener, EventListener {
-    private AlertDialog alertDialog2;
-    private class HeadViewHolder {
-        public TextView tvModified;
-
-        public ImageView ivAlertIcon;
-
-        public TextView tvAlertDate;
-
-        public ImageView ibSetBgColor;
-        public BreakIterator text_num;
-        public TextView  text_nums;
-    }
-
-    private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
-
-    static {
-        sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
-        sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
-        sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
-        sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
-        sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
-    }
-
-    private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
-
-    static {
-        sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
-        sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
-        sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
-        sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
-        sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
-    }
-
-    private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
-
-    static {
-        sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
-        sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
-        sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
-        sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
-    }
-
-    private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
-
-    static {
-        sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
-        sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
-        sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
-        sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
-    }
-
-    private static final String TAG = "NoteEditActivity";
-
-    private HeadViewHolder mNoteHeaderHolder;
-
-    private View mHeadViewPanel;
-
-    private View mNoteBgColorSelector;
-
-    private View mFontSizeSelector;
-
-    private EditText mNoteEditor;
-
-    private View mNoteEditorPanel;
-
-    private WorkingNote mWorkingNote;
-
-    private SharedPreferences mSharedPrefs;
-    private int mFontSizeId;
-
-    private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
-
-    private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
-
-    public static final String TAG_CHECKED = String.valueOf('\u221A');
-    public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
-
-    private LinearLayout mEditTextList;
-
-    private String mUserQuery;
-    private Pattern mPattern;
-
-    private static final int GET_STORAGE_PERMISSION = 2;
-
-    private final int PHOTO_REQUEST = 1;//请求码
-    private EditText editText;
-    private TextView textView;
-
-    protected EditText txtResult;//识别结果
-    protected Button startBtn;//开始识别  一直不说话会自动停止，需要再次打开
-
-    private EventManager asr;//语音识别核心库
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.setContentView(R.layout.note_edit);
-
-        if (savedInstanceState == null && !initActivityState(getIntent())) {
-            finish();
-            return;
-        }
-        editText = (EditText) findViewById(R.id.note_edit_view);
-
-        this.setContentView(R.layout.note_edit);
-
-        if (savedInstanceState == null && !initActivityState(getIntent())) {
-            finish();
-            return;
-        }
-        initResources();
-        speech_sum();
-        initView();
-        txtResult = findViewById(R.id.note_edit_view);
-        asr = EventManagerFactory.create(this, "asr");
-//注册自己的输出事件类
-        asr.registerListener(this); //  EventListener 中 onEvent方法
-        startBtn.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                int action = event.getAction();
-                switch (action) {
-                    case MotionEvent.ACTION_DOWN:
-                        start();
-                /*mStartSpeechButton.setBackgroundResource(
-                        R.drawable.bdspeech_btn_orangelight_pressed);*/
-                        break;
-                    case MotionEvent.ACTION_UP:
-                        stop();
-                /*mStartSpeechButton.setBackgroundResource(
-                        R.drawable.bdspeech_btn_orangelight_normal);*/
-                        break;
-                    default:
-                        return false;
-                }
-
-                return true;
-            }
-        });
-
-
-        //根据id获取添加图片按钮
-        final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn);
-        //为点击图片按钮设置监听器
-        add_img_btn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (ContextCompat.checkSelfPermission(NoteEditActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                    //没有授权进行权限申请
-                    ActivityCompat.requestPermissions(NoteEditActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, GET_STORAGE_PERMISSION);
-                } else {
-                    Log.d(TAG, "onClick: click add image button");
-                    //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音）
-                    Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
-                    //Category属性用于指定当前动作（Action）被执行的环境.
-                    //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
-                    loadImage.addCategory(Intent.CATEGORY_OPENABLE);
-                    loadImage.setType("image/*");
-                    startActivityForResult(loadImage, PHOTO_REQUEST);
-                }
-            }
-        });
-    }
-
-    public void speech_sum(){
-        EditText editable = findViewById(R.id.note_edit_view);
-        //Toast.makeText(NoteEditActivity.this, editable.getText().toString(), Toast.LENGTH_SHORT).show();
-        final Button speak = findViewById(R.id.iatBtn);
-        final int[] tmp = new int[1];
-        final TextToSpeech[] tts = new TextToSpeech[1];
-        tts[0] = new TextToSpeech(NoteEditActivity.this, new TextToSpeech.OnInitListener() {
-            @Override
-            public void onInit(int status) {
-                tts[0].setLanguage(Locale.US);
-            }
-        });
-        editable.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                tmp[0] = cutOfimage(operateText(s.toString())).length();
-                TextView number_word = findViewById(R.id.text_nums);
-                number_word.setText("字符数："+ tmp[0]);
-                final String temp = cutOfimage(s.toString());
-                speak.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        tts[0].speak(temp.toString(),TextToSpeech.QUEUE_FLUSH,null);
-                    }
-                });
-            }
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-    }
-
-    public String operateText(String str){
-        String dest = "";
-        Pattern p = Pattern.compile("\\s*|t|r|n");
-        Matcher m = p.matcher(str);
-        dest = m.replaceAll("");
-        return dest;
-    }
-
-    public String cutOfimage(String str){
-        String dest = str;
-        int index1 = dest.indexOf("[local]");
-        int index2 = dest.indexOf("[/local]");
-        while(index1 != -1 && index2 != -1){
-            dest = dest.substring(0,index1) + dest.substring(index2+8);
-            index1 = dest.indexOf("[local]");
-            index2 = dest.indexOf("[/local]");
-        }
-        return dest;
-    }
-
-    private String Textchange(String oriText){
-        StringBuffer stringBuffer = new StringBuffer(oriText);
-        int Flag1 = -1;
-        int Flag2 = -1;
-        do {//不计入表示图片的字符
-            Flag1 = stringBuffer.indexOf("<img");
-            Flag2 = stringBuffer.indexOf(">");
-            if (Flag1 != -1 && Flag2 != -1) {
-                stringBuffer = stringBuffer.replace(Flag1, Flag2+1, "");
-            }
-        } while (Flag1 != -1 && Flag2 != -1);
-
-        do {//不计入换行字符
-            Flag1 = stringBuffer.indexOf("\n");
-
-            if (Flag1 != -1){
-                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
-            }
-        } while (Flag1 != -1);
-        do {//不计入空格字符
-            Flag1 = stringBuffer.indexOf(" ");
-
-            if (Flag1 != -1) {
-                stringBuffer = stringBuffer.replace(Flag1, Flag1+1, "");
-            }
-        } while (Flag1 != -1);
-        return stringBuffer.toString();
-    }
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        switch (requestCode) {
-            case GET_STORAGE_PERMISSION:
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT);
-                    //Category属性用于指定当前动作（Action）被执行的环境.
-                    //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent
-                    loadImage.addCategory(Intent.CATEGORY_OPENABLE);
-                    loadImage.setType("image/*");
-                    startActivityForResult(loadImage, PHOTO_REQUEST);
-                } else {
-                    Toast.makeText(this, "You denied the permission", Toast.LENGTH_SHORT).show();
-                }
-                break;
-
-        }
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
-            Intent intent = new Intent(Intent.ACTION_VIEW);
-            intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
-            if (!initActivityState(intent)) {
-                finish();
-                return;
-            }
-            Log.d(TAG, "Restoring from killed activity");
-        }
-    }
-
-    private boolean initActivityState(Intent intent) {
-        /**
-         * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
-         * then jump to the NotesListActivity
-         */
-        mWorkingNote = null;
-        if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
-            long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
-            mUserQuery = "";
-
-            /**
-             * Starting from the searched result
-             */
-            if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
-                noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
-                mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
-            }
-
-            if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
-                Intent jump = new Intent(this, NotesListActivity.class);
-                startActivity(jump);
-                showToast(R.string.error_note_not_exist);
-                finish();
-                return false;
-            } else {
-                mWorkingNote = WorkingNote.load(this, noteId);
-                if (mWorkingNote == null) {
-                    Log.e(TAG, "load note failed with note id" + noteId);
-                    finish();
-                    return false;
-                }
-            }
-            getWindow().setSoftInputMode(
-                    WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
-                            | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        } else if (TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
-            // New note
-            long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
-            int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
-                    Notes.TYPE_WIDGET_INVALIDE);
-            int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
-                    ResourceParser.getDefaultBgId(this));
-
-            // Parse call-record note
-            String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
-            long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
-            if (callDate != 0 && phoneNumber != null) {
-                if (TextUtils.isEmpty(phoneNumber)) {
-                    Log.w(TAG, "The call record number is null");
-                }
-                long noteId = 0;
-                if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
-                        phoneNumber, callDate)) > 0) {
-                    mWorkingNote = WorkingNote.load(this, noteId);
-                    if (mWorkingNote == null) {
-                        Log.e(TAG, "load call note failed with note id" + noteId);
-                        finish();
-                        return false;
-                    }
-                } else {
-                    mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
-                            widgetType, bgResId);
-                    mWorkingNote.convertToCallNote(phoneNumber, callDate);
-                }
-            } else {
-                mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
-                        bgResId);
-            }
-
-            getWindow().setSoftInputMode(
-                    WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
-                            | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        } else {
-            Log.e(TAG, "Intent not specified action, should not support");
-            finish();
-            return false;
-        }
-        mWorkingNote.setOnSettingStatusChangedListener(this);
-        return true;
-    }
-
-    @Override
-    protected void onResume() {//能获得用户焦点：可以操作
-        super.onResume();
-        initNoteScreen();//初始化便签屏幕
-    }
-
-    private void initNoteScreen() {
-        mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
-        if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
-            switchToListMode(mWorkingNote.getContent());
-        } else {
-            mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
-            mNoteEditor.setSelection(mNoteEditor.getText().length());
-        }
-        for (Integer id : sBgSelectorSelectionMap.keySet()) {
-            findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
-        }
-        mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
-        mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
-
-        mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
-                mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
-                        | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
-                        | DateUtils.FORMAT_SHOW_YEAR));
-
-        showAlertHeader();
-        //将有图片路径的位置转换为图片
-        convertToImage();
-    }
-
-    private void showAlertHeader() {
-        if (mWorkingNote.hasClockAlert()) {
-            long time = System.currentTimeMillis();
-            if (time > mWorkingNote.getAlertDate()) {
-                mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
-            } else {
-                mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
-                        mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
-            }
-            mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
-            mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
-        } else {
-            mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
-            mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
-        }
-        ;
-    }
-
-    //路径字符串格式 转换为 图片image格式
-    private void convertToImage() {
-        NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit
-        Editable editable = noteEditText.getText();//1.获取text
-        String noteText = editable.toString(); //2.将note内容转换为字符串
-        int length = editable.length(); //内容的长度
-        //3.截取img片段 [local]+uri+[local]，提取uri
-        for (int i = 0; i < length; i++) {
-            for (int j = i; j < length; j++) {
-                String img_fragment = noteText.substring(i, j + 1); //img_fragment：关于图片路径的片段
-                if (img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")) {
-                    int limit = 7;  //[local]为7个字符
-                    //[local][/local]共15个字符，剩下的为真正的path长度
-                    int len = img_fragment.length() - 15;
-                    //从[local]之后的len个字符就是path
-                    String path = img_fragment.substring(limit, limit + len);//获取到了图片路径
-                    Bitmap bitmap = null;
-                    Log.d(TAG, "图片的路径是：" + path);
-                    try {
-                        bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (bitmap != null) {  //若图片存在
-                        Log.d(TAG, "图片不为null");
-                        ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
-                        //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
-                        String ss = "[local]" + path + "[/local]";
-                        SpannableString spannableString = new SpannableString(ss);
-                        //5.将指定的标记对象附加到文本的开始...结束范围
-                        spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                        Log.d(TAG, "Create spannable string success!");
-                        Editable edit_text = noteEditText.getEditableText();
-                        edit_text.delete(i, i + len + 15); //6.删掉图片路径的文字
-                        edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        initActivityState(intent);
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        /**
-         * For new note without note id, we should firstly save it to
-         * generate a id. If the editing note is not worth saving, there
-         * is no id which is equivalent to create new note
-         */
-        if (!mWorkingNote.existInDatabase()) {
-            saveNote();
-        }
-        outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
-        Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
-                && !inRangeOfView(mNoteBgColorSelector, ev)) {
-            mNoteBgColorSelector.setVisibility(View.GONE);
-            return true;
-        }
-
-        if (mFontSizeSelector.getVisibility() == View.VISIBLE
-                && !inRangeOfView(mFontSizeSelector, ev)) {
-            mFontSizeSelector.setVisibility(View.GONE);
-            return true;
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
-    private boolean inRangeOfView(View view, MotionEvent ev) {
-        int[] location = new int[2];
-        view.getLocationOnScreen(location);
-        int x = location[0];
-        int y = location[1];
-        if (ev.getX() < x
-                || ev.getX() > (x + view.getWidth())
-                || ev.getY() < y
-                || ev.getY() > (y + view.getHeight())) {
-            return false;
-        }
-        return true;
-    }
-
-
-    private void initResources() {
-
-        mHeadViewPanel = findViewById(R.id.note_title);
-        mNoteHeaderHolder = new HeadViewHolder();
-        mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
-        mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
-        mNoteHeaderHolder.text_nums = (TextView) findViewById(R.id.text_nums);
-        mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
-        mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
-        mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
-        mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
-        mNoteEditorPanel = findViewById(R.id.sv_note_edit);
-        mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
-        for (int id : sBgSelectorBtnsMap.keySet()) {
-            ImageView iv = (ImageView) findViewById(id);
-            iv.setOnClickListener(this);
-        }
-
-        mFontSizeSelector = findViewById(R.id.font_size_selector);
-        for (int id : sFontSizeBtnsMap.keySet()) {
-            View view = findViewById(id);
-            view.setOnClickListener(this);
-        }
-        ;
-        mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
-        /**
-         * HACKME: Fix bug of store the resource id in shared preference.
-         * The id may larger than the length of resources, in this case,
-         * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
-         */
-        if (mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
-            mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
-        }
-        mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
-
-
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (saveNote()) {
-            Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
-        }
-        clearSettingState();
-    }
-
-    private void updateWidget() {
-        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
-            intent.setClass(this, NoteWidgetProvider_2x.class);
-        } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
-            intent.setClass(this, NoteWidgetProvider_4x.class);
-        } else {
-            Log.e(TAG, "Unspported widget type");
-            return;
-        }
-
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{
-                mWorkingNote.getWidgetId()
-        });
-
-        sendBroadcast(intent);
-        setResult(RESULT_OK, intent);
-    }
-
-    public void onClick(View v) {
-        int id = v.getId();
-        if (id == R.id.btn_set_bg_color) {
-            mNoteBgColorSelector.setVisibility(View.VISIBLE);
-            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    View.VISIBLE);
-        } else if (sBgSelectorBtnsMap.containsKey(id)) {
-            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    View.GONE);
-            mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
-            mNoteBgColorSelector.setVisibility(View.GONE);
-        } else if (sFontSizeBtnsMap.containsKey(id)) {
-            findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
-            mFontSizeId = sFontSizeBtnsMap.get(id);
-            mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
-            findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
-            if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
-                getWorkingText();
-                switchToListMode(mWorkingNote.getContent());
-            } else {
-                mNoteEditor.setTextAppearance(this,
-                        TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
-            }
-            mFontSizeSelector.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (clearSettingState()) {
-            return;
-        }
-
-        saveNote();
-        super.onBackPressed();
-    }
-
-    private boolean clearSettingState() {
-        if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
-            mNoteBgColorSelector.setVisibility(View.GONE);
-            return true;
-        } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
-            mFontSizeSelector.setVisibility(View.GONE);
-            return true;
-        }
-        return false;
-    }
-
-    public void onBackgroundColorChanged() {
-        findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                View.VISIBLE);
-        mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
-        mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (isFinishing()) {
-            return true;
-        }
-        clearSettingState();
-        menu.clear();
-        if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
-            getMenuInflater().inflate(R.menu.call_note_edit, menu);
-        } else {
-            getMenuInflater().inflate(R.menu.note_edit, menu);
-        }
-        if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
-            menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
-        } else {
-            menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
-        }
-        if (mWorkingNote.hasClockAlert()) {
-            menu.findItem(R.id.menu_alert).setVisible(false);
-        } else {
-            menu.findItem(R.id.menu_delete_remind).setVisible(false);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-
-            case R.id.menu_new_note:
-                createNewNote();
-                break;
-            case R.id.menu_delete:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(getString(R.string.alert_title_delete));
-                builder.setIcon(android.R.drawable.ic_dialog_alert);
-                builder.setMessage(getString(R.string.alert_message_delete_note));
-                builder.setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                deleteCurrentNote();
-                                finish();
-                            }
-                        });
-                builder.setNegativeButton(android.R.string.cancel, null);
-                builder.show();
-                break;
-            case R.id.menu_font_size:
-                mFontSizeSelector.setVisibility(View.VISIBLE);
-                findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
-                break;
-            case R.id.menu_list_mode:
-                mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
-                        TextNote.MODE_CHECK_LIST : 0);
-                break;
-            case R.id.menu_share:
-                getWorkingText();
-                sendTo(this, mWorkingNote.getContent());
-                break;
-            case R.id.menu_send_to_desktop:
-                sendToDesktop();
-                break;
-            case R.id.menu_alert:
-                setReminder();
-                break;
-            case R.id.menu_delete_remind:
-                mWorkingNote.setAlertDate(0, false);
-                break;
-            case R.id.menu_font_select:
-                showSingleAlertDiglog();
-                break;
-            default:
-                break;
-        }
-        return true;
-    }
-
-    private void setReminder() {
-        DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
-        d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
-            public void OnDateTimeSet(AlertDialog dialog, long date) {
-                mWorkingNote.setAlertDate(date, true);
-            }
-        });
-        d.show();
-    }
-
-    private void sendTo(Context context, String info) {
-        Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.putExtra(Intent.EXTRA_TEXT, info);
-        intent.setType("text/plain");
-        context.startActivity(intent);
-    }
-
-    private void createNewNote() {
-        // Firstly, save current editing notes
-        saveNote();
-
-        // For safety, start a new NoteEditActivity
-        finish();
-        Intent intent = new Intent(this, NoteEditActivity.class);
-        intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
-        intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
-        startActivity(intent);
-    }
-
-    private void deleteCurrentNote() {
-        if (mWorkingNote.existInDatabase()) {
-            HashSet<Long> ids = new HashSet<Long>();
-            long id = mWorkingNote.getNoteId();
-            if (id != Notes.ID_ROOT_FOLDER) {
-                ids.add(id);
-            } else {
-                Log.d(TAG, "Wrong note id, should not happen");
-            }
-            if (!isSyncMode()) {
-                if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
-                    Log.e(TAG, "Delete Note error");
-                }
-            } else {
-                if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
-                    Log.e(TAG, "Move notes to trash folder error, should not happens");
-                }
-            }
-        }
-        mWorkingNote.markDeleted(true);
-    }
-
-    private boolean isSyncMode() {
-        return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
-    }
-
-    public void onClockAlertChanged(long date, boolean set) {
-        /**
-         * User could set clock to an unsaved note, so before setting the
-         * alert clock, we should save the note first
-         */
-        if (!mWorkingNote.existInDatabase()) {
-            saveNote();
-        }
-        if (mWorkingNote.getNoteId() > 0) {
-            Intent intent = new Intent(this, AlarmReceiver.class);
-            intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
-            AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
-            showAlertHeader();
-            if (!set) {
-                alarmManager.cancel(pendingIntent);
-            } else {
-                alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
-            }
-        } else {
-            /**
-             * There is the condition that user has input nothing (the note is
-             * not worthy saving), we have no note id, remind the user that he
-             * should input something
-             */
-            Log.e(TAG, "Clock alert setting error");
-            showToast(R.string.error_note_empty_for_clock);
-        }
-    }
-
-    public void onWidgetChanged() {
-        updateWidget();
-    }
-
-    public void onEditTextDelete(int index, String text) {
-        int childCount = mEditTextList.getChildCount();
-        if (childCount == 1) {
-            return;
-        }
-
-        for (int i = index + 1; i < childCount; i++) {
-            ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
-                    .setIndex(i - 1);
-        }
-
-        mEditTextList.removeViewAt(index);
-        NoteEditText edit = null;
-        if (index == 0) {
-            edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
-                    R.id.et_edit_text);
-        } else {
-            edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
-                    R.id.et_edit_text);
-        }
-        int length = edit.length();
-        edit.append(text);
-        edit.requestFocus();
-        edit.setSelection(length);
-    }
-
-    public void onEditTextEnter(int index, String text) {
-        /**
-         * Should not happen, check for debug
-         */
-        if (index > mEditTextList.getChildCount()) {
-            Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
-        }
-
-        View view = getListItem(text, index);
-        mEditTextList.addView(view, index);
-        NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
-        edit.requestFocus();
-        edit.setSelection(0);
-        for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
-            ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
-                    .setIndex(i);
-        }
-    }
-
-    private void switchToListMode(String text) {
-        mEditTextList.removeAllViews();
-        String[] items = text.split("\n");
-        int index = 0;
-        for (String item : items) {
-            if (!TextUtils.isEmpty(item)) {
-                mEditTextList.addView(getListItem(item, index));
-                index++;
-            }
-        }
-        mEditTextList.addView(getListItem("", index));
-        mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
-
-        mNoteEditor.setVisibility(View.GONE);
-        mEditTextList.setVisibility(View.VISIBLE);
-    }
-
-    private Spannable getHighlightQueryResult(String fullText, String userQuery) {
-        SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
-        if (!TextUtils.isEmpty(userQuery)) {
-            mPattern = Pattern.compile(userQuery);
-            Matcher m = mPattern.matcher(fullText);
-            int start = 0;
-            while (m.find(start)) {
-                spannable.setSpan(
-                        new BackgroundColorSpan(this.getResources().getColor(
-                                R.color.user_query_highlight)), m.start(), m.end(),
-                        Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-                start = m.end();
-            }
-        }
-        return spannable;
-    }
-
-    private View getListItem(String item, int index) {
-        View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
-        final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
-        edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
-        CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
-        cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                } else {
-                    edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
-                }
-            }
-        });
-
-        if (item.startsWith(TAG_CHECKED)) {
-            cb.setChecked(true);
-            edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-            item = item.substring(TAG_CHECKED.length(), item.length()).trim();
-        } else if (item.startsWith(TAG_UNCHECKED)) {
-            cb.setChecked(false);
-            edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
-            item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
-        }
-
-        edit.setOnTextViewChangeListener(this);
-        edit.setIndex(index);
-        edit.setText(getHighlightQueryResult(item, mUserQuery));
-        return view;
-    }
-
-    public void onTextChange(int index, boolean hasText) {
-        if (index >= mEditTextList.getChildCount()) {
-            Log.e(TAG, "Wrong index, should not happen");
-            return;
-        }
-        if (hasText) {
-            mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
-        } else {
-            mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
-        }
-    }
-
-    public void onCheckListModeChanged(int oldMode, int newMode) {
-        if (newMode == TextNote.MODE_CHECK_LIST) {
-            switchToListMode(mNoteEditor.getText().toString());
-        } else {
-            if (!getWorkingText()) {
-                mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", ""));
-            }
-            mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
-            mEditTextList.setVisibility(View.GONE);
-            mNoteEditor.setVisibility(View.VISIBLE);
-            convertToImage(); //退出清单模式，应该将有图片的地方显示出来
-        }
-    }
-
-    private boolean getWorkingText() {
-        boolean hasChecked = false;
-        if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < mEditTextList.getChildCount(); i++) {
-                View view = mEditTextList.getChildAt(i);
-                NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
-                if (!TextUtils.isEmpty(edit.getText())) {
-                    if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
-                        sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
-                        hasChecked = true;
-                    } else {
-                        sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
-                    }
-                }
-            }
-            mWorkingNote.setWorkingText(sb.toString());
-        } else {
-            mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
-        }
-        return hasChecked;
-    }
-
-    private boolean saveNote() {
-        getWorkingText();
-        boolean saved = mWorkingNote.saveNote();
-        if (saved) {
-            /**
-             * There are two modes from List view to edit view, open one note,
-             * create/edit a node. Opening node requires to the original
-             * position in the list when back from edit view, while creating a
-             * new node requires to the top of the list. This code
-             * {@link #RESULT_OK} is used to identify the create/edit state
-             */
-            setResult(RESULT_OK);
-        }
-        return saved;
-    }
-
-    private void sendToDesktop() {
-        /**
-         * Before send message to home, we should make sure that current
-         * editing note is exists in databases. So, for new note, firstly
-         * save it
-         */
-        if (!mWorkingNote.existInDatabase()) {
-            saveNote();
-        }
-
-        if (mWorkingNote.getNoteId() > 0) {
-            Intent sender = new Intent();
-            Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
-            shortcutIntent.setAction(Intent.ACTION_VIEW);
-            shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
-            sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-            sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
-                    makeShortcutIconTitle(mWorkingNote.getContent()));
-            sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                    Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
-            sender.putExtra("duplicate", true);
-            sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
-            showToast(R.string.info_note_enter_desktop);
-            sendBroadcast(sender);
-        } else {
-            /**
-             * There is the condition that user has input nothing (the note is
-             * not worthy saving), we have no note id, remind the user that he
-             * should input something
-             */
-            Log.e(TAG, "Send to desktop error");
-            showToast(R.string.error_note_empty_for_send_to_desktop);
-        }
-    }
-
-    private String makeShortcutIconTitle(String content) {
-        content = content.replace(TAG_CHECKED, "");
-        content = content.replace(TAG_UNCHECKED, "");
-        return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
-                SHORTCUT_ICON_TITLE_MAX_LEN) : content;
-    }
-
-    private void showToast(int resId) {
-        showToast(resId, Toast.LENGTH_SHORT);
-    }
-
-    private void showToast(int resId, int duration) {
-        Toast.makeText(this, resId, duration).show();
-    }
-
-    @Override
-    //重写onActivityResult()来处理返回的数据
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-        ContentResolver resolver = getContentResolver();
-        switch (requestCode) {
-            case PHOTO_REQUEST:
-                Uri originalUri = intent.getData(); //1.获得图片的真实路径
-                Bitmap bitmap = null;
-                try {
-                    bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片
-                } catch (FileNotFoundException e) {
-                    Log.d(TAG, "onActivityResult: get file_exception");
-                    e.printStackTrace();
-                }
-
-                if (bitmap != null) {
-                    //3.根据Bitmap对象创建ImageSpan对象
-                    Log.d(TAG, "onActivityResult: bitmap is not null");
-                    ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap);
-                    String path = getPath(this, originalUri);
-                    //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置
-                    String img_fragment = "[local]" + path + "[/local]";
-                    //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像
-                    SpannableString spannableString = new SpannableString(img_fragment);
-                    spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    //5.将选择的图片追加到EditText中光标所在位置
-                    NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view);
-                    int index = e.getSelectionStart(); //获取光标所在位置
-                    Log.d(TAG, "Index是: " + index);
-                    Editable edit_text = e.getEditableText();
-                    edit_text.insert(index, spannableString); //将图片插入到光标所在位置
-
-                    mWorkingNote.mContent = e.getText().toString();
-                    //6.把改动提交到数据库中,两个数据库表都要改的
-                    ContentResolver contentResolver = getContentResolver();
-                    ContentValues contentValues = new ContentValues();
-                    final long id = mWorkingNote.getNoteId();
-                    contentValues.put("snippet", mWorkingNote.mContent);
-                    contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id});
-                    ContentValues contentValues1 = new ContentValues();
-                    contentValues1.put("content", mWorkingNote.mContent);
-                    contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, "mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note", "" + id});
-
-                } else {
-                    Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show();
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-
-    //获取文件的real path
-    public String getPath(final Context context, final Uri uri) {
-
-        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
-        // DocumentProvider
-        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-            if (isExternalStorageDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                if ("primary".equalsIgnoreCase(type)) {
-                    return Environment.getExternalStorageDirectory() + "/" + split[1];
-                }
-            }
-            // DownloadsProvider
-            else if (isDownloadsDocument(uri)) {
-                final String id = DocumentsContract.getDocumentId(uri);
-                final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
-                return getDataColumn(context, contentUri, null, null);
-            }
-            // MediaProvider
-            else if (isMediaDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[]{split[1]};
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
-        }
-        // Media
-        else if ("content".equalsIgnoreCase(uri.getScheme())) {
-            return getDataColumn(context, uri, null, null);
-        }
-        // File
-        else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-        return null;
-    }
-
-
-    //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。
-    public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
-        Cursor cursor = null;
-        final String column = "_data";
-        final String[] projection = {column};
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int column_index = cursor.getColumnIndexOrThrow(column);
-                return cursor.getString(column_index);
-            }
-        } finally {
-            if (cursor != null)
-                cursor.close();
-        }
-        return null;
-    }
-
-
-    //是否为外部存储文件
-    public boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-    //是否为下载文件
-    public boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    //是否为媒体文件
-    public boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-    public void showSingleAlertDiglog(){
-        final String[] items={"仿宋","黑体","楷体","宋体","新宋体"};
-        AlertDialog.Builder alertBuilder=new AlertDialog.Builder(this);
-        alertBuilder.setTitle("字体选择");
-        alertBuilder.setSingleChoiceItems(items,0,(dialogInterface, i) ->  {
-            switch (i) {
-                case 0:
-                    Typeface typeface0 = Typeface.createFromAsset(getAssets(), "Fonts/simfang.ttf");
-                    mNoteEditor.setTypeface(typeface0);
-                    break;
-                case 1:
-                    Typeface typeface1 = Typeface.createFromAsset(getAssets(), "Fonts/simhei.ttf");
-                    mNoteEditor.setTypeface(typeface1);
-                    break;
-                case 2:
-                    Typeface typeface2 = Typeface.createFromAsset(getAssets(), "Fonts/simkai.ttf");
-                    mNoteEditor.setTypeface(typeface2);
-                    break;
-                case 3:
-                    Typeface typeface3 = Typeface.createFromAsset(getAssets(), "Fonts/simsunb.ttf");
-                    mNoteEditor.setTypeface(typeface3);
-                    break;
-                case 4:
-                    Typeface typeface4 = Typeface.createFromAsset(getAssets(), "Fonts/simsun.ttc");
-                    mNoteEditor.setTypeface(typeface4);
-                    break;
-            }
-            Toast.makeText(NoteEditActivity.this,items[i],Toast.LENGTH_SHORT).show();
-        });
-        alertBuilder.setPositiveButton("确定",(dialogInterface, i) -> {
-            alertDialog2.dismiss();
-        });
-        alertBuilder.setNegativeButton("取消",(dialogInterface, i) -> {
-            alertDialog2.dismiss();
-        });
-        alertDialog2=alertBuilder.create();
-        alertDialog2.show();
-    }    
-
-
-    private void start() {
-        Toast.makeText(NoteEditActivity.this, "请开始说话", Toast.LENGTH_SHORT).show();
-        Map<String, Object> params = new LinkedHashMap<>();//传递Map<String,Object>的参数，会将Map自动序列化为json
-        String event = null;
-        event = SpeechConstant.ASR_START;
-        params.put(SpeechConstant.ACCEPT_AUDIO_VOLUME, false);//回调当前音量
-        String json = null;
-        json = new JSONObject(params).toString();//demo用json数据来做数据交换的方式
-        asr.send(event, json, null, 0, 0);// 初始化EventManager对象,这个实例只能创建一次，就是我们上方创建的asr，此处开始传入
-    }
-
-    private void stop() {
-        //txtResult.append("停止识别：ASR_STOP");
-        asr.send(SpeechConstant.ASR_STOP, null, null, 0, 0);//此处停止
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        asr.send(SpeechConstant.ASR_CANCEL, "{}", null, 0, 0);
-        asr.unregisterListener(this);//退出事件管理器
-        // 必须与registerListener成对出现，否则可能造成内存泄露
-    }
-
-    public void onEvent(String name, String params, byte[] data, int offset, int length) {
-        String resultTxt = null;
-        //Log.i(TAG, params);
-        if (name.equals(SpeechConstant.CALLBACK_EVENT_ASR_PARTIAL)) {//识别结果参数
-            if (params.contains("\"final_result\"")) {//语义结果值
-                try {
-                    JSONObject json = new JSONObject(params);
-                    String result = json.getString("best_result");//取得key的识别结果
-                    resultTxt = result;
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        if (resultTxt != null) {
-            resultTxt += "\n";
-            txtResult.append(resultTxt);
-        }
-    }
-
-    private void initView() {
-        txtResult = findViewById(R.id.note_edit_view);
-        startBtn = findViewById(R.id.listen);
-        //stopBtn = findViewById(R.id.stop);
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java
deleted file mode 100644
index 2afe2a8..0000000
--- a/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.widget.EditText;
-
-import net.micode.notes.R;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class NoteEditText extends EditText {
-    private static final String TAG = "NoteEditText";
-    private int mIndex;
-    private int mSelectionStartBeforeDelete;
-
-    private static final String SCHEME_TEL = "tel:" ;
-    private static final String SCHEME_HTTP = "http:" ;
-    private static final String SCHEME_EMAIL = "mailto:" ;
-
-    private static final Map<String, Integer> sSchemaActionResMap = new HashMap<String, Integer>();
-    static {
-        sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
-        sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web);
-        sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email);
-    }
-
-    /**
-     * Call by the {@link NoteEditActivity} to delete or add edit text
-     */
-    public interface OnTextViewChangeListener {
-        /**
-         * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
-         * and the text is null
-         */
-        void onEditTextDelete(int index, String text);
-
-        /**
-         * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
-         * happen
-         */
-        void onEditTextEnter(int index, String text);
-
-        /**
-         * Hide or show item option when text change
-         */
-        void onTextChange(int index, boolean hasText);
-    }
-
-    private OnTextViewChangeListener mOnTextViewChangeListener;
-
-    public NoteEditText(Context context) {
-        super(context, null);
-        mIndex = 0;
-    }
-
-    public void setIndex(int index) {
-        mIndex = index;
-    }
-
-    public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
-        mOnTextViewChangeListener = listener;
-    }
-
-    public NoteEditText(Context context, AttributeSet attrs) {
-        super(context, attrs, android.R.attr.editTextStyle);
-    }
-
-    public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        // TODO Auto-generated constructor stub
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-
-                int x = (int) event.getX();
-                int y = (int) event.getY();
-                x -= getTotalPaddingLeft();
-                y -= getTotalPaddingTop();
-                x += getScrollX();
-                y += getScrollY();
-
-                Layout layout = getLayout();
-                int line = layout.getLineForVertical(y);
-                int off = layout.getOffsetForHorizontal(line, x);
-                Selection.setSelection(getText(), off);
-                break;
-        }
-
-        return super.onTouchEvent(event);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_ENTER:
-                if (mOnTextViewChangeListener != null) {
-                    return false;
-                }
-                break;
-            case KeyEvent.KEYCODE_DEL:
-                mSelectionStartBeforeDelete = getSelectionStart();
-                break;
-            default:
-                break;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        switch(keyCode) {
-            case KeyEvent.KEYCODE_DEL:
-                if (mOnTextViewChangeListener != null) {
-                    if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
-                        mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
-                        return true;
-                    }
-                } else {
-                    Log.d(TAG, "OnTextViewChangeListener was not seted");
-                }
-                break;
-            case KeyEvent.KEYCODE_ENTER:
-                if (mOnTextViewChangeListener != null) {
-                    int selectionStart = getSelectionStart();
-                    String text = getText().subSequence(selectionStart, length()).toString();
-                    setText(getText().subSequence(0, selectionStart));
-                    mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
-                } else {
-                    Log.d(TAG, "OnTextViewChangeListener was not seted");
-                }
-                break;
-            default:
-                break;
-        }
-        return super.onKeyUp(keyCode, event);
-    }
-
-    @Override
-    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
-        if (mOnTextViewChangeListener != null) {
-            if (!focused && TextUtils.isEmpty(getText())) {
-                mOnTextViewChangeListener.onTextChange(mIndex, false);
-            } else {
-                mOnTextViewChangeListener.onTextChange(mIndex, true);
-            }
-        }
-        super.onFocusChanged(focused, direction, previouslyFocusedRect);
-    }
-
-    @Override
-    protected void onCreateContextMenu(ContextMenu menu) {
-        if (getText() instanceof Spanned) {
-            int selStart = getSelectionStart();
-            int selEnd = getSelectionEnd();
-
-            int min = Math.min(selStart, selEnd);
-            int max = Math.max(selStart, selEnd);
-
-            final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
-            if (urls.length == 1) {
-                int defaultResId = 0;
-                for(String schema: sSchemaActionResMap.keySet()) {
-                    if(urls[0].getURL().indexOf(schema) >= 0) {
-                        defaultResId = sSchemaActionResMap.get(schema);
-                        break;
-                    }
-                }
-
-                if (defaultResId == 0) {
-                    defaultResId = R.string.note_link_other;
-                }
-
-                menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
-                        new OnMenuItemClickListener() {
-                            public boolean onMenuItemClick(MenuItem item) {
-                                // goto a new intent
-                                urls[0].onClick(NoteEditText.this);
-                                return true;
-                            }
-                        });
-            }
-        }
-        super.onCreateContextMenu(menu);
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java
deleted file mode 100644
index 12421d1..0000000
--- a/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-
-import net.micode.notes.data.Contact;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.tool.DataUtils;
-
-
-public class NoteItemData {
-    static final String [] PROJECTION = new String [] {
-            NoteColumns.ID,
-            NoteColumns.ALERTED_DATE,
-            NoteColumns.BG_COLOR_ID,
-            NoteColumns.CREATED_DATE,
-            NoteColumns.HAS_ATTACHMENT,
-            NoteColumns.MODIFIED_DATE,
-            NoteColumns.NOTES_COUNT,
-            NoteColumns.PARENT_ID,
-            NoteColumns.SNIPPET,
-            NoteColumns.TYPE,
-            NoteColumns.WIDGET_ID,
-            NoteColumns.WIDGET_TYPE
-    };
-
-    private static final int ID_COLUMN                    = 0;
-    private static final int ALERTED_DATE_COLUMN          = 1;
-    private static final int BG_COLOR_ID_COLUMN           = 2;
-    private static final int CREATED_DATE_COLUMN          = 3;
-    private static final int HAS_ATTACHMENT_COLUMN        = 4;
-    private static final int MODIFIED_DATE_COLUMN         = 5;
-    private static final int NOTES_COUNT_COLUMN           = 6;
-    private static final int PARENT_ID_COLUMN             = 7;
-    private static final int SNIPPET_COLUMN               = 8;
-    private static final int TYPE_COLUMN                  = 9;
-    private static final int WIDGET_ID_COLUMN             = 10;
-    private static final int WIDGET_TYPE_COLUMN           = 11;
-
-    private long mId;
-    private long mAlertDate;
-    private int mBgColorId;
-    private long mCreatedDate;
-    private boolean mHasAttachment;
-    private long mModifiedDate;
-    private int mNotesCount;
-    private long mParentId;
-    private String mSnippet;
-    private int mType;
-    private int mWidgetId;
-    private int mWidgetType;
-    private String mName;
-    private String mPhoneNumber;
-
-    private boolean mIsLastItem;
-    private boolean mIsFirstItem;
-    private boolean mIsOnlyOneItem;
-    private boolean mIsOneNoteFollowingFolder;
-    private boolean mIsMultiNotesFollowingFolder;
-
-    public NoteItemData(Context context, Cursor cursor) {
-        mId = cursor.getLong(ID_COLUMN);
-        mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
-        mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
-        mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
-        mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
-        mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
-        mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN);
-        mParentId = cursor.getLong(PARENT_ID_COLUMN);
-        mSnippet = cursor.getString(SNIPPET_COLUMN);
-        mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace(
-                NoteEditActivity.TAG_UNCHECKED, "");
-        mType = cursor.getInt(TYPE_COLUMN);
-        mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
-        mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
-
-        mPhoneNumber = "";
-        if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
-            mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
-            if (!TextUtils.isEmpty(mPhoneNumber)) {
-                mName = Contact.getContact(context, mPhoneNumber);
-                if (mName == null) {
-                    mName = mPhoneNumber;
-                }
-            }
-        }
-
-        if (mName == null) {
-            mName = "";
-        }
-        checkPostion(cursor);
-    }
-
-    private void checkPostion(Cursor cursor) {
-        mIsLastItem = cursor.isLast() ? true : false;
-        mIsFirstItem = cursor.isFirst() ? true : false;
-        mIsOnlyOneItem = (cursor.getCount() == 1);
-        mIsMultiNotesFollowingFolder = false;
-        mIsOneNoteFollowingFolder = false;
-
-        if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
-            int position = cursor.getPosition();
-            if (cursor.moveToPrevious()) {
-                if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
-                        || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
-                    if (cursor.getCount() > (position + 1)) {
-                        mIsMultiNotesFollowingFolder = true;
-                    } else {
-                        mIsOneNoteFollowingFolder = true;
-                    }
-                }
-                if (!cursor.moveToNext()) {
-                    throw new IllegalStateException("cursor move to previous but can't move back");
-                }
-            }
-        }
-    }
-
-    public boolean isOneFollowingFolder() {
-        return mIsOneNoteFollowingFolder;
-    }
-
-    public boolean isMultiFollowingFolder() {
-        return mIsMultiNotesFollowingFolder;
-    }
-
-    public boolean isLast() {
-        return mIsLastItem;
-    }
-
-    public String getCallName() {
-        return mName;
-    }
-
-    public boolean isFirst() {
-        return mIsFirstItem;
-    }
-
-    public boolean isSingle() {
-        return mIsOnlyOneItem;
-    }
-
-    public long getId() {
-        return mId;
-    }
-
-    public long getAlertDate() {
-        return mAlertDate;
-    }
-
-    public long getCreatedDate() {
-        return mCreatedDate;
-    }
-
-    public boolean hasAttachment() {
-        return mHasAttachment;
-    }
-
-    public long getModifiedDate() {
-        return mModifiedDate;
-    }
-
-    public int getBgColorId() {
-        return mBgColorId;
-    }
-
-    public long getParentId() {
-        return mParentId;
-    }
-
-    public int getNotesCount() {
-        return mNotesCount;
-    }
-
-    public long getFolderId () {
-        return mParentId;
-    }
-
-    public int getType() {
-        return mType;
-    }
-
-    public int getWidgetType() {
-        return mWidgetType;
-    }
-
-    public int getWidgetId() {
-        return mWidgetId;
-    }
-
-    public String getSnippet() {
-        return mSnippet;
-    }
-
-    public boolean hasAlert() {
-        return (mAlertDate > 0);
-    }
-
-    public boolean isCallRecord() {
-        return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
-    }
-
-    public static int getNoteType(Cursor cursor) {
-        return cursor.getInt(TYPE_COLUMN);
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java
deleted file mode 100644
index a34aaeb..0000000
--- a/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ /dev/null
@@ -1,1056 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.appwidget.AppWidgetManager;
-import android.content.AsyncQueryHandler;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.ActionMode;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Display;
-import android.view.HapticFeedbackConstants;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnCreateContextMenuListener;
-import android.view.View.OnTouchListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.GridView;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.micode.notes.PaintView;
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.remote.GTaskSyncService;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.tool.BackupUtils;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashSet;
-
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
-    private int mode = - 1;
-
-    private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
-
-    private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
-
-    private static final int MENU_FOLDER_DELETE = 0;
-
-    private static final int MENU_FOLDER_VIEW = 1;
-
-    private static final int MENU_FOLDER_CHANGE_NAME = 2;
-
-    private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
-
-    private enum ListEditState {
-        NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
-    };
-
-    private ListEditState mState;
-
-    private BackgroundQueryHandler mBackgroundQueryHandler;
-
-    private NotesListAdapter mNotesListAdapter;
-
-    private ListView mNotesListView;
-
-    private Button mAddNewNote;
-
-    private boolean mDispatch;
-
-    private int mOriginY;
-
-    private int mDispatchY;
-
-    private TextView mTitleBar;
-
-    private long mCurrentFolderId;
-
-    private ContentResolver mContentResolver;
-
-    private ModeCallback mModeCallBack;
-
-    private PaintView paintView;
-
-    private GridView paint_bottomMenu;
-
-    private static final String TAG = "NotesListActivity";
-
-    public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
-
-    private NoteItemData mFocusNoteDataItem;
-
-    private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
-
-    private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>"
-            + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR ("
-            + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND "
-            + NoteColumns.NOTES_COUNT + ">0)";
-
-    private final static int REQUEST_CODE_OPEN_NODE = 102;
-    private final static int REQUEST_CODE_NEW_NODE  = 103;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.note_list);
-        initResources();
-
-        /**
-         * Insert an introduction when user firstly use this application
-         */
-        setAppInfoFromRawRes();
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode == RESULT_OK
-                && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
-            mNotesListAdapter.changeCursor(null);
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    private void setAppInfoFromRawRes() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
-        if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
-            StringBuilder sb = new StringBuilder();
-            InputStream in = null;
-            try {
-                 in = getResources().openRawResource(R.raw.introduction);
-                if (in != null) {
-                    InputStreamReader isr = new InputStreamReader(in);
-                    BufferedReader br = new BufferedReader(isr);
-                    char [] buf = new char[1024];
-                    int len = 0;
-                    while ((len = br.read(buf)) > 0) {
-                        sb.append(buf, 0, len);
-                    }
-                } else {
-                    Log.e(TAG, "Read introduction file error");
-                    return;
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            } finally {
-                if(in != null) {
-                    try {
-                        in.close();
-                    } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            }
-
-            WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
-                    AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
-                    ResourceParser.RED);
-            note.setWorkingText(sb.toString());
-            if (note.saveNote()) {
-                sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
-            } else {
-                Log.e(TAG, "Save introduction note error");
-                return;
-            }
-        }
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        startAsyncNotesListQuery();
-    }
-
-    private void initResources() {
-        mContentResolver = this.getContentResolver();
-        mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
-        mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-        mNotesListView = (ListView) findViewById(R.id.notes_list);
-        mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
-                null, false);
-        mNotesListView.setOnItemClickListener(new OnListItemClickListener());
-        mNotesListView.setOnItemLongClickListener(this);
-        mNotesListAdapter = new NotesListAdapter(this);
-        mNotesListView.setAdapter(mNotesListAdapter);
-        mAddNewNote = (Button) findViewById(R.id.btn_new_note);
-        mAddNewNote.setOnClickListener(this);
-        mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
-        mDispatch = false;
-        mDispatchY = 0;
-        mOriginY = 0;
-        mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
-        mState = ListEditState.NOTE_LIST;
-        mModeCallBack = new ModeCallback();
-    }
-
-    private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
-        private DropdownMenu mDropDownMenu;
-        private ActionMode mActionMode;
-        private MenuItem mMoveMenu;
-
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            getMenuInflater().inflate(R.menu.note_list_options, menu);
-            menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
-            mMoveMenu = menu.findItem(R.id.move);
-            if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
-                    || DataUtils.getUserFolderCount(mContentResolver) == 0) {
-                mMoveMenu.setVisible(false);
-            } else {
-                mMoveMenu.setVisible(true);
-                mMoveMenu.setOnMenuItemClickListener(this);
-            }
-            mActionMode = mode;
-            mNotesListAdapter.setChoiceMode(true);
-            mNotesListView.setLongClickable(false);
-            mAddNewNote.setVisibility(View.GONE);
-
-            View customView = LayoutInflater.from(NotesListActivity.this).inflate(
-                    R.layout.note_list_dropdown_menu, null);
-            mode.setCustomView(customView);
-            mDropDownMenu = new DropdownMenu(NotesListActivity.this,
-                    (Button) customView.findViewById(R.id.selection_menu),
-                    R.menu.note_list_dropdown);
-            mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
-                public boolean onMenuItemClick(MenuItem item) {
-                    mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
-                    updateMenu();
-                    return true;
-                }
-
-            });
-            return true;
-        }
-
-        private void updateMenu() {
-            int selectedCount = mNotesListAdapter.getSelectedCount();
-            // Update dropdown menu
-            String format = getResources().getString(R.string.menu_select_title, selectedCount);
-            mDropDownMenu.setTitle(format);
-            MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
-            if (item != null) {
-                if (mNotesListAdapter.isAllSelected()) {
-                    item.setChecked(true);
-                    item.setTitle(R.string.menu_deselect_all);
-                } else {
-                    item.setChecked(false);
-                    item.setTitle(R.string.menu_select_all);
-                }
-            }
-        }
-
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            // TODO Auto-generated method stub
-            return false;
-        }
-
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            // TODO Auto-generated method stub
-            return false;
-        }
-
-        public void onDestroyActionMode(ActionMode mode) {
-            mNotesListAdapter.setChoiceMode(false);
-            mNotesListView.setLongClickable(true);
-            mAddNewNote.setVisibility(View.VISIBLE);
-        }
-
-        public void finishActionMode() {
-            mActionMode.finish();
-        }
-
-        public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
-                boolean checked) {
-            mNotesListAdapter.setCheckedItem(position, checked);
-            updateMenu();
-        }
-
-        public boolean onMenuItemClick(MenuItem item) {
-            if (mNotesListAdapter.getSelectedCount() == 0) {
-                Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
-                        Toast.LENGTH_SHORT).show();
-                return true;
-            }
-
-            switch (item.getItemId()) {
-                case R.id.delete:
-                    AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-                    builder.setTitle(getString(R.string.alert_title_delete));
-                    builder.setIcon(android.R.drawable.ic_dialog_alert);
-                    builder.setMessage(getString(R.string.alert_message_delete_notes,
-                                             mNotesListAdapter.getSelectedCount()));
-                    builder.setPositiveButton(android.R.string.ok,
-                                             new DialogInterface.OnClickListener() {
-                                                 public void onClick(DialogInterface dialog,
-                                                         int which) {
-                                                     batchDelete();
-                                                 }
-                                             });
-                    builder.setNegativeButton(android.R.string.cancel, null);
-                    builder.show();
-                    break;
-                case R.id.move:
-                    startQueryDestinationFolders();
-                    break;
-                default:
-                    return false;
-            }
-            return true;
-        }
-    }
-
-    private class NewNoteOnTouchListener implements OnTouchListener {
-
-        public boolean onTouch(View v, MotionEvent event) {
-            switch (event.getAction()) {
-                case MotionEvent.ACTION_DOWN: {
-                    Display display = getWindowManager().getDefaultDisplay();
-                    int screenHeight = display.getHeight();
-                    int newNoteViewHeight = mAddNewNote.getHeight();
-                    int start = screenHeight - newNoteViewHeight;
-                    int eventY = start + (int) event.getY();
-                    /**
-                     * Minus TitleBar's height
-                     */
-                    if (mState == ListEditState.SUB_FOLDER) {
-                        eventY -= mTitleBar.getHeight();
-                        start -= mTitleBar.getHeight();
-                    }
-                    /**
-                     * HACKME:When click the transparent part of "New Note" button, dispatch
-                     * the event to the list view behind this button. The transparent part of
-                     * "New Note" button could be expressed by formula y=-0.12x+94（Unit:pixel）
-                     * and the line top of the button. The coordinate based on left of the "New
-                     * Note" button. The 94 represents maximum height of the transparent part.
-                     * Notice that, if the background of the button changes, the formula should
-                     * also change. This is very bad, just for the UI designer's strong requirement.
-                     */
-                    if (event.getY() < (event.getX() * (-0.12) + 94)) {
-                        View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
-                                - mNotesListView.getFooterViewsCount());
-                        if (view != null && view.getBottom() > start
-                                && (view.getTop() < (start + 94))) {
-                            mOriginY = (int) event.getY();
-                            mDispatchY = eventY;
-                            event.setLocation(event.getX(), mDispatchY);
-                            mDispatch = true;
-                            return mNotesListView.dispatchTouchEvent(event);
-                        }
-                    }
-                    break;
-                }
-                case MotionEvent.ACTION_MOVE: {
-                    if (mDispatch) {
-                        mDispatchY += (int) event.getY() - mOriginY;
-                        event.setLocation(event.getX(), mDispatchY);
-                        return mNotesListView.dispatchTouchEvent(event);
-                    }
-                    break;
-                }
-                default: {
-                    if (mDispatch) {
-                        event.setLocation(event.getX(), mDispatchY);
-                        mDispatch = false;
-                        return mNotesListView.dispatchTouchEvent(event);
-                    }
-                    break;
-                }
-            }
-            return false;
-        }
-
-    };
-
-    private void startAsyncNotesListQuery() {
-        String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
-                : NORMAL_SELECTION;
-        mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
-                Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
-                    String.valueOf(mCurrentFolderId)
-                }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
-    }
-
-    private final class BackgroundQueryHandler extends AsyncQueryHandler {
-        public BackgroundQueryHandler(ContentResolver contentResolver) {
-            super(contentResolver);
-        }
-
-        @Override
-        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
-            switch (token) {
-                case FOLDER_NOTE_LIST_QUERY_TOKEN:
-                    mNotesListAdapter.changeCursor(cursor);
-                    break;
-                case FOLDER_LIST_QUERY_TOKEN:
-                    if (cursor != null && cursor.getCount() > 0) {
-                        showFolderListMenu(cursor);
-                    } else {
-                        Log.e(TAG, "Query folder failed");
-                    }
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-
-    private void showFolderListMenu(Cursor cursor) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-        builder.setTitle(R.string.menu_title_select_folder);
-        final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
-        builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
-
-            public void onClick(DialogInterface dialog, int which) {
-                DataUtils.batchMoveToFolder(mContentResolver,
-                        mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
-                Toast.makeText(
-                        NotesListActivity.this,
-                        getString(R.string.format_move_notes_to_folder,
-                                mNotesListAdapter.getSelectedCount(),
-                                adapter.getFolderName(NotesListActivity.this, which)),
-                        Toast.LENGTH_SHORT).show();
-                mModeCallBack.finishActionMode();
-            }
-        });
-        builder.show();
-    }
-
-    private void createNewNote() {
-        Intent intent = new Intent(this, NoteEditActivity.class);
-        intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
-        intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
-        this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
-    }
-
-    private void batchDelete() {
-        new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
-            protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
-                HashSet<AppWidgetAttribute> widgets = mNotesListAdapter.getSelectedWidget();
-                if (!isSyncMode()) {
-                    // if not synced, delete notes directly
-                    if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
-                            .getSelectedItemIds())) {
-                    } else {
-                        Log.e(TAG, "Delete notes error, should not happens");
-                    }
-                } else {
-                    // in sync mode, we'll move the deleted note into the trash
-                    // folder
-                    if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
-                            .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
-                        Log.e(TAG, "Move notes to trash folder error, should not happens");
-                    }
-                }
-                return widgets;
-            }
-
-            @Override
-            protected void onPostExecute(HashSet<AppWidgetAttribute> widgets) {
-                if (widgets != null) {
-                    for (AppWidgetAttribute widget : widgets) {
-                        if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                                && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
-                            updateWidget(widget.widgetId, widget.widgetType);
-                        }
-                    }
-                }
-                mModeCallBack.finishActionMode();
-            }
-        }.execute();
-    }
-
-    private void deleteFolder(long folderId) {
-        if (folderId == Notes.ID_ROOT_FOLDER) {
-            Log.e(TAG, "Wrong folder id, should not happen " + folderId);
-            return;
-        }
-
-        HashSet<Long> ids = new HashSet<Long>();
-        ids.add(folderId);
-        HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
-                folderId);
-        if (!isSyncMode()) {
-            // if not synced, delete folder directly
-            DataUtils.batchDeleteNotes(mContentResolver, ids);
-        } else {
-            // in sync mode, we'll move the deleted folder into the trash folder
-            DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);
-        }
-        if (widgets != null) {
-            for (AppWidgetAttribute widget : widgets) {
-                if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
-                        && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
-                    updateWidget(widget.widgetId, widget.widgetType);
-                }
-            }
-        }
-    }
-
-    private void openNode(NoteItemData data) {
-        Log.i("open","Node");
-        Intent intent = new Intent(this, NoteEditActivity.class);
-        intent.setAction(Intent.ACTION_VIEW);
-        intent.putExtra(Intent.EXTRA_UID, data.getId());
-        this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
-    }
-
-    private void openFolder(NoteItemData data) {
-        mCurrentFolderId = data.getId();
-        startAsyncNotesListQuery();
-        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mState = ListEditState.CALL_RECORD_FOLDER;
-            mAddNewNote.setVisibility(View.GONE);
-        } else {
-            mState = ListEditState.SUB_FOLDER;
-        }
-        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mTitleBar.setText(R.string.call_record_folder_name);
-        } else {
-            mTitleBar.setText(data.getSnippet());
-        }
-        mTitleBar.setVisibility(View.VISIBLE);
-    }
-
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btn_new_note:
-                createNewNote();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void showSoftInput() {
-        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (inputMethodManager != null) {
-            inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
-        }
-    }
-
-    private void hideSoftInput(View view) {
-        InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    private void showCreateOrModifyFolderDialog(final boolean create) {
-        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null);
-        final EditText etName = (EditText) view.findViewById(R.id.et_foler_name);
-        showSoftInput();
-        if (!create) {
-            if (mFocusNoteDataItem != null) {
-                etName.setText(mFocusNoteDataItem.getSnippet());
-                builder.setTitle(getString(R.string.menu_folder_change_name));
-            } else {
-                Log.e(TAG, "The long click data item is null");
-                return;
-            }
-        } else {
-            etName.setText("");
-            builder.setTitle(this.getString(R.string.menu_create_folder));
-        }
-
-        builder.setPositiveButton(android.R.string.ok, null);
-        builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                hideSoftInput(etName);
-            }
-        });
-
-        final Dialog dialog = builder.setView(view).show();
-        final Button positive = (Button)dialog.findViewById(android.R.id.button1);
-        positive.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-                hideSoftInput(etName);
-                String name = etName.getText().toString();
-                if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {
-                    Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name),
-                            Toast.LENGTH_LONG).show();
-                    etName.setSelection(0, etName.length());
-                    return;
-                }
-                if (!create) {
-                    if (!TextUtils.isEmpty(name)) {
-                        ContentValues values = new ContentValues();
-                        values.put(NoteColumns.SNIPPET, name);
-                        values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-                        values.put(NoteColumns.LOCAL_MODIFIED, 1);
-                        mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
-                                + "=?", new String[] {
-                            String.valueOf(mFocusNoteDataItem.getId())
-                        });
-                    }
-                } else if (!TextUtils.isEmpty(name)) {
-                    ContentValues values = new ContentValues();
-                    values.put(NoteColumns.SNIPPET, name);
-                    values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-                    mContentResolver.insert(Notes.CONTENT_NOTE_URI, values);
-                }
-                dialog.dismiss();
-            }
-        });
-
-        if (TextUtils.isEmpty(etName.getText())) {
-            positive.setEnabled(false);
-        }
-        /**
-         * When the name edit text is null, disable the positive button
-         */
-        etName.addTextChangedListener(new TextWatcher() {
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                // TODO Auto-generated method stub
-
-            }
-
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (TextUtils.isEmpty(etName.getText())) {
-                    positive.setEnabled(false);
-                } else {
-                    positive.setEnabled(true);
-                }
-            }
-
-            public void afterTextChanged(Editable s) {
-                // TODO Auto-generated method stub
-
-            }
-        });
-    }
-
-    @Override
-    public void onBackPressed() {
-        switch (mState) {
-            case SUB_FOLDER:
-                mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-                mState = ListEditState.NOTE_LIST;
-                startAsyncNotesListQuery();
-                mTitleBar.setVisibility(View.GONE);
-                break;
-            case CALL_RECORD_FOLDER:
-                mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-                mState = ListEditState.NOTE_LIST;
-                mAddNewNote.setVisibility(View.VISIBLE);
-                mTitleBar.setVisibility(View.GONE);
-                startAsyncNotesListQuery();
-                break;
-            case NOTE_LIST:
-                super.onBackPressed();
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void updateWidget(int appWidgetId, int appWidgetType) {
-        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        if (appWidgetType == Notes.TYPE_WIDGET_2X) {
-            intent.setClass(this, NoteWidgetProvider_2x.class);
-        } else if (appWidgetType == Notes.TYPE_WIDGET_4X) {
-            intent.setClass(this, NoteWidgetProvider_4x.class);
-        } else {
-            Log.e(TAG, "Unspported widget type");
-            return;
-        }
-
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
-            appWidgetId
-        });
-
-        sendBroadcast(intent);
-        setResult(RESULT_OK, intent);
-    }
-
-    private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
-        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-            if (mFocusNoteDataItem != null) {
-                menu.setHeaderTitle(mFocusNoteDataItem.getSnippet());
-                menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view);
-                menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete);
-                menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name);
-            }
-        }
-    };
-
-    @Override
-    public void onContextMenuClosed(Menu menu) {
-        if (mNotesListView != null) {
-            mNotesListView.setOnCreateContextMenuListener(null);
-        }
-        super.onContextMenuClosed(menu);
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        if (mFocusNoteDataItem == null) {
-            Log.e(TAG, "The long click data item is null");
-            return false;
-        }
-        switch (item.getItemId()) {
-            case MENU_FOLDER_VIEW:
-                openFolder(mFocusNoteDataItem);
-                break;
-            case MENU_FOLDER_DELETE:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(getString(R.string.alert_title_delete));
-                builder.setIcon(android.R.drawable.ic_dialog_alert);
-                builder.setMessage(getString(R.string.alert_message_delete_folder));
-                builder.setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                deleteFolder(mFocusNoteDataItem.getId());
-                            }
-                        });
-                builder.setNegativeButton(android.R.string.cancel, null);
-                builder.show();
-                break;
-            case MENU_FOLDER_CHANGE_NAME:
-                showCreateOrModifyFolderDialog(false);
-                break;
-            default:
-                break;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        menu.clear();
-        if (mState == ListEditState.NOTE_LIST) {
-            getMenuInflater().inflate(R.menu.note_list, menu);
-            // set sync or sync_cancel
-            menu.findItem(R.id.menu_sync).setTitle(
-                    GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
-        } else if (mState == ListEditState.SUB_FOLDER) {
-            getMenuInflater().inflate(R.menu.sub_folder, menu);
-        } else if (mState == ListEditState.CALL_RECORD_FOLDER) {
-            getMenuInflater().inflate(R.menu.call_record_folder, menu);
-        } else {
-            Log.e(TAG, "Wrong state:" + mState);
-        }
-        if(mode == 1){
-            menu.findItem(R.id.menu_girl).setVisible(false);
-        }
-        else if(mode == 2){
-            menu.findItem(R.id.menu_sea).setVisible(false);
-        }
-        else if(mode == 3){
-            menu.findItem(R.id.menu_sweet).setVisible(false);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_girl: {
-                mode = 1;
-                getWindow().setBackgroundDrawableResource(R.drawable.menu_girl);
-                break;
-            }
-            case R.id.menu_countallNotes: {
-                showNumberofNotes();
-                break;
-            }
-            case R.id.menu_sea: {
-                mode = 2;
-                getWindow().setBackgroundDrawableResource(R.drawable.menu_sea);
-                break;
-            }
-            case R.id.menu_sweet: {
-                mode = 3;
-                getWindow().setBackgroundDrawableResource(R.drawable.menu_sweet);
-                break;
-            }
-
-            case R.id.menu_new_folder: {
-                showCreateOrModifyFolderDialog(true);
-                break;
-            }
-            case R.id.menu_export_text: {
-                exportNoteToText();
-                break;
-            }
-            case R.id.menu_sync: {
-                if (isSyncMode()) {
-                    if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
-                        GTaskSyncService.startSync(this);
-                    } else {
-                        GTaskSyncService.cancelSync(this);
-                    }
-                } else {
-                    startPreferenceActivity();
-                }
-                break;
-            }
-            case R.id.menu_setting: {
-                startPreferenceActivity();
-                break;
-            }
-            case R.id.menu_new_note: {
-                createNewNote();
-                break;
-            }
-            case R.id.menu_search:
-                onSearchRequested();
-                break;
-            case R.id.menu_board: {
-
-                /* 新建一个Intent对象 */
-                Intent intent = new Intent();
-                /* 指定intent要启动的类 */
-                intent.setClass(NotesListActivity.this, BoardActivity.class);
-                /* 启动一个新的Activity */
-                startActivity(intent);
-                /* 关闭当前的Activity */
-                NotesListActivity.this.finish();
-                break;
-            }
-
-
-
-            case R.id.menu_login: {  //设置登录密码功能
-                SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
-                String password=pref.getString("password","");
-                if(password.equals(""))//没有设置密码
-                {
-
-                    set_login_password();
-
-                }
-
-                else //已经设置密码
-                    change_login_password();
-
-                break;
-            }
-            case R.id.menu_delete_login:{
-
-                delete_login_password();
-
-                break;
-            }
-            default:
-                break;
-        }
-        return true;
-    }
-    /////////////////////设置登录密码////////////////////////
-    private void set_login_password() {
-        Intent intent=new Intent(NotesListActivity.this, RegisterLoginPassword.class);
-        startActivity(intent);
-
-        finish();
-    }
-
-    ////////////////////更改密码////////////////
-    private void change_login_password() {
-        Intent intent=new Intent(NotesListActivity.this,ChangedLoginPassword.class);
-        startActivity(intent);
-        finish();
-    }
-
-    ///////////////删除登录密码///////////////////
-    private void delete_login_password() {
-        Intent intent=new Intent(NotesListActivity.this, DeleteLoginPassword.class);
-        startActivity(intent);
-
-        finish();
-    }
-    @Override
-    public boolean onSearchRequested() {
-        startSearch(null, false, null /* appData */, false);
-        return true;
-    }
-
-    private void exportNoteToText() {
-        final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
-        new AsyncTask<Void, Void, Integer>() {
-
-            @Override
-            protected Integer doInBackground(Void... unused) {
-                return backup.exportToText();
-            }
-
-            @Override
-            protected void onPostExecute(Integer result) {
-                if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-                    builder.setTitle(NotesListActivity.this
-                            .getString(R.string.failed_sdcard_export));
-                    builder.setMessage(NotesListActivity.this
-                            .getString(R.string.error_sdcard_unmounted));
-                    builder.setPositiveButton(android.R.string.ok, null);
-                    builder.show();
-                } else if (result == BackupUtils.STATE_SUCCESS) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-                    builder.setTitle(NotesListActivity.this
-                            .getString(R.string.success_sdcard_export));
-                    builder.setMessage(NotesListActivity.this.getString(
-                            R.string.format_exported_file_location, backup
-                                    .getExportedTextFileName(), backup.getExportedTextFileDir()));
-                    builder.setPositiveButton(android.R.string.ok, null);
-                    builder.show();
-                } else if (result == BackupUtils.STATE_SYSTEM_ERROR) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
-                    builder.setTitle(NotesListActivity.this
-                            .getString(R.string.failed_sdcard_export));
-                    builder.setMessage(NotesListActivity.this
-                            .getString(R.string.error_sdcard_export));
-                    builder.setPositiveButton(android.R.string.ok, null);
-                    builder.show();
-                }
-            }
-
-        }.execute();
-    }
-
-    private boolean isSyncMode() {
-        return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
-    }
-
-    private void startPreferenceActivity() {
-        Activity from = getParent() != null ? getParent() : this;
-        Intent intent = new Intent(from, NotesPreferenceActivity.class);
-        from.startActivityIfNeeded(intent, -1);
-    }
-
-    private class OnListItemClickListener implements OnItemClickListener {
-
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            if (view instanceof NotesListItem) {
-                NoteItemData item = ((NotesListItem) view).getItemData();
-                if (mNotesListAdapter.isInChoiceMode()) {
-                    if (item.getType() == Notes.TYPE_NOTE) {
-                        position = position - mNotesListView.getHeaderViewsCount();
-                        mModeCallBack.onItemCheckedStateChanged(null, position, id,
-                                !mNotesListAdapter.isSelectedItem(position));
-                    }
-                    return;
-                }
-
-                switch (mState) {
-                    case NOTE_LIST:
-                        if (item.getType() == Notes.TYPE_FOLDER
-                                || item.getType() == Notes.TYPE_SYSTEM) {
-                            openFolder(item);
-                        } else if (item.getType() == Notes.TYPE_NOTE) {
-                            openNode(item);
-                        } else {
-                            Log.e(TAG, "Wrong note type in NOTE_LIST");
-                        }
-                        break;
-                    case SUB_FOLDER:
-                    case CALL_RECORD_FOLDER:
-                        if (item.getType() == Notes.TYPE_NOTE) {
-                            openNode(item);
-                        } else {
-                            Log.e(TAG, "Wrong note type in SUB_FOLDER");
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-    }
-
-    private void startQueryDestinationFolders() {
-        String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
-        selection = (mState == ListEditState.NOTE_LIST) ? selection:
-            "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
-
-        mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
-                null,
-                Notes.CONTENT_NOTE_URI,
-                FoldersListAdapter.PROJECTION,
-                selection,
-                new String[] {
-                        String.valueOf(Notes.TYPE_FOLDER),
-                        String.valueOf(Notes.ID_TRASH_FOLER),
-                        String.valueOf(mCurrentFolderId)
-                },
-                NoteColumns.MODIFIED_DATE + " DESC");
-    }
-
-    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-        if (view instanceof NotesListItem) {
-            mFocusNoteDataItem = ((NotesListItem) view).getItemData();
-            if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
-                if (mNotesListView.startActionMode(mModeCallBack) != null) {
-                    mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
-                    mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                } else {
-                    Log.e(TAG, "startActionMode fails");
-                }
-            } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
-                mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
-            }
-        }
-        return false;
-    }
-    private void showNumberofNotes() {
-        AlertDialog.Builder btr =new AlertDialog.Builder(this);
-        btr.setTitle("目前便签数");
-        btr.setMessage("目前有 "+Integer.toString(mNotesListAdapter.retCount())+"个便签");
-        btr.show();
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java
deleted file mode 100644
index 7236b84..0000000
--- a/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-
-import net.micode.notes.data.Notes;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
-
-public class NotesListAdapter extends CursorAdapter {
-    private static final String TAG = "NotesListAdapter";
-    private Context mContext;
-    private HashMap<Integer, Boolean> mSelectedIndex;
-    private int mNotesCount;
-    private boolean mChoiceMode;
-
-    public static class AppWidgetAttribute {
-        public int widgetId;
-        public int widgetType;
-    };
-
-    public NotesListAdapter(Context context) {
-        super(context, null);
-        mSelectedIndex = new HashMap<Integer, Boolean>();
-        mContext = context;
-        mNotesCount = 0;
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return new NotesListItem(context);
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        if (view instanceof NotesListItem) {
-            NoteItemData itemData = new NoteItemData(context, cursor);
-            ((NotesListItem) view).bind(context, itemData, mChoiceMode,
-                    isSelectedItem(cursor.getPosition()));
-        }
-    }
-
-    public void setCheckedItem(final int position, final boolean checked) {
-        mSelectedIndex.put(position, checked);
-        notifyDataSetChanged();
-    }
-
-    public boolean isInChoiceMode() {
-        return mChoiceMode;
-    }
-
-    public void setChoiceMode(boolean mode) {
-        mSelectedIndex.clear();
-        mChoiceMode = mode;
-    }
-
-    public void selectAll(boolean checked) {
-        Cursor cursor = getCursor();
-        for (int i = 0; i < getCount(); i++) {
-            if (cursor.moveToPosition(i)) {
-                if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
-                    setCheckedItem(i, checked);
-                }
-            }
-        }
-    }
-
-    public HashSet<Long> getSelectedItemIds() {
-        HashSet<Long> itemSet = new HashSet<Long>();
-        for (Integer position : mSelectedIndex.keySet()) {
-            if (mSelectedIndex.get(position) == true) {
-                Long id = getItemId(position);
-                if (id == Notes.ID_ROOT_FOLDER) {
-                    Log.d(TAG, "Wrong item id, should not happen");
-                } else {
-                    itemSet.add(id);
-                }
-            }
-        }
-
-        return itemSet;
-    }
-
-    public HashSet<AppWidgetAttribute> getSelectedWidget() {
-        HashSet<AppWidgetAttribute> itemSet = new HashSet<AppWidgetAttribute>();
-        for (Integer position : mSelectedIndex.keySet()) {
-            if (mSelectedIndex.get(position) == true) {
-                Cursor c = (Cursor) getItem(position);
-                if (c != null) {
-                    AppWidgetAttribute widget = new AppWidgetAttribute();
-                    NoteItemData item = new NoteItemData(mContext, c);
-                    widget.widgetId = item.getWidgetId();
-                    widget.widgetType = item.getWidgetType();
-                    itemSet.add(widget);
-                    /**
-                     * Don't close cursor here, only the adapter could close it
-                     */
-                } else {
-                    Log.e(TAG, "Invalid cursor");
-                    return null;
-                }
-            }
-        }
-        return itemSet;
-    }
-
-    public int getSelectedCount() {
-        Collection<Boolean> values = mSelectedIndex.values();
-        if (null == values) {
-            return 0;
-        }
-        Iterator<Boolean> iter = values.iterator();
-        int count = 0;
-        while (iter.hasNext()) {
-            if (true == iter.next()) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    public boolean isAllSelected() {
-        int checkedCount = getSelectedCount();
-        return (checkedCount != 0 && checkedCount == mNotesCount);
-    }
-
-    public boolean isSelectedItem(final int position) {
-        if (null == mSelectedIndex.get(position)) {
-            return false;
-        }
-        return mSelectedIndex.get(position);
-    }
-
-    @Override
-    protected void onContentChanged() {
-        super.onContentChanged();
-        calcNotesCount();
-    }
-
-    @Override
-    public void changeCursor(Cursor cursor) {
-        super.changeCursor(cursor);
-        calcNotesCount();
-    }
-
-    private void calcNotesCount() {
-        mNotesCount = 0;
-        for (int i = 0; i < getCount(); i++) {
-            Cursor c = (Cursor) getItem(i);
-            if (c != null) {
-                if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
-                    mNotesCount++;
-                }
-            } else {
-                Log.e(TAG, "Invalid cursor");
-                return;
-            }
-        }
-    }
-    public int retCount(){
-        int NotesCount=mNotesCount;
-        int ItemCount=getCount();
-        for (int i = 0; i < ItemCount; i++) {
-            Cursor c = (Cursor) getItem(i);
-            if (c != null) {
-                if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
-                    NoteItemData NoteItem=new NoteItemData(mContext,c);
-                    NotesCount+=NoteItem.getNotesCount();
-                }
-            } else {
-                Log.e(TAG, "Invalid cursor");
-                return -1;
-            }
-        }
-        return NotesCount;
-    }
-
-}
diff --git a/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java
deleted file mode 100644
index ef7c53d..0000000
--- a/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.text.format.DateUtils;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
-
-
-public class NotesListItem extends LinearLayout {
-    private ImageView mAlert;
-    private TextView mTitle;
-    private TextView mTime;
-    private TextView mCallName;
-    private NoteItemData mItemData;
-    private CheckBox mCheckBox;
-    private ImageView mLock;
-
-    public NotesListItem(Context context) {
-        super(context);
-        inflate(context, R.layout.note_item, this);
-        mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
-        mTitle = (TextView) findViewById(R.id.tv_title);
-        mTime = (TextView) findViewById(R.id.tv_time);
-        mCallName = (TextView) findViewById(R.id.tv_name);
-        mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
-    }
-
-    public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
-        if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
-            mCheckBox.setVisibility(View.VISIBLE);
-            mCheckBox.setChecked(checked);
-        } else {
-            mCheckBox.setVisibility(View.GONE);
-        }
-        mItemData = data;
-        if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mCallName.setVisibility(View.GONE);
-            mAlert.setVisibility(View.VISIBLE);
-            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
-            mTitle.setText(context.getString(R.string.call_record_folder_name)
-                    + context.getString(R.string.format_folder_files_count, data.getNotesCount()));
-            mAlert.setImageResource(R.drawable.call_record);
-        } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) {
-            mCallName.setVisibility(View.VISIBLE);
-            mCallName.setText(data.getCallName());
-            mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
-            mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
-            if (data.hasAlert()) {
-                mAlert.setImageResource(R.drawable.clock);
-                mAlert.setVisibility(View.VISIBLE);
-            } else {
-                mAlert.setVisibility(View.GONE);
-            }
-        } else {
-            mCallName.setVisibility(View.GONE);
-            mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
-
-            if (data.getType() == Notes.TYPE_FOLDER) {
-                mTitle.setText(data.getSnippet()
-                        + context.getString(R.string.format_folder_files_count,
-                                data.getNotesCount()));
-                mAlert.setVisibility(View.GONE);
-            } else {
-                mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
-                if (data.hasAlert()) {
-                    mAlert.setImageResource(R.drawable.clock);
-                    mAlert.setVisibility(View.VISIBLE);
-                } else {
-                    mAlert.setVisibility(View.GONE);
-                }
-            }
-        }
-        mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
-
-        setBackground(data);
-    }
-
-    private void setBackground(NoteItemData data) {
-        int id = data.getBgColorId();
-        if (data.getType() == Notes.TYPE_NOTE) {
-            if (data.isSingle() || data.isOneFollowingFolder()) {
-                setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
-            } else if (data.isLast()) {
-                setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
-            } else if (data.isFirst() || data.isMultiFollowingFolder()) {
-                setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
-            } else {
-                setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
-            }
-        } else {
-            setBackgroundResource(NoteItemBgResources.getFolderBgRes());
-        }
-    }
-
-    public NoteItemData getItemData() {
-        return mItemData;
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
deleted file mode 100644
index 07c5f7e..0000000
--- a/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.ui;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.ActionBar;
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.remote.GTaskSyncService;
-
-
-public class NotesPreferenceActivity extends PreferenceActivity {
-    public static final String PREFERENCE_NAME = "notes_preferences";
-
-    public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-
-    public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-
-    public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
-
-    private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-
-    private static final String AUTHORITIES_FILTER_KEY = "authorities";
-
-    private PreferenceCategory mAccountCategory;
-
-    private GTaskReceiver mReceiver;
-
-    private Account[] mOriAccounts;
-
-    private boolean mHasAddedAccount;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        /* using the app icon for navigation */
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        addPreferencesFromResource(R.xml.preferences);
-        mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
-        mReceiver = new GTaskReceiver();
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
-        registerReceiver(mReceiver, filter);
-
-        mOriAccounts = null;
-        View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
-        getListView().addHeaderView(header, null, true);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        // need to set sync account automatically if user has added a new
-        // account
-        if (mHasAddedAccount) {
-            Account[] accounts = getGoogleAccounts();
-            if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
-                for (Account accountNew : accounts) {
-                    boolean found = false;
-                    for (Account accountOld : mOriAccounts) {
-                        if (TextUtils.equals(accountOld.name, accountNew.name)) {
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (!found) {
-                        setSyncAccount(accountNew.name);
-                        break;
-                    }
-                }
-            }
-        }
-
-        refreshUI();
-    }
-
-    @Override
-    protected void onDestroy() {
-        if (mReceiver != null) {
-            unregisterReceiver(mReceiver);
-        }
-        super.onDestroy();
-    }
-
-    private void loadAccountPreference() {
-        mAccountCategory.removeAll();
-
-        Preference accountPref = new Preference(this);
-        final String defaultAccount = getSyncAccountName(this);
-        accountPref.setTitle(getString(R.string.preferences_account_title));
-        accountPref.setSummary(getString(R.string.preferences_account_summary));
-        accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            public boolean onPreferenceClick(Preference preference) {
-                if (!GTaskSyncService.isSyncing()) {
-                    if (TextUtils.isEmpty(defaultAccount)) {
-                        // the first time to set account
-                        showSelectAccountAlertDialog();
-                    } else {
-                        // if the account has already been set, we need to promp
-                        // user about the risk
-                        showChangeAccountConfirmAlertDialog();
-                    }
-                } else {
-                    Toast.makeText(NotesPreferenceActivity.this,
-                            R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
-                            .show();
-                }
-                return true;
-            }
-        });
-
-        mAccountCategory.addPreference(accountPref);
-    }
-
-    private void loadSyncButton() {
-        Button syncButton = (Button) findViewById(R.id.preference_sync_button);
-        TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
-
-        // set button state
-        if (GTaskSyncService.isSyncing()) {
-            syncButton.setText(getString(R.string.preferences_button_sync_cancel));
-            syncButton.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
-                }
-            });
-        } else {
-            syncButton.setText(getString(R.string.preferences_button_sync_immediately));
-            syncButton.setOnClickListener(new View.OnClickListener() {
-                public void onClick(View v) {
-                    GTaskSyncService.startSync(NotesPreferenceActivity.this);
-                }
-            });
-        }
-        syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
-
-        // set last sync time
-        if (GTaskSyncService.isSyncing()) {
-            lastSyncTimeView.setText(GTaskSyncService.getProgressString());
-            lastSyncTimeView.setVisibility(View.VISIBLE);
-        } else {
-            long lastSyncTime = getLastSyncTime(this);
-            if (lastSyncTime != 0) {
-                lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time,
-                        DateFormat.format(getString(R.string.preferences_last_sync_time_format),
-                                lastSyncTime)));
-                lastSyncTimeView.setVisibility(View.VISIBLE);
-            } else {
-                lastSyncTimeView.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    private void refreshUI() {
-        loadAccountPreference();
-        loadSyncButton();
-    }
-
-    private void showSelectAccountAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
-        View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
-        TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
-        titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
-        TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
-        subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
-
-        dialogBuilder.setCustomTitle(titleView);
-        dialogBuilder.setPositiveButton(null, null);
-
-        Account[] accounts = getGoogleAccounts();
-        String defAccount = getSyncAccountName(this);
-
-        mOriAccounts = accounts;
-        mHasAddedAccount = false;
-
-        if (accounts.length > 0) {
-            CharSequence[] items = new CharSequence[accounts.length];
-            final CharSequence[] itemMapping = items;
-            int checkedItem = -1;
-            int index = 0;
-            for (Account account : accounts) {
-                if (TextUtils.equals(account.name, defAccount)) {
-                    checkedItem = index;
-                }
-                items[index++] = account.name;
-            }
-            dialogBuilder.setSingleChoiceItems(items, checkedItem,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            setSyncAccount(itemMapping[which].toString());
-                            dialog.dismiss();
-                            refreshUI();
-                        }
-                    });
-        }
-
-        View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
-        dialogBuilder.setView(addAccountView);
-
-        final AlertDialog dialog = dialogBuilder.show();
-        addAccountView.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mHasAddedAccount = true;
-                Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
-                intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
-                    "gmail-ls"
-                });
-                startActivityForResult(intent, -1);
-                dialog.dismiss();
-            }
-        });
-    }
-
-    private void showChangeAccountConfirmAlertDialog() {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
-        View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
-        TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
-        titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
-                getSyncAccountName(this)));
-        TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
-        subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
-        dialogBuilder.setCustomTitle(titleView);
-
-        CharSequence[] menuItemArray = new CharSequence[] {
-                getString(R.string.preferences_menu_change_account),
-                getString(R.string.preferences_menu_remove_account),
-                getString(R.string.preferences_menu_cancel)
-        };
-        dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                if (which == 0) {
-                    showSelectAccountAlertDialog();
-                } else if (which == 1) {
-                    removeSyncAccount();
-                    refreshUI();
-                }
-            }
-        });
-        dialogBuilder.show();
-    }
-
-    private Account[] getGoogleAccounts() {
-        AccountManager accountManager = AccountManager.get(this);
-        return accountManager.getAccountsByType("com.google");
-    }
-
-    private void setSyncAccount(String account) {
-        if (!getSyncAccountName(this).equals(account)) {
-            SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = settings.edit();
-            if (account != null) {
-                editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
-            } else {
-                editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
-            }
-            editor.commit();
-
-            // clean up last sync time
-            setLastSyncTime(this, 0);
-
-            // clean up local gtask related info
-            new Thread(new Runnable() {
-                public void run() {
-                    ContentValues values = new ContentValues();
-                    values.put(NoteColumns.GTASK_ID, "");
-                    values.put(NoteColumns.SYNC_ID, 0);
-                    getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
-                }
-            }).start();
-
-            Toast.makeText(NotesPreferenceActivity.this,
-                    getString(R.string.preferences_toast_success_set_accout, account),
-                    Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private void removeSyncAccount() {
-        SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = settings.edit();
-        if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
-            editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
-        }
-        if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
-            editor.remove(PREFERENCE_LAST_SYNC_TIME);
-        }
-        editor.commit();
-
-        // clean up local gtask related info
-        new Thread(new Runnable() {
-            public void run() {
-                ContentValues values = new ContentValues();
-                values.put(NoteColumns.GTASK_ID, "");
-                values.put(NoteColumns.SYNC_ID, 0);
-                getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
-            }
-        }).start();
-    }
-
-    public static String getSyncAccountName(Context context) {
-        SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
-                Context.MODE_PRIVATE);
-        return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
-    }
-
-    public static void setLastSyncTime(Context context, long time) {
-        SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = settings.edit();
-        editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
-        editor.commit();
-    }
-
-    public static long getLastSyncTime(Context context) {
-        SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
-                Context.MODE_PRIVATE);
-        return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
-    }
-
-    private class GTaskReceiver extends BroadcastReceiver {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            refreshUI();
-            if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
-                TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
-                syncStatus.setText(intent
-                        .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
-            }
-
-        }
-    }
-
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                Intent intent = new Intent(this, NotesListActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(intent);
-                return true;
-            default:
-                return false;
-        }
-    }
-}
diff --git a/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java b/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java
deleted file mode 100644
index e233a8b..0000000
--- a/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-public class RegisterLoginPassword extends Activity {
-    EditText password01;
-    EditText password02;
-    Button registered;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_set_loginpassword);
-        getWindow().setSoftInputMode(
-                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
-                        | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        password01=(EditText) findViewById(R.id.rg_password01);
-        password02=(EditText) findViewById(R.id.rg_password02);
-        registered=(Button)findViewById(R.id.rg_registered);
-        registered.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String text02 = password01.getText().toString();
-                String text03 = password02.getText().toString();
-                if(text02.equals("")==true) {
-                    Toast.makeText(RegisterLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
-                }else if (text02.equals(text03) == false) {
-                    Toast.makeText(RegisterLoginPassword.this, "密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show();
-                    password02.setText("");
-                }else if (text02.equals(text03) == true){
-                    SharedPreferences.Editor editor=getSharedPreferences("user management",
-                            MODE_PRIVATE).edit();
-                    editor.putBoolean("user",true);//true表示已经设置登录密码
-                    editor.putString("password",text02);
-                    editor.apply();
-                    Log.d("RegisterLoginPassword","password is "+text02);
-                    Toast.makeText(RegisterLoginPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show();
-                    Intent intent=new Intent(RegisterLoginPassword.this,NotesListActivity.class);
-                    startActivity(intent);
-                    finish();
-                }
-
-            }
-        });
-    }
-
-    @Override
-    public void onBackPressed() {
-        Intent intent=new Intent(RegisterLoginPassword.this,NotesListActivity.class);
-        startActivity(intent);
-        finish();
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
deleted file mode 100644
index ec6f819..0000000
--- a/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.widget;
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.ui.NoteEditActivity;
-import net.micode.notes.ui.NotesListActivity;
-
-public abstract class NoteWidgetProvider extends AppWidgetProvider {
-    public static final String [] PROJECTION = new String [] {
-        NoteColumns.ID,
-        NoteColumns.BG_COLOR_ID,
-        NoteColumns.SNIPPET
-    };
-
-    public static final int COLUMN_ID           = 0;
-    public static final int COLUMN_BG_COLOR_ID  = 1;
-    public static final int COLUMN_SNIPPET      = 2;
-
-    private static final String TAG = "NoteWidgetProvider";
-
-    @Override
-    public void onDeleted(Context context, int[] appWidgetIds) {
-        ContentValues values = new ContentValues();
-        values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-        for (int i = 0; i < appWidgetIds.length; i++) {
-            context.getContentResolver().update(Notes.CONTENT_NOTE_URI,
-                    values,
-                    NoteColumns.WIDGET_ID + "=?",
-                    new String[] { String.valueOf(appWidgetIds[i])});
-        }
-    }
-
-    private Cursor getNoteWidgetInfo(Context context, int widgetId) {
-        return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
-                PROJECTION,
-                NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",
-                new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },
-                null);
-    }
-
-    protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        update(context, appWidgetManager, appWidgetIds, false);
-    }
-
-    private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
-            boolean privacyMode) {
-        for (int i = 0; i < appWidgetIds.length; i++) {
-            if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
-                int bgId = ResourceParser.getDefaultBgId(context);
-                String snippet = "";
-                Intent intent = new Intent(context, NoteEditActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]);
-                intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType());
-
-                Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]);
-                if (c != null && c.moveToFirst()) {
-                    if (c.getCount() > 1) {
-                        Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]);
-                        c.close();
-                        return;
-                    }
-                    snippet = c.getString(COLUMN_SNIPPET);
-                    bgId = c.getInt(COLUMN_BG_COLOR_ID);
-                    intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID));
-                    intent.setAction(Intent.ACTION_VIEW);
-                } else {
-                    snippet = context.getResources().getString(R.string.widget_havenot_content);
-                    intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
-                }
-
-                if (c != null) {
-                    c.close();
-                }
-
-                RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId());
-                rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId));
-                intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId);
-                /**
-                 * Generate the pending intent to start host for the widget
-                 */
-                PendingIntent pendingIntent = null;
-                if (privacyMode) {
-                    rv.setTextViewText(R.id.widget_text,
-                            context.getString(R.string.widget_under_visit_mode));
-                    pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
-                            context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
-                } else {
-                    rv.setTextViewText(R.id.widget_text, snippet);
-                    pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
-                            PendingIntent.FLAG_UPDATE_CURRENT);
-                }
-
-                rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
-                appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
-            }
-        }
-    }
-
-    protected abstract int getBgResourceId(int bgId);
-
-    protected abstract int getLayoutId();
-
-    protected abstract int getWidgetType();
-}
diff --git a/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
deleted file mode 100644
index adcb2f7..0000000
--- a/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.ResourceParser;
-
-
-public class NoteWidgetProvider_2x extends NoteWidgetProvider {
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.update(context, appWidgetManager, appWidgetIds);
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.widget_2x;
-    }
-
-    @Override
-    protected int getBgResourceId(int bgId) {
-        return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
-    }
-
-    @Override
-    protected int getWidgetType() {
-        return Notes.TYPE_WIDGET_2X;
-    }
-}
diff --git a/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
deleted file mode 100644
index c12a02e..0000000
--- a/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-
-package net.micode.notes.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.ResourceParser;
-
-
-public class NoteWidgetProvider_4x extends NoteWidgetProvider {
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        super.update(context, appWidgetManager, appWidgetIds);
-    }
-
-    protected int getLayoutId() {
-        return R.layout.widget_4x;
-    }
-
-    @Override
-    protected int getBgResourceId(int bgId) {
-        return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
-    }
-
-    @Override
-    protected int getWidgetType() {
-        return Notes.TYPE_WIDGET_4X;
-    }
-}
diff --git a/src/main/res/AndroidManifest.xml b/src/main/res/AndroidManifest.xml
deleted file mode 100644
index 87d99db..0000000
--- a/src/main/res/AndroidManifest.xml
+++ /dev/null
@@ -1,208 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="net.micode.notes"
-    android:versionCode="1"
-    android:versionName="0.1" >
-
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <application
-        android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
-
-        <activity
-            android:name=".ui.LoginActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan"
-            tools:ignore="MissingClass">
-            <!--android:uiOptions="splitActionBarWhenNarrow"-->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".ui.ChangedLoginPassword"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan"
-            tools:ignore="MissingClass">
-        </activity>
-
-        <activity
-        android:name=".ui.DeleteLoginPassword"
-        android:configChanges="keyboardHidden|orientation|screenSize"
-        android:label="@string/app_name"
-        android:launchMode="singleTop"
-        android:theme="@style/NoteTheme"
-        android:windowSoftInputMode="adjustPan"
-            tools:ignore="MissingClass">
-        </activity>
-
-        <activity
-            android:name=".ui.SearchActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan"
-            tools:ignore="MissingClass">
-        </activity>
-
-
-
-        <activity
-            android:name="net.micode.notes.ui.NotesListActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
-            android:windowSoftInputMode="adjustPan" >
-            <!--android:uiOptions="splitActionBarWhenNarrow"-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-        </activity>
-
-        <activity
-            android:name=".ui.NoteEditActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:launchMode="singleTop"
-            android:theme="@style/NoteTheme" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-            <intent-filter>
-              <action android:name="android.intent.action.SEARCH" />
-              <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-
-            <intent-filter android:scheme="http"
-                tools:ignore="AppLinkUrlError">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/text_note" />
-                <data android:mimeType="vnd.android.cursor.item/call_note" />
-            </intent-filter>
-
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-<!--            <meta-data>必须包括android:name这个属性，而且其值必须为"android.app.searchable"，-->
-<!--            还必须包括android:resource这个属性，它指定了我们的search dialog的配置文件。-->
-
-        </activity>
-
-        <provider
-            android:name="net.micode.notes.data.NotesProvider"
-            android:authorities="micode_notes"
-            android:exported="false"
-            android:multiprocess="true">
-        </provider>
-
-        <receiver
-            android:name=".widget.NoteWidgetProvider_2x"
-            android:label="@string/app_widget2x2" >
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_2x_info" />
-        </receiver>
-
-        <receiver
-            android:name=".widget.NoteWidgetProvider_4x"
-            android:label="@string/app_widget4x4" >
-
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_4x_info" />
-        </receiver>
-
-        <receiver android:name=".ui.AlarmInitReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="net.micode.notes.ui.AlarmReceiver"
-            android:process=":remote" >
-        </receiver>
-
-        <activity
-            android:name=".ui.AlarmAlertActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-        </activity>
-
-        <activity
-            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-            android:label="@string/preferences_title"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light" >
-        </activity>
-
-        <service
-            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
-
-        <meta-data
-            android:name="android.app.default_searchable"
-            android:value=".ui.NoteEditActivity" />
-<!--        如果你想为你的应用程序的每个activity 都提供该search dialog, 那么将<meta-data>元素加入<application>中，
-            通过这种方式, 每个activity 都继承了该值, 提供search dialog, 并把searches传送到同一个searchable activity.
-            <meta-data>元素，它声明了使用哪个searchable activity来执行搜索-->
-    </application>
-</manifest>
diff --git a/src/main/res/color/primary_text_dark.xml b/src/main/res/color/primary_text_dark.xml
deleted file mode 100644
index 8ad98e3..0000000
--- a/src/main/res/color/primary_text_dark.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true" android:color="#88555555" />
-  <item android:state_selected="true" android:color="#ff999999" />
-  <item android:color="#ff000000" />
-</selector>
\ No newline at end of file
diff --git a/src/main/res/color/secondary_text_dark.xml b/src/main/res/color/secondary_text_dark.xml
deleted file mode 100644
index 9cf8a1a..0000000
--- a/src/main/res/color/secondary_text_dark.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="#50000000" />
-</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable-hdpi/bg_btn_set_color.png b/src/main/res/drawable-hdpi/bg_btn_set_color.png
deleted file mode 100644
index 5eb5d44..0000000
Binary files a/src/main/res/drawable-hdpi/bg_btn_set_color.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/src/main/res/drawable-hdpi/bg_color_btn_mask.png
deleted file mode 100644
index 100db77..0000000
Binary files a/src/main/res/drawable-hdpi/bg_color_btn_mask.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/call_record.png b/src/main/res/drawable-hdpi/call_record.png
deleted file mode 100644
index fb88ca4..0000000
Binary files a/src/main/res/drawable-hdpi/call_record.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/clock.png b/src/main/res/drawable-hdpi/clock.png
deleted file mode 100644
index 5f2ae9a..0000000
Binary files a/src/main/res/drawable-hdpi/clock.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/delete.png b/src/main/res/drawable-hdpi/delete.png
deleted file mode 100644
index 643de3e..0000000
Binary files a/src/main/res/drawable-hdpi/delete.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/dropdown_icon.9.png b/src/main/res/drawable-hdpi/dropdown_icon.9.png
deleted file mode 100644
index 5525025..0000000
Binary files a/src/main/res/drawable-hdpi/dropdown_icon.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_blue.9.png b/src/main/res/drawable-hdpi/edit_blue.9.png
deleted file mode 100644
index 55a1856..0000000
Binary files a/src/main/res/drawable-hdpi/edit_blue.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_green.9.png b/src/main/res/drawable-hdpi/edit_green.9.png
deleted file mode 100644
index 2cb2d60..0000000
Binary files a/src/main/res/drawable-hdpi/edit_green.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_red.9.png b/src/main/res/drawable-hdpi/edit_red.9.png
deleted file mode 100644
index bae944a..0000000
Binary files a/src/main/res/drawable-hdpi/edit_red.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_title_blue.9.png b/src/main/res/drawable-hdpi/edit_title_blue.9.png
deleted file mode 100644
index 96e6092..0000000
Binary files a/src/main/res/drawable-hdpi/edit_title_blue.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_title_green.9.png b/src/main/res/drawable-hdpi/edit_title_green.9.png
deleted file mode 100644
index 08d8644..0000000
Binary files a/src/main/res/drawable-hdpi/edit_title_green.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_title_red.9.png b/src/main/res/drawable-hdpi/edit_title_red.9.png
deleted file mode 100644
index 9c430e5..0000000
Binary files a/src/main/res/drawable-hdpi/edit_title_red.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_title_white.9.png b/src/main/res/drawable-hdpi/edit_title_white.9.png
deleted file mode 100644
index 19e8d95..0000000
Binary files a/src/main/res/drawable-hdpi/edit_title_white.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/src/main/res/drawable-hdpi/edit_title_yellow.9.png
deleted file mode 100644
index bf8f580..0000000
Binary files a/src/main/res/drawable-hdpi/edit_title_yellow.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_white.9.png b/src/main/res/drawable-hdpi/edit_white.9.png
deleted file mode 100644
index 918f7a6..0000000
Binary files a/src/main/res/drawable-hdpi/edit_white.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/edit_yellow.9.png b/src/main/res/drawable-hdpi/edit_yellow.9.png
deleted file mode 100644
index 10cb642..0000000
Binary files a/src/main/res/drawable-hdpi/edit_yellow.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/font_large.png b/src/main/res/drawable-hdpi/font_large.png
deleted file mode 100644
index 78cf2e6..0000000
Binary files a/src/main/res/drawable-hdpi/font_large.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/font_normal.png b/src/main/res/drawable-hdpi/font_normal.png
deleted file mode 100644
index 9de7ced..0000000
Binary files a/src/main/res/drawable-hdpi/font_normal.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
deleted file mode 100644
index be8e64c..0000000
Binary files a/src/main/res/drawable-hdpi/font_size_selector_bg.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/font_small.png b/src/main/res/drawable-hdpi/font_small.png
deleted file mode 100644
index d3ff104..0000000
Binary files a/src/main/res/drawable-hdpi/font_small.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/font_super.png b/src/main/res/drawable-hdpi/font_super.png
deleted file mode 100644
index 85b13a1..0000000
Binary files a/src/main/res/drawable-hdpi/font_super.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/icon_app.png b/src/main/res/drawable-hdpi/icon_app.png
deleted file mode 100644
index 418aadc..0000000
Binary files a/src/main/res/drawable-hdpi/icon_app.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_background.png b/src/main/res/drawable-hdpi/list_background.png
deleted file mode 100644
index 087e1f9..0000000
Binary files a/src/main/res/drawable-hdpi/list_background.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_blue_down.9.png b/src/main/res/drawable-hdpi/list_blue_down.9.png
deleted file mode 100644
index b88eebf..0000000
Binary files a/src/main/res/drawable-hdpi/list_blue_down.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_blue_middle.9.png b/src/main/res/drawable-hdpi/list_blue_middle.9.png
deleted file mode 100644
index 96b1c8b..0000000
Binary files a/src/main/res/drawable-hdpi/list_blue_middle.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_blue_single.9.png b/src/main/res/drawable-hdpi/list_blue_single.9.png
deleted file mode 100644
index d7e7206..0000000
Binary files a/src/main/res/drawable-hdpi/list_blue_single.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_blue_up.9.png b/src/main/res/drawable-hdpi/list_blue_up.9.png
deleted file mode 100644
index 632e88c..0000000
Binary files a/src/main/res/drawable-hdpi/list_blue_up.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_folder.9.png b/src/main/res/drawable-hdpi/list_folder.9.png
deleted file mode 100644
index 829f61b..0000000
Binary files a/src/main/res/drawable-hdpi/list_folder.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_footer_bg.9.png b/src/main/res/drawable-hdpi/list_footer_bg.9.png
deleted file mode 100644
index 5325c25..0000000
Binary files a/src/main/res/drawable-hdpi/list_footer_bg.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_green_down.9.png b/src/main/res/drawable-hdpi/list_green_down.9.png
deleted file mode 100644
index 64a39d9..0000000
Binary files a/src/main/res/drawable-hdpi/list_green_down.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_green_middle.9.png b/src/main/res/drawable-hdpi/list_green_middle.9.png
deleted file mode 100644
index 897325a..0000000
Binary files a/src/main/res/drawable-hdpi/list_green_middle.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_green_single.9.png b/src/main/res/drawable-hdpi/list_green_single.9.png
deleted file mode 100644
index c83405f..0000000
Binary files a/src/main/res/drawable-hdpi/list_green_single.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_green_up.9.png b/src/main/res/drawable-hdpi/list_green_up.9.png
deleted file mode 100644
index 141f9e1..0000000
Binary files a/src/main/res/drawable-hdpi/list_green_up.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_red_down.9.png b/src/main/res/drawable-hdpi/list_red_down.9.png
deleted file mode 100644
index 4224309..0000000
Binary files a/src/main/res/drawable-hdpi/list_red_down.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_red_middle.9.png b/src/main/res/drawable-hdpi/list_red_middle.9.png
deleted file mode 100644
index 9988f17..0000000
Binary files a/src/main/res/drawable-hdpi/list_red_middle.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_red_single.9.png b/src/main/res/drawable-hdpi/list_red_single.9.png
deleted file mode 100644
index 587c348..0000000
Binary files a/src/main/res/drawable-hdpi/list_red_single.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_red_up.9.png b/src/main/res/drawable-hdpi/list_red_up.9.png
deleted file mode 100644
index 46b4757..0000000
Binary files a/src/main/res/drawable-hdpi/list_red_up.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_white_down.9.png b/src/main/res/drawable-hdpi/list_white_down.9.png
deleted file mode 100644
index 29f9d8c..0000000
Binary files a/src/main/res/drawable-hdpi/list_white_down.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_white_middle.9.png b/src/main/res/drawable-hdpi/list_white_middle.9.png
deleted file mode 100644
index 77a4ab4..0000000
Binary files a/src/main/res/drawable-hdpi/list_white_middle.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_white_single.9.png b/src/main/res/drawable-hdpi/list_white_single.9.png
deleted file mode 100644
index 3e79189..0000000
Binary files a/src/main/res/drawable-hdpi/list_white_single.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_white_up.9.png b/src/main/res/drawable-hdpi/list_white_up.9.png
deleted file mode 100644
index e23cd5c..0000000
Binary files a/src/main/res/drawable-hdpi/list_white_up.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_down.9.png b/src/main/res/drawable-hdpi/list_yellow_down.9.png
deleted file mode 100644
index 31cfc1e..0000000
Binary files a/src/main/res/drawable-hdpi/list_yellow_down.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/src/main/res/drawable-hdpi/list_yellow_middle.9.png
deleted file mode 100644
index b6549b2..0000000
Binary files a/src/main/res/drawable-hdpi/list_yellow_middle.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_single.9.png b/src/main/res/drawable-hdpi/list_yellow_single.9.png
deleted file mode 100644
index 3faf507..0000000
Binary files a/src/main/res/drawable-hdpi/list_yellow_single.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_yellow_up.9.png b/src/main/res/drawable-hdpi/list_yellow_up.9.png
deleted file mode 100644
index 4ae791c..0000000
Binary files a/src/main/res/drawable-hdpi/list_yellow_up.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_delete.png b/src/main/res/drawable-hdpi/menu_delete.png
deleted file mode 100644
index ccdfc4b..0000000
Binary files a/src/main/res/drawable-hdpi/menu_delete.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_girl.png b/src/main/res/drawable-hdpi/menu_girl.png
deleted file mode 100644
index b5c0eaa..0000000
Binary files a/src/main/res/drawable-hdpi/menu_girl.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_lover.png b/src/main/res/drawable-hdpi/menu_lover.png
deleted file mode 100644
index 95a3652..0000000
Binary files a/src/main/res/drawable-hdpi/menu_lover.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_move.png b/src/main/res/drawable-hdpi/menu_move.png
deleted file mode 100644
index 1140b71..0000000
Binary files a/src/main/res/drawable-hdpi/menu_move.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_sea.png b/src/main/res/drawable-hdpi/menu_sea.png
deleted file mode 100644
index 7912347..0000000
Binary files a/src/main/res/drawable-hdpi/menu_sea.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_sweet.png b/src/main/res/drawable-hdpi/menu_sweet.png
deleted file mode 100644
index 966aeab..0000000
Binary files a/src/main/res/drawable-hdpi/menu_sweet.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/menu_young.png b/src/main/res/drawable-hdpi/menu_young.png
deleted file mode 100644
index 6d5be85..0000000
Binary files a/src/main/res/drawable-hdpi/menu_young.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/navigationbar_bg.png b/src/main/res/drawable-hdpi/navigationbar_bg.png
deleted file mode 100644
index 2ea3923..0000000
Binary files a/src/main/res/drawable-hdpi/navigationbar_bg.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/new_note_normal.png b/src/main/res/drawable-hdpi/new_note_normal.png
deleted file mode 100644
index e24e0d1..0000000
Binary files a/src/main/res/drawable-hdpi/new_note_normal.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/new_note_pressed.png b/src/main/res/drawable-hdpi/new_note_pressed.png
deleted file mode 100644
index c748936..0000000
Binary files a/src/main/res/drawable-hdpi/new_note_pressed.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
deleted file mode 100644
index fc49552..0000000
Binary files a/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/notification.png b/src/main/res/drawable-hdpi/notification.png
deleted file mode 100644
index b13ab4a..0000000
Binary files a/src/main/res/drawable-hdpi/notification.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/paint.png b/src/main/res/drawable-hdpi/paint.png
deleted file mode 100644
index 9ff3f18..0000000
Binary files a/src/main/res/drawable-hdpi/paint.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/paint_back.png b/src/main/res/drawable-hdpi/paint_back.png
deleted file mode 100644
index d0dcb4e..0000000
Binary files a/src/main/res/drawable-hdpi/paint_back.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/paint_clor.png b/src/main/res/drawable-hdpi/paint_clor.png
deleted file mode 100644
index 9cdcae9..0000000
Binary files a/src/main/res/drawable-hdpi/paint_clor.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/paint_delete.png b/src/main/res/drawable-hdpi/paint_delete.png
deleted file mode 100644
index 88de254..0000000
Binary files a/src/main/res/drawable-hdpi/paint_delete.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/paint_reset.png b/src/main/res/drawable-hdpi/paint_reset.png
deleted file mode 100644
index 5733e54..0000000
Binary files a/src/main/res/drawable-hdpi/paint_reset.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/paint_save.png b/src/main/res/drawable-hdpi/paint_save.png
deleted file mode 100644
index 458dd87..0000000
Binary files a/src/main/res/drawable-hdpi/paint_save.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/search_result.png b/src/main/res/drawable-hdpi/search_result.png
deleted file mode 100644
index ff2befd..0000000
Binary files a/src/main/res/drawable-hdpi/search_result.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/selected.png b/src/main/res/drawable-hdpi/selected.png
deleted file mode 100644
index b889bef..0000000
Binary files a/src/main/res/drawable-hdpi/selected.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/title_alert.png b/src/main/res/drawable-hdpi/title_alert.png
deleted file mode 100644
index 544ee9c..0000000
Binary files a/src/main/res/drawable-hdpi/title_alert.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/title_bar_bg.9.png b/src/main/res/drawable-hdpi/title_bar_bg.9.png
deleted file mode 100644
index eb6bff0..0000000
Binary files a/src/main/res/drawable-hdpi/title_bar_bg.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/undo.png b/src/main/res/drawable-hdpi/undo.png
deleted file mode 100644
index d410837..0000000
Binary files a/src/main/res/drawable-hdpi/undo.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_blue.png b/src/main/res/drawable-hdpi/widget_2x_blue.png
deleted file mode 100644
index a1707f4..0000000
Binary files a/src/main/res/drawable-hdpi/widget_2x_blue.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_green.png b/src/main/res/drawable-hdpi/widget_2x_green.png
deleted file mode 100644
index f86886c..0000000
Binary files a/src/main/res/drawable-hdpi/widget_2x_green.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_red.png b/src/main/res/drawable-hdpi/widget_2x_red.png
deleted file mode 100644
index 0e66c29..0000000
Binary files a/src/main/res/drawable-hdpi/widget_2x_red.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_white.png b/src/main/res/drawable-hdpi/widget_2x_white.png
deleted file mode 100644
index 5f0619a..0000000
Binary files a/src/main/res/drawable-hdpi/widget_2x_white.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_2x_yellow.png b/src/main/res/drawable-hdpi/widget_2x_yellow.png
deleted file mode 100644
index 12d1c2b..0000000
Binary files a/src/main/res/drawable-hdpi/widget_2x_yellow.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_blue.png b/src/main/res/drawable-hdpi/widget_4x_blue.png
deleted file mode 100644
index 9183738..0000000
Binary files a/src/main/res/drawable-hdpi/widget_4x_blue.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_green.png b/src/main/res/drawable-hdpi/widget_4x_green.png
deleted file mode 100644
index fa8b452..0000000
Binary files a/src/main/res/drawable-hdpi/widget_4x_green.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_red.png b/src/main/res/drawable-hdpi/widget_4x_red.png
deleted file mode 100644
index 62de074..0000000
Binary files a/src/main/res/drawable-hdpi/widget_4x_red.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_white.png b/src/main/res/drawable-hdpi/widget_4x_white.png
deleted file mode 100644
index a37d67c..0000000
Binary files a/src/main/res/drawable-hdpi/widget_4x_white.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/widget_4x_yellow.png b/src/main/res/drawable-hdpi/widget_4x_yellow.png
deleted file mode 100644
index d7c5fa4..0000000
Binary files a/src/main/res/drawable-hdpi/widget_4x_yellow.png and /dev/null differ
diff --git a/src/main/res/drawable/new_note.xml b/src/main/res/drawable/new_note.xml
deleted file mode 100644
index 2154ebc..0000000
--- a/src/main/res/drawable/new_note.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/new_note_pressed" />
-    <item
-        android:drawable="@drawable/new_note_normal" />
-</selector>
diff --git a/src/main/res/layout/account_dialog_title.xml b/src/main/res/layout/account_dialog_title.xml
deleted file mode 100644
index 7717112..0000000
--- a/src/main/res/layout/account_dialog_title.xml
+++ /dev/null
@@ -1,43 +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
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:id="@+id/account_dialog_title"
-        style="?android:attr/textAppearanceMedium"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:layout_marginTop="-2.7dip"
-        android:layout_marginBottom="-2.7dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/account_dialog_subtitle"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="1dip"
-        android:gravity="center"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_change_loginpassword.xml b/src/main/res/layout/activity_change_loginpassword.xml
deleted file mode 100644
index b9e854f..0000000
--- a/src/main/res/layout/activity_change_loginpassword.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical">
-
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="输入原有密码："/>
-
-        <EditText
-            android:id="@+id/old_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
-
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="输入新建密码："/>
-
-        <EditText
-            android:id="@+id/new_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
-
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="再次输入密码："/>
-
-        <EditText
-            android:id="@+id/ack_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-
-        <Button
-            android:id="@+id/Bt_Acknowledged"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="确认"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_delete_loginpassword.xml b/src/main/res/layout/activity_delete_loginpassword.xml
deleted file mode 100644
index 2338222..0000000
--- a/src/main/res/layout/activity_delete_loginpassword.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical">
-
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="输入原有密码："/>
-
-        <EditText
-            android:id="@+id/old_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-
-        <Button
-            android:id="@+id/Bt_Acknowledged"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="确认"/>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_login.xml b/src/main/res/layout/activity_login.xml
deleted file mode 100644
index 67c67cc..0000000
--- a/src/main/res/layout/activity_login.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical">
-
-
-<!--    <LinearLayout-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:gravity="center">-->
-<!--        <TextView-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="用户："/>-->
-
-<!--        <EditText-->
-<!--            android:id="@+id/lg_user"-->
-<!--            android:layout_width="200dp"-->
-<!--            android:layout_height="wrap_content" />-->
-<!--    </LinearLayout>-->
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/password"/>
-
-        <EditText
-            android:id="@+id/lg_password"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"
-            tools:ignore="Deprecated" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-
-        <Button
-            android:id="@+id/login"
-            android:layout_width="74dp"
-            android:layout_height="match_parent"
-            android:text="@string/login" />
-        <!--        <Button-->
-<!--            android:id="@+id/lg_registered"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:text="注册"/>-->
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_paint.xml b/src/main/res/layout/activity_paint.xml
deleted file mode 100644
index 9f9d121..0000000
--- a/src/main/res/layout/activity_paint.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    >
-
-    <net.micode.notes.PaintView
-        android:id="@+id/paint_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"></net.micode.notes.PaintView>
-
-    <ImageButton
-        android:id="@+id/paint_reset"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="240dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:src="@drawable/paint_reset" />
-
-    <ImageButton
-        android:id="@+id/paint_color"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="80dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:src="@drawable/paint_clor" />
-
-    <ImageButton
-        android:id="@+id/paint_width"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="0dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:src="@drawable/paint" />
-
-    <ImageButton
-        android:id="@+id/paint_delete"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="320dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:src="@drawable/paint_delete" />
-
-    <ImageButton
-        android:id="@+id/undo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="160dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:src="@drawable/undo" />
-
-    <ImageButton
-        android:id="@+id/save"
-        android:layout_width="59dp"
-        android:layout_height="59dp"
-        android:layout_marginLeft="0dp"
-        android:layout_marginTop="680dp"
-        android:src="@drawable/paint_save" />
-
-    <ImageButton
-        android:id="@+id/paint_back"
-        android:layout_width="59dp"
-        android:layout_height="59dp"
-        android:layout_marginLeft="360dp"
-        android:layout_marginTop="680dp"
-        android:src="@drawable/paint_back" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_set_loginpassword.xml b/src/main/res/layout/activity_set_loginpassword.xml
deleted file mode 100644
index ebb9359..0000000
--- a/src/main/res/layout/activity_set_loginpassword.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="center_vertical">
-
-
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="新建密码："/>
-
-        <EditText
-            android:id="@+id/rg_password01"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"
-            tools:ignore="Deprecated" />
-    </LinearLayout>
-    <LinearLayout
-
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="确认密码："/>
-
-        <EditText
-            android:id="@+id/rg_password02"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:password="true"
-            tools:ignore="Deprecated" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="76dp"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <Button
-            android:id="@+id/rg_registered"
-            android:layout_width="91dp"
-            android:layout_height="wrap_content"
-            android:text="确认" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/add_account_text.xml b/src/main/res/layout/add_account_text.xml
deleted file mode 100644
index c799178..0000000
--- a/src/main/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/main/res/layout/datetime_picker.xml b/src/main/res/layout/datetime_picker.xml
deleted file mode 100644
index f10d592..0000000
--- a/src/main/res/layout/datetime_picker.xml
+++ /dev/null
@@ -1,56 +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:orientation="horizontal"
-    android:layout_gravity="center_horizontal"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <NumberPicker
-        android:id="@+id/date"
-        android:layout_width="120dip"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        />
-
-    <NumberPicker
-        android:id="@+id/hour"
-        android:layout_width="50dip"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        />
-
-    <NumberPicker
-        android:id="@+id/minute"
-        android:layout_width="50dip"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        />
-
-    <NumberPicker
-        android:id="@+id/amPm"
-        android:layout_width="50dip"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_edit_text.xml b/src/main/res/layout/dialog_edit_text.xml
deleted file mode 100644
index 361b39a..0000000
--- a/src/main/res/layout/dialog_edit_text.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<EditText
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/et_foler_name"
-    android:layout_width="fill_parent"
-    android:hint="@string/hint_foler_name"
-    android:layout_height="fill_parent" />
\ No newline at end of file
diff --git a/src/main/res/layout/folder_list_item.xml b/src/main/res/layout/folder_list_item.xml
deleted file mode 100644
index 77e8148..0000000
--- a/src/main/res/layout/folder_list_item.xml
+++ /dev/null
@@ -1,29 +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="match_parent"
-    android:minHeight="50dip" >
-
-    <TextView
-        android:id="@+id/tv_folder_name"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:textAppearance="@style/TextAppearancePrimaryItem" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml
deleted file mode 100644
index 7c085a3..0000000
--- a/src/main/res/layout/note_edit.xml
+++ /dev/null
@@ -1,431 +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.
--->
-
-<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">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/note_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/tv_modified_date"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="left|center_vertical"
-                android:layout_marginRight="8dip"
-                android:textAppearance="@style/TextAppearanceSecondaryItem" />
-            <TextView
-                android:id="@+id/text_nums"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:layout_marginRight="14dip" />
-            <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" />
-
-            <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="@drawable/bg_btn_set_color" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/sv_note_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
-                android:background="@drawable/bg_color_btn_mask" />
-
-            <ScrollView
-                android:layout_width="fill_parent"
-                android:layout_height="0dip"
-                android:layout_weight="1"
-                android:scrollbars="none"
-                android:overScrollMode="never"
-                android:layout_gravity="left|top"
-                android:fadingEdgeLength="0dip">
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent">
-
-                    <net.micode.notes.ui.NoteEditText
-                        android:id="@+id/note_edit_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:autoLink="all"
-                        android:background="@null"
-                        android:gravity="left|top"
-                        android:lineSpacingMultiplier="1.2"
-                        android:linksClickable="false"
-                        android:minLines="12"
-                        android:textAppearance="@style/TextAppearancePrimaryItem" />
-
-                    <LinearLayout
-                        android:id="@+id/note_edit_list"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_marginLeft="-10dip"
-                        android:visibility="gone" />
-
-
-                </LinearLayout>
-            </ScrollView>
-
-            <Button
-                android:id="@+id/listen"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="按住说话" />
-
-            <ImageView
-                android:layout_width="fill_parent"
-                android:layout_height="7dip"
-                android:background="@drawable/bg_color_btn_mask" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/btn_set_bg_color"
-        android:layout_width="104dp"
-        android:layout_height="43dip"
-        android:layout_gravity="top|right"
-        android:background="@drawable/bg_color_btn_mask" />
-
-    <LinearLayout
-        android:id="@+id/note_bg_color_selector"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/note_edit_color_selector_panel"
-        android:layout_marginTop="30dip"
-        android:layout_marginRight="8dip"
-        android:layout_gravity="top|right"
-        android:visibility="gone">
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_yellow"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_yellow_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="5dip"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_blue"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_blue_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="3dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_white"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_white_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="2dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_green"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_green_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <ImageView
-                android:id="@+id/iv_bg_red"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <ImageView
-                android:id="@+id/iv_bg_red_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/font_size_selector"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/font_size_selector_bg"
-        android:layout_gravity="bottom"
-        android:visibility="gone">
-
-        <FrameLayout
-            android:id="@+id/ll_font_small"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_small"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_small"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_small_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_normal"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_normal"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_normal"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_medium_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_large"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_large"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_large"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_large_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/ll_font_super"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="center"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/font_super"
-                    android:layout_marginBottom="5dip" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/menu_font_super"
-                    android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_super_select"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
-                android:layout_marginRight="6dip"
-                android:layout_marginBottom="-7dip"
-                android:src="@drawable/selected" />
-        </FrameLayout>
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/iatBtn"
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="300dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:text="@string/speak" />
-
-    <ImageButton
-        android:id="@+id/add_img_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginTop="600dp"
-        android:layout_marginBottom="7dp"
-        android:src="@android:drawable/ic_menu_gallery" />
-</FrameLayout>
diff --git a/src/main/res/layout/note_edit_list_item.xml b/src/main/res/layout/note_edit_list_item.xml
deleted file mode 100644
index a885f9c..0000000
--- a/src/main/res/layout/note_edit_list_item.xml
+++ /dev/null
@@ -1,39 +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="fill_parent"
-    android:layout_height="wrap_content">
-
-    <CheckBox
-        android:id="@+id/cb_edit_item"
-        android:layout_width="wrap_content"
-        android:layout_height="28dip"
-        android:checked="false"
-        android:focusable="false"
-        android:layout_gravity="top|left" />
-
-    <net.micode.notes.ui.NoteEditText
-        android:id="@+id/et_edit_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:lineSpacingMultiplier="1.2"
-        android:layout_gravity="center_vertical"
-        android:textAppearance="@style/TextAppearancePrimaryItem"
-        android:background="@null" />
-</LinearLayout>
diff --git a/src/main/res/layout/note_item.xml b/src/main/res/layout/note_item.xml
deleted file mode 100644
index 28324c6..0000000
--- a/src/main/res/layout/note_item.xml
+++ /dev/null
@@ -1,84 +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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/note_item"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical">
-
-        <LinearLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="wrap_content"
-                android:layout_height="0dip"
-                android:layout_weight="1"
-                android:textAppearance="@style/TextAppearancePrimaryItem"
-                android:visibility="gone" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical">
-
-                <TextView
-                    android:id="@+id/tv_title"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:singleLine="true" />
-
-                <TextView
-                    android:id="@+id/tv_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="@style/TextAppearanceSecondaryItem" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <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" />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/iv_alert_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|right"/>
-
-    <ImageView
-        android:id="@+id/iv_lock"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|right"/>
-</FrameLayout>
diff --git a/src/main/res/layout/note_list.xml b/src/main/res/layout/note_list.xml
deleted file mode 100644
index 1c1c8d1..0000000
--- a/src/main/res/layout/note_list.xml
+++ /dev/null
@@ -1,60 +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.
--->
-
-<FrameLayout
-    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" />
-        <!-- GONE 隐藏，不可见并且不占用位置-->
-
-        <ListView
-            android:id="@+id/notes_list"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:cacheColorHint="@null"
-            android:divider="@null"
-            android:fadingEdge="@null"
-            android:listSelector="@android:color/transparent" />
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/btn_new_note"
-        android:background="@drawable/new_note"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="false"
-        android:layout_gravity="bottom" />
-<!--        写便签按钮的实现-->
-</FrameLayout>
diff --git a/src/main/res/layout/note_list_dropdown_menu.xml b/src/main/res/layout/note_list_dropdown_menu.xml
deleted file mode 100644
index 3fa271d..0000000
--- a/src/main/res/layout/note_list_dropdown_menu.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:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-    <Button android:id="@+id/selection_menu"
-            android:divider="?android:attr/listDividerAlertDialog"
-            android:singleLine="true"
-            android:gravity="left|center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            style="?android:attr/borderlessButtonStyle" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/note_list_footer.xml b/src/main/res/layout/note_list_footer.xml
deleted file mode 100644
index 5ca7b22..0000000
--- a/src/main/res/layout/note_list_footer.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<View
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="100dip"
-    android:visibility="invisible"
-    android:focusable="false"
-    android:background="@drawable/list_footer_bg" />
\ No newline at end of file
diff --git a/src/main/res/layout/settings_header.xml b/src/main/res/layout/settings_header.xml
deleted file mode 100644
index 5eb8c50..0000000
--- a/src/main/res/layout/settings_header.xml
+++ /dev/null
@@ -1,41 +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
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        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"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/widget_2x.xml b/src/main/res/layout/widget_2x.xml
deleted file mode 100644
index 55970ce..0000000
--- a/src/main/res/layout/widget_2x.xml
+++ /dev/null
@@ -1,37 +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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="146dip"
-    android:layout_height="146dip">
-    <ImageView
-        android:id="@+id/widget_bg_image"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-    <TextView
-        android:id="@+id/widget_text"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:paddingTop="20dip"
-        android:paddingLeft="15dip"
-        android:paddingRight="15dip"
-        android:textSize="14sp"
-        android:textColor="#FF663300"
-        android:maxLines="6"
-        android:lineSpacingMultiplier="1.2" />
-</FrameLayout>
diff --git a/src/main/res/layout/widget_4x.xml b/src/main/res/layout/widget_4x.xml
deleted file mode 100644
index dc9bb51..0000000
--- a/src/main/res/layout/widget_4x.xml
+++ /dev/null
@@ -1,39 +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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="294dip"
-    android:layout_height="294dip">
-
-    <ImageView
-        android:id="@+id/widget_bg_image"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-    <TextView
-        android:id="@+id/widget_text"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:paddingTop="40dip"
-        android:paddingLeft="15dip"
-        android:paddingRight="15dip"
-        android:textSize="14sp"
-        android:textColor="#FF663300"
-        android:maxLines="12"
-        android:lineSpacingMultiplier="1.2" />
-</FrameLayout>
diff --git a/src/main/res/menu/call_note_edit.xml b/src/main/res/menu/call_note_edit.xml
deleted file mode 100644
index 02c0528..0000000
--- a/src/main/res/menu/call_note_edit.xml
+++ /dev/null
@@ -1,48 +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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_delete"
-        android:title="@string/menu_delete" />
-
-    <item
-        android:id="@+id/menu_font_size"
-        android:title="@string/menu_font_size"/>
-
-    <item
-        android:id="@+id/menu_list_mode"
-        android:title="@string/menu_list_mode" />
-
-    <item
-        android:id="@+id/menu_share"
-        android:title="@string/menu_share"/>
-
-    <item
-        android:id="@+id/menu_send_to_desktop"
-        android:title="@string/menu_send_to_desktop"/>
-
-    <item
-        android:id="@+id/menu_alert"
-        android:title="@string/menu_alert" />
-
-    <item
-        android:id="@+id/menu_delete_remind"
-        android:title="@string/menu_remove_remind" />
-</menu>
diff --git a/src/main/res/menu/call_record_folder.xml b/src/main/res/menu/call_record_folder.xml
deleted file mode 100644
index c664346..0000000
--- a/src/main/res/menu/call_record_folder.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_search"
-        android:title="@string/menu_search" />
-</menu>
diff --git a/src/main/res/menu/note_edit.xml b/src/main/res/menu/note_edit.xml
deleted file mode 100644
index 8f7d145..0000000
--- a/src/main/res/menu/note_edit.xml
+++ /dev/null
@@ -1,57 +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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_new_note"
-        android:title="@string/notelist_menu_new"/>
-
-    <item
-        android:id="@+id/menu_font_select"
-        android:title="@string/menu_font_style" />
-
-    <item
-        android:id="@+id/menu_delete"
-        android:title="@string/menu_delete"/>
-
-    <item
-        android:id="@+id/menu_font_size"
-        android:title="@string/menu_font_size"/>
-
-    <item
-        android:id="@+id/menu_list_mode"
-        android:title="@string/menu_list_mode" />
-
-    <item
-        android:id="@+id/menu_share"
-        android:title="@string/menu_share"/>
-
-    <item
-        android:id="@+id/menu_send_to_desktop"
-        android:title="@string/menu_send_to_desktop"/>
-
-    <item
-        android:id="@+id/menu_alert"
-        android:title="@string/menu_alert" />
-
-    <item
-        android:id="@+id/menu_delete_remind"
-        android:title="@string/menu_remove_remind" />
-
-</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/note_list.xml b/src/main/res/menu/note_list.xml
deleted file mode 100644
index 106bc3f..0000000
--- a/src/main/res/menu/note_list.xml
+++ /dev/null
@@ -1,66 +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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_new_folder"
-        android:title="@string/menu_create_folder"/>
-
-    <item
-        android:id="@+id/menu_export_text"
-        android:title="@string/menu_export_text"/>
-
-    <item
-        android:id="@+id/menu_sync"
-        android:title="@string/menu_sync"/>
-
-    <item
-        android:id="@+id/menu_setting"
-        android:title="@string/menu_setting" />
-
-    <item
-        android:id="@+id/menu_search"
-        android:title="@string/menu_search"/>
-
-    <item
-        android:id="@+id/menu_board"
-        android:title="@string/board"/>
-    <item
-        android:id="@+id/menu_girl"
-        android:title="@string/background_girl"/>
-
-    <item
-        android:id="@+id/menu_sea"
-        android:title="@string/background_sea"/>
-
-    <item
-        android:id="@+id/menu_sweet"
-        android:title="@string/background_sweet"/>
-
-   <item
-        android:id="@+id/menu_login"
-        android:title="@string/setting_the_login_password"/>
-
-    <item
-        android:id="@+id/menu_delete_login"
-        android:title="@string/Delete_the_login_password"/>
-    <item
-        android:id="@+id/menu_countallNotes"
-        android:title="@string/menu_countallNotes"/>
-
-</menu>
diff --git a/src/main/res/menu/note_list_dropdown.xml b/src/main/res/menu/note_list_dropdown.xml
deleted file mode 100644
index 7cbaadc..0000000
--- a/src/main/res/menu/note_list_dropdown.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_select_all" android:title="@string/menu_select_all" />
-</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/note_list_options.xml b/src/main/res/menu/note_list_options.xml
deleted file mode 100644
index daac008..0000000
--- a/src/main/res/menu/note_list_options.xml
+++ /dev/null
@@ -1,31 +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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/move"
-        android:title="@string/menu_move"
-        android:icon="@drawable/menu_move"
-        android:showAsAction="always|withText" />
-
-    <item
-        android:id="@+id/delete"
-        android:title="@string/menu_delete"
-        android:icon="@drawable/menu_delete"
-        android:showAsAction="always|withText" />
-</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/sub_folder.xml b/src/main/res/menu/sub_folder.xml
deleted file mode 100644
index b00de26..0000000
--- a/src/main/res/menu/sub_folder.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/menu_new_note"
-        android:title="@string/notelist_menu_new"/>
-</menu>
\ No newline at end of file
diff --git a/src/main/res/raw-zh-rCN/introduction b/src/main/res/raw-zh-rCN/introduction
deleted file mode 100644
index 7188359..0000000
--- a/src/main/res/raw-zh-rCN/introduction
+++ /dev/null
@@ -1,7 +0,0 @@
-欢迎使用MIUI便签！
-
-      无论从软件中直接添加，还是从桌面拖出widget，MIUI便签能让你快速建立和保存便签；
-
-      除了调整文字大小、便签背景、文件夹等基础功能外，你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能，让你的生活记录更加美好和安全；
-
-      来分享你的使用体验吧：http://www.miui.com/index.php
diff --git a/src/main/res/raw/introduction b/src/main/res/raw/introduction
deleted file mode 100644
index 269cf7b..0000000
--- a/src/main/res/raw/introduction
+++ /dev/null
@@ -1 +0,0 @@
-Welcome to use MIUI notes!
\ No newline at end of file
diff --git a/src/main/res/values-ja-rJP/arrays(1).xml b/src/main/res/values-ja-rJP/arrays(1).xml
deleted file mode 100644
index e4ad50b..0000000
--- a/src/main/res/values-ja-rJP/arrays(1).xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<resources>
-    <string-array name="menu_share_ways">
-        <item>ショートメッセージ</item>
-        <item>メール</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ja-rJP/strings(1).xml b/src/main/res/values-ja-rJP/strings(1).xml
deleted file mode 100644
index 03e1ff1..0000000
--- a/src/main/res/values-ja-rJP/strings(1).xml
+++ /dev/null
@@ -1,126 +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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">メモ</string>
-    <string name="app_widget2x2">メモ2x2</string>
-    <string name="app_widget4x4">メモ4x4</string>
-    <string name="widget_havenot_content">関連内容がないので、新しい付箋をクリックしてください。</string>
-    <string name="widget_under_visit_mode">ゲストモードでは、付箋の内容は表示されません</string>
-    <string name="notelist_string_info">...</string>
-    <string name="notelist_menu_new">新しいメモ</string>
-    <string name="delete_remind_time_message">リマインダの削除に成功しました</string>
-    <string name="set_remind_time_message">リマインダの作成</string>
-    <string name="note_alert_expired">期限切れ</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="notealert_ok">わかりました</string>
-    <string name="notealert_enter">表示＃ヒョウジ＃</string>
-    <string name="note_link_tel">よびだしでんわ</string>
-    <string name="note_link_email">メールを送信</string>
-    <string name="note_link_web">Webページの参照</string>
-    <string name="note_link_other">地図を開く</string>
-    <!-- note list string -->
-    <string name="menu_create_folder">新規フォルダ</string>
-    <string name="menu_export_text">テキストのエクスポート</string>
-    <string name="menu_sync">同期</string>
-    <string name="menu_sync_cancel">同期解除</string>
-    <string name="menu_setting">設定＃セッテイ＃</string>
-    <string name="menu_search">検索けんさく</string>
-    <string name="menu_delete">削除＃サクジョ＃</string>
-    <string name="menu_move">フォルダに移動</string>
-    <string name="menu_select_title">%dアイテムが選択されています</string>
-    <string name="menu_select_none">選択されていない、無効なアクション</string>
-    <string name="menu_select_all">すべて選択</string>
-    <string name="menu_deselect_all">すべて選択解除</string>
-    <string name="menu_font_size">文字サイズ</string>
-    <string name="menu_font_small">小さい</string>
-    <string name="menu_font_normal">通常</string>
-    <string name="menu_font_large">大きい</string>
-    <string name="menu_font_super">超大型</string>
-    <string name="menu_list_mode">インベントリモードに入る</string>
-    <string name="menu_normal_mode">教材モードを終了する</string>
-    <string name="menu_folder_view">フォルダの表示</string>
-    <string name="menu_folder_delete">フォルダを削除</string>
-    <string name="menu_folder_change_name">フォルダ名の変更</string>
-    <string name="folder_exist">フォルダ%1$sは既に存在します。名前を変更してください</string>
-    <string name="menu_share">分かち合う</string>
-    <string name="menu_send_to_desktop">デスクトップに送信</string>
-    <string name="menu_alert">注意してください</string>
-    <string name="menu_remove_remind">リマインダの削除</string>
-    <string name="menu_title_select_folder">フォルダの選択</string>
-    <string name="menu_move_parent_folder">上位フォルダ</string>
-    <string name="info_note_enter_desktop">デスクトップに追加されました</string>
-    <string name="alert_title_delete">削除＃サクジョ＃</string>
-    <string name="alert_message_delete_notes">選択した%dメモを削除することを確認しますか？</string>
-    <string name="alert_message_delete_note">選択した%dメモを削除することを確認しますか？</string>
-    <string name="alert_message_delete_folder">フォルダの削除と付箋の内容を確認しますか？</string>
-    <string name="format_move_notes_to_folder">選択した%1$dメモを%2$sフォルダに移動しました</string>
-    <!-- export text -->
-    <string name="error_sdcard_unmounted">SDカードは占有され、操作できない</string>
-    <string name="error_sdcard_export">SDカードは占有され、操作できない</string>
-    <string name="error_note_not_exist">選択した%1$dメモ</string>
-    <string name="error_note_empty_for_clock">選択した%1$dメモ</string>
-    <string name="error_note_empty_for_send_to_desktop">選択した%1$dメモ</string>
-    <string name="success_sdcard_export">選択した%1$dメモ</string>
-    <string name="failed_sdcard_export">選択した%1$dメモ</string>
-    <string name="format_exported_file_location">選択した%1$dメモを%2$sフォルダに移動しました</string>
-    <!-- Sync -->
-    <string name="ticker_syncing">同期メモ...</string>
-    <string name="ticker_success">同期メモ</string>
-    <string name="ticker_fail">同期に失敗しました</string>
-    <string name="ticker_cancel">同期がキャンセルされました</string>
-    <string name="success_sync_account">%1$sとの同期に成功しました</string>
-    <string name="error_sync_network">同期に失敗しました。ネットワークとアカウントの設定を確認してください</string>
-    <string name="error_sync_internal">同期に失敗し、内部エラーが発生しました</string>
-    <string name="error_sync_cancelled">同期がキャンセルされました</string>
-    <string name="sync_progress_login">ログイン＃ログイン＃%1$s...</string>
-    <string name="sync_progress_init_list">サーバ付箋リストを取得中...</string>
-    <string name="sync_progress_syncing">サーバ付箋リストを取得中...</string>
-    <!-- Preferences -->
-    <string name="preferences_title">アカウントの追加</string>
-    <string name="preferences_account_title">アカウントの追加</string>
-    <string name="preferences_account_summary">アカウントの追加</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_add_account">アカウントの追加</string>
-    <string name="preferences_menu_change_account">アカウントの変更</string>
-    <string name="preferences_menu_remove_account">アカウントの削除</string>
-    <string name="preferences_menu_cancel">解除</string>
-    <string name="preferences_button_sync_immediately">同期</string>
-    <string name="preferences_button_sync_cancel">同期解除</string>
-    <string name="preferences_dialog_change_account_title">現在のアカウント%1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">同期アカウントを交換すると、過去のアカウント同期情報がクリアされ、再び切り替えられると同時にデータが重複する可能性があります</string>
-    <string name="preferences_dialog_select_account_title">同期メモ</string>
-    <string name="preferences_dialog_select_account_tips">googleアカウントを選択してください。付箋はそのアカウントのgoogle taskコンテンツと同期します。</string>
-    <string name="preferences_toast_cannot_change_account">同期中であり、同期アカウントを変更することはできません</string>
-    <string name="preferences_toast_success_set_accout">同期アカウントは%1$sに設定されています同步帐号已设置为%1$s</string>
-    <string name="preferences_bg_random_appear_title">新規付箋の背景色のランダム化</string>
-    <string name="button_delete">削除＃サクジョ＃</string>
-    <string name="call_record_folder_name">通話メモ</string>
-    <string name="hint_foler_name">名前を入力してください</string>
-    <string name="search_label">メモを検索中</string>
-    <string name="search_hint">検索メモ</string>
-    <string name="search_setting_description">付箋の文字</string>
-    <string name="search">メモ</string>
-    <string name="datetime_dialog_ok">設定＃セッテイ＃</string>
-    <string name="datetime_dialog_cancel">キャンセル</string>
-    <plurals name="search_results_title">
-        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> バーの一致“<xliff:g id="SEARCH">%2$s</xliff:g>”の検索結果</item>
-    </plurals>
-
-</resources>
diff --git a/src/main/res/values-ko-rKR/arrays.xml b/src/main/res/values-ko-rKR/arrays.xml
deleted file mode 100644
index ed490c4..0000000
--- a/src/main/res/values-ko-rKR/arrays.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<resources>
-    <string-array name="menu_share_ways">
-        <item>문자 메시지</item>
-        <item>우편물</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ko-rKR/strings.xml b/src/main/res/values-ko-rKR/strings.xml
deleted file mode 100644
index 49da114..0000000
--- a/src/main/res/values-ko-rKR/strings.xml
+++ /dev/null
@@ -1,126 +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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">메모</string>
-    <string name="app_widget2x2">포스트잇 2x2</string>
-    <string name="app_widget4x4">포스트잇 4x4</string>
-    <string name="widget_havenot_content">관련 내용이 없습니다. 새 쪽지를 누르십시오.</string>
-    <string name="widget_under_visit_mode">방문객 모드에서 쪽지 내용이 보이지 않습니다</string>
-    <string name="notelist_string_info">...</string>
-    <string name="notelist_menu_new">새 메모</string>
-    <string name="delete_remind_time_message">알림 삭제 성공</string>
-    <string name="set_remind_time_message">알림 만들기</string>
-    <string name="note_alert_expired">만료됨</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM달dd하루 kk:mm</string>
-    <string name="notealert_ok">알겠습니다</string>
-    <string name="notealert_enter">보기</string>
-    <string name="note_link_tel">호출 전화</string>
-    <string name="note_link_email">메일을 보내다</string>
-    <string name="note_link_web">웹 페이지 찾아보기</string>
-    <string name="note_link_other">지도 열기</string>
-    <!-- note list string -->
-    <string name="menu_create_folder">새 폴더</string>
-    <string name="menu_export_text">텍스트 내보내기</string>
-    <string name="menu_sync">동기화</string>
-    <string name="menu_sync_cancel">동기화 취소</string>
-    <string name="menu_setting">설치</string>
-    <string name="menu_search">검색</string>
-    <string name="menu_delete">삭제</string>
-    <string name="menu_move">폴더로 이동</string>
-    <string name="menu_select_title">% d 항목 선택</string>
-    <string name="menu_select_none">선택 항목이 없습니다. 잘못된 동작입니다</string>
-    <string name="menu_select_all">전체 선택</string>
-    <string name="menu_deselect_all">전체 선택 취소</string>
-    <string name="menu_font_size">문자 크기</string>
-    <string name="menu_font_small">작다</string>
-    <string name="menu_font_normal">정상</string>
-    <string name="menu_font_large">크다</string>
-    <string name="menu_font_super">매우 크다</string>
-    <string name="menu_list_mode">목록 모드 진입</string>
-    <string name="menu_normal_mode">목록 모드 종료</string>
-    <string name="menu_folder_view">폴더 보기</string>
-    <string name="menu_folder_delete">폴더 삭제</string>
-    <string name="menu_folder_change_name">폴더 이름 수정</string>
-    <string name="folder_exist">폴더%1$s 이(가) 이미 있습니다. 이름을 바꾸십시오</string>
-    <string name="menu_share">나누다</string>
-    <string name="menu_send_to_desktop">데스크톱으로 보내기</string>
-    <string name="menu_alert">일깨워 주다</string>
-    <string name="menu_remove_remind">알림 삭제</string>
-    <string name="menu_title_select_folder">폴더 선택</string>
-    <string name="menu_move_parent_folder">이전 수준 폴더</string>
-    <string name="info_note_enter_desktop">데스크톱에 추가됨</string>
-    <string name="alert_title_delete">삭제</string>
-    <string name="alert_message_delete_notes">선택한%d 쪽지를 삭제하시겠습니까?</string>
-    <string name="alert_message_delete_note">이 쪽지를 삭제하시겠습니까?</string>
-    <string name="alert_message_delete_folder">폴더와 포함된 메모를 삭제하시겠습니까?</string>
-    <string name="format_move_notes_to_folder">선택된%1$d 메모지를%2$s 폴더로 옮겼습니다</string>
-    <!-- export text -->
-    <string name="error_sdcard_unmounted">SD 카드 사용, 작동 불가</string>
-    <string name="error_sdcard_export">텍스트를 내보내는 동안 오류가 발생했습니다. SD 카드를 확인하십시오</string>
-    <string name="error_note_not_exist">볼 메모가 없습니다</string>
-    <string name="error_note_empty_for_clock">빈 쪽지에 알람을 설정할 수 없습니다</string>
-    <string name="error_note_empty_for_send_to_desktop">빈 메모를 데스크톱으로 보낼 수 없음</string>
-    <string name="success_sdcard_export">내보내기 성공</string>
-    <string name="failed_sdcard_export">내보내기 실패</string>
-    <string name="format_exported_file_location">텍스트 파일 (%1$s) 을 SD 카드 (%2$s) 디렉토리로 내보냈습니다</string>
-    <!-- Sync -->
-    <string name="ticker_syncing">메모지 동기화...</string>
-    <string name="ticker_success">동기화 성공</string>
-    <string name="ticker_fail">동기화 실패</string>
-    <string name="ticker_cancel">동기화 성공</string>
-    <string name="success_sync_account">%1$s와 동기화 성공</string>
-    <string name="error_sync_network">동기화에 실패했습니다. 네트워크 및 계정 설정을 확인하십시오</string>
-    <string name="error_sync_internal">동기화 실패, 내부 오류 발생</string>
-    <string name="error_sync_cancelled">동기화 취소</string>
-    <string name="sync_progress_login">%1$s 로그인...</string>
-    <string name="sync_progress_init_list">서버 쪽지 목록 가져오기...</string>
-    <string name="sync_progress_syncing">로컬 메모지 동기화 중...</string>
-    <!-- Preferences -->
-    <string name="preferences_title">설치</string>
-    <string name="preferences_account_title">계정 동기화</string>
-    <string name="preferences_account_summary">Google task와 메모 기록 동기화</string>
-    <string name="preferences_last_sync_time">%1$s 에 마지막으로 동기화</string>
-    <string name="preferences_add_account">添加账号</string>
-    <string name="preferences_menu_change_account">계정을 바꾸다</string>
-    <string name="preferences_menu_remove_account">계정 삭제</string>
-    <string name="preferences_menu_cancel">취소</string>
-    <string name="preferences_button_sync_immediately">지금 동기화</string>
-    <string name="preferences_button_sync_cancel">동기화 취소</string>
-    <string name="preferences_dialog_change_account_title">현재 계정%1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">동기화 계정을 교체하면 과거 계정 동기화 정보가 비워지고 다시 전환하는 동시에 데이터가 중복될 수 있습니다</string>
-    <string name="preferences_dialog_select_account_title">메모지 동기화</string>
-    <string name="preferences_dialog_select_account_tips">구글 계정을 선택하십시오. 이 계정의 구글 task 내용과 동기화합니다.</string>
-    <string name="preferences_toast_cannot_change_account">동기화 중, 동기화 계정을 수정할 수 없습니다.</string>
-    <string name="preferences_toast_success_set_accout">동기화 계정이%1$s(으)로 설정되었습니다</string>
-    <string name="preferences_bg_random_appear_title">새 메모지 배경색 랜덤</string>
-    <string name="button_delete">삭제</string>
-    <string name="call_record_folder_name">통화 메모</string>
-    <string name="hint_foler_name">이름을 입력하십시오</string>
-    <string name="search_label">메모지 검색 중</string>
-    <string name="search_hint">메모지 검색</string>
-    <string name="search_setting_description">메모의 텍스트</string>
-    <string name="search">메모</string>
-    <string name="datetime_dialog_ok">설치</string>
-    <string name="datetime_dialog_cancel">취소</string>
-    <plurals name="search_results_title">
-        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 조항이 부합되다“<xliff:g id="SEARCH">%2$s</xliff:g>”에 대한 검색 결과</item>
-    </plurals>
-
-</resources>
diff --git a/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index a092386..0000000
--- a/src/main/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<resources>
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index ed3d66e..0000000
--- a/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,138 +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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">便签</string>
-    <string name="app_widget2x2">便签2x2</string>
-    <string name="app_widget4x4">便签4x4</string>
-    <string name="menu_countallNotes" >当前便签数量 </string>
-    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
-    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
-    <string name="notelist_string_info">...</string>
-    <string name="notelist_menu_new">新建便签</string>
-    <string name="delete_remind_time_message">成功删除提醒</string>
-    <string name="set_remind_time_message">创建提醒</string>
-    <string name="note_alert_expired">已过期</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="menu_font_style" >选择字体</string>
-    <string name="notealert_enter">查看</string>
-    <string name="note_link_tel">呼叫电话</string>
-    <string name="note_link_email">发送邮件</string>
-    <string name="note_link_web">浏览网页</string>
-    <string name="note_link_other">打开地图</string>
-    <!-- note list string -->
-    <string name="menu_create_folder">新建文件夹</string>
-    <string name="menu_export_text">导出文本</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_setting">设置</string>
-    <string name="menu_search">搜索</string>
-    <string name="menu_delete">删除</string>
-    <string name="menu_move">移动到文件夹</string>
-    <string name="menu_select_title">选中了 %d 项</string>
-    <string name="menu_select_none">没有选中项，操作无效</string>
-    <string name="menu_select_all">全选</string>
-    <string name="menu_deselect_all">取消全选</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">进入清单模式</string>
-    <string name="menu_normal_mode">退出清单模式</string>
-    <string name="menu_folder_view">查看文件夹</string>
-    <string name="menu_folder_delete">刪除文件夹</string>
-    <string name="menu_folder_change_name">修改文件夹名称</string>
-    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_send_to_desktop">发送到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_remove_remind">删除提醒</string>
-    <string name="menu_title_select_folder">选择文件夹</string>
-    <string name="menu_move_parent_folder">上一级文件夹</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="alert_title_delete">删除</string>
-    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
-    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
-    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
-    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
-    <!-- export text -->
-    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
-    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
-    <string name="error_note_not_exist">要查看的便签不存在</string>
-    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
-    <string name="success_sdcard_export">导出成功</string>
-    <string name="failed_sdcard_export">导出失败</string>
-    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
-    <!-- Sync -->
-    <string name="ticker_syncing">同步便签...</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_fail">同步失败</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="success_sync_account">与%1$s同步成功</string>
-    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
-    <string name="error_sync_internal">同步失败，发生内部错误</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="sync_progress_login">登录%1$s...</string>
-    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
-    <string name="sync_progress_syncing">正在同步本地便签...</string>
-    <!-- Preferences -->
-    <string name="preferences_title">设置</string>
-    <string name="preferences_account_title">同步账号</string>
-    <string name="preferences_account_summary">与google task同步便签记录</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_add_account">添加账号</string>
-    <string name="preferences_menu_change_account">更换账号</string>
-    <string name="preferences_menu_remove_account">删除账号</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
-    <string name="preferences_dialog_select_account_title">同步便签</string>
-    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
-    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
-    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="hint_foler_name">请输入名称</string>
-    <string name="search_label">正在搜索便签</string>
-    <string name="search_hint">搜索便签</string>
-    <string name="search_setting_description">便签中的文字</string>
-    <string name="search">便签</string>
-    <string name="datetime_dialog_ok">设置</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="speak">朗读</string>
-    <string name="background_sea">背景：海</string>
-    <string name="background_sweet">背景：甜心</string>
-    <string name="background_girl">背景：女孩</string>
-    <string name="board">画板</string>
-    <string name="login">登录</string>
-    <string name="Delete_the_login_password">删除登录密码</string>
-    <string name="change_the_login_password">更改登录密码</string>
-    <string name="setting_the_login_password">设置登录密码</string>
-    <string name="password">密码:</string>
-    <plurals name="search_results_title">
-        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
-    </plurals>
-
-</resources>
diff --git a/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml
deleted file mode 100644
index 5297209..0000000
--- a/src/main/res/values-zh-rTW/arrays.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<resources>
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index e29b79b..0000000
--- a/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,127 +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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">便簽</string>
-    <string name="app_widget2x2">便簽2x2</string>
-    <string name="app_widget4x4">便簽4x4</string>
-    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
-    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
-    <string name="notelist_string_info">...</string>
-    <string name="notelist_menu_new">新建便簽</string>
-    <string name="delete_remind_time_message">成功刪除提醒</string>
-    <string name="set_remind_time_message">創建提醒</string>
-    <string name="note_alert_expired">已過期</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notealert_enter">查看</string>
-    <string name="note_link_tel">呼叫電話</string>
-    <string name="note_link_email">發送郵件</string>
-    <string name="note_link_web">浏覽網頁</string>
-    <string name="note_link_other">打開地圖</string>
-    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
-    <!-- note list string -->
-    <string name="menu_create_folder">新建文件夾</string>
-    <string name="menu_export_text">導出文本</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_setting">設置</string>
-    <string name="menu_search">搜尋</string>
-    <string name="menu_delete">刪除</string>
-    <string name="menu_move">移動到文件夾</string>
-    <string name="menu_select_title">選中了 %d 項</string>
-    <string name="menu_select_none">沒有選中項，操作無效</string>
-    <string name="menu_select_all">全選</string>
-    <string name="menu_deselect_all">取消全選</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">進入清單模式</string>
-    <string name="menu_normal_mode">退出清單模式</string>
-    <string name="menu_folder_view">查看文件夾</string>
-    <string name="menu_folder_delete">刪除文件夾</string>
-    <string name="menu_folder_change_name">修改文件夾名稱</string>
-    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_send_to_desktop">發送到桌面</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_remove_remind">刪除提醒</string>
-    <string name="menu_title_select_folder">選擇文件夾</string>
-    <string name="menu_move_parent_folder">上一級文件夾</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="alert_title_delete">刪除</string>
-    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
-    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
-    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
-    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
-    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
-    <string name="error_note_not_exist">要查看的便籤不存在</string>
-    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
-    <string name="success_sdcard_export">導出成功</string>
-    <string name="failed_sdcard_export">導出失敗</string>
-    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
-    <!-- Sync -->
-    <string name="ticker_syncing">同步便簽...</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_fail">同步失敗</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="success_sync_account">與%1$s同步成功</string>
-    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
-    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="sync_progress_login">登陸%1$s...</string>
-    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
-    <string name="sync_progress_syncing">正在同步本地便籤...</string>
-    <!-- Preferences -->
-    <string name="preferences_title">設置</string>
-    <string name="preferences_account_title">同步賬號</string>
-    <string name="preferences_account_summary">与google task同步便簽記錄</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_add_account">添加賬號</string>
-    <string name="preferences_menu_change_account">更換賬號</string>
-    <string name="preferences_menu_remove_account">刪除賬號</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_button_sync_immediately">立即同步</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
-    <string name="preferences_dialog_select_account_title">同步便簽</string>
-    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
-    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
-    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
-
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="hint_foler_name">請輸入名稱</string>
-
-    <string name="search_label">正在搜索便籤</string>
-    <string name="search_hint">搜索便籤</string>
-    <string name="search_setting_description">便籤中的文字</string>
-    <string name="search">便籤</string>
-    <string name="datetime_dialog_ok">設置</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <plurals name="search_results_title">
-        <item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
-    </plurals>
-
-</resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
deleted file mode 100644
index e00210b..0000000
--- a/src/main/res/values/arrays.xml
+++ /dev/null
@@ -1,31 +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.
--->
-
-<resources>
-    <!-- Backup format -->
-    <string-array name="format_for_exported_note">
-        <item>-%s</item>      <!-- format_folder_name -->
-        <item>--%s</item>     <!-- format_folder_note_date -->
-        <item>--%s</item>     <!-- format_note_date -->
-        <item>--%s</item>     <!-- format_note_content -->
-    </string-array>
-
-    <string-array name="menu_share_ways">
-        <item>Messaging</item>
-        <item>Email</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
deleted file mode 100644
index 123ffbf..0000000
--- a/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<resources>
-    <color name="user_query_highlight">#335b5b5b</color>
-</resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
deleted file mode 100644
index 194e84f..0000000
--- a/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<resources>
-    <dimen name="text_font_size_super">33sp</dimen>
-    <dimen name="text_font_size_large">26sp</dimen>
-    <dimen name="text_font_size_medium">20sp</dimen>
-    <dimen name="text_font_size_normal">17sp</dimen>
-    <dimen name="text_font_size_small">14sp</dimen>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
deleted file mode 100644
index 5fc0752..0000000
--- a/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,157 +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.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Notes</string>
-    <string name="app_widget2x2">Notes 2x2</string>
-    <string name="app_widget4x4">Notes 4x4</string>
-    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
-    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
-    <string name="notelist_string_info">...</string>
-    <string name="notelist_menu_new">Add note</string>
-    <string name="delete_remind_time_message">Delete reminder successfully</string>
-    <string name="set_remind_time_message">Set reminder</string>
-    <string name="note_alert_expired">Expired</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MMMd kk:mm</string>
-    <string name="notealert_ok">Got it</string>
-    <string name="notealert_enter">Take a look</string>
-    <string name="note_link_tel">Call</string>
-    <string name="note_link_email">Send email</string>
-    <string name="note_link_web">Browse web</string>
-    <string name="note_link_other">Open map</string>
-    <string name="menu_countallNotes" translatable="false">countallNotes" </string>
-    <!-- Text export file information -->
-    <string name="file_path">/MIUI/notes/</string>
-    <string name="file_name_txt_format">notes_%s.txt</string>
-    <!-- notes list string -->
-    <string name="format_folder_files_count">(%d)</string>
-    <string name="menu_create_folder">New Folder</string>
-    <string name="menu_export_text">Export text</string>
-    <string name="menu_sync">Sync</string>
-    <string name="menu_font_style" translatable="false">Select font</string>
-    <string name="menu_sync_cancel">Cancel syncing</string>
-    <string name="menu_setting">Settings</string>
-    <string name="menu_search">Search</string>
-    <string name="menu_delete">Delete</string>
-    <string name="menu_move">Move to folder</string>
-    <string name="menu_select_title">%d selected</string>
-    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
-    <string name="menu_select_all">Select all</string>
-    <string name="menu_deselect_all">Deselect all</string>
-    <string name="menu_font_size">Font size</string>
-    <string name="menu_font_small">Small</string>
-    <string name="menu_font_normal">Medium</string>
-    <string name="menu_font_large">Large</string>
-    <string name="menu_font_super">Super</string>
-    <string name="menu_list_mode">Enter check list</string>
-    <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_folder_view">View folder</string>
-    <string name="menu_folder_delete">Delete folder</string>
-    <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_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_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>
-    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
-    <string name="alert_title_delete">Delete selected notes</string>
-    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
-    <string name="alert_message_delete_note">Confirm to delete this note?</string>
-    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
-    <!-- Error information -->
-    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
-    <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_note_not_exist">The note is not exist</string>
-    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
-    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
-    <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_bg_random_appear_title">New note background color random</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="search_label">Searching Notes</string>
-    <string name="search_hint">Search notes</string>
-    <string name="search_setting_description">Text in your notes</string>
-    <string name="search">Notes</string>
-    <string name="datetime_dialog_ok">set</string>
-    <string name="datetime_dialog_cancel">cancel</string>
-    <string name="background_cat">Background:cat</string>
-    <string name="background_sea">Background:sea</string>
-    <string name="background_sweet">Background:sweet</string>
-    <string name="background_girl">Background:girl</string>
-    <string name="setting_the_login_password">Setting the Login Password</string>
-
-    <string name="login">login</string>
-    <string name="Delete_the_login_password">Delete the login password</string>
-    <string name="change_the_login_password">Change the login password</string>
-    <string name="set_password">set_password</string>
-    <string name="delete_password">delete_password</string>
-    <string name="read">Read</string>
-    <string name="note_passcode_deleted" />
-    <string name="set_lock">Set_Lock</string>
-    <string name="clear_lock">clear_Lock</string>
-    <string name="speak">Speak</string>
-    <string name="board">Board</string>
-    <string name="lock">Lock</string>
-    <string name="unlock">Unlock</string>
-    <string name="password">Password:</string>
-    <plurals name="search_results_title">
-         <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
-        <!-- Case of 0 or 2 or more results. -->
-        <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>
-
-</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
deleted file mode 100644
index 5012936..0000000
--- a/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,69 +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.
--->
-
-<resources>
-    <style name="TextAppearanceSuper">
-        <item name="android:textSize">@dimen/text_font_size_super</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceLarge">
-        <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceMedium">
-        <item name="android:textSize">@dimen/text_font_size_medium</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceNormal">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-
-    <style name="TextAppearancePrimaryItem">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-
-    <style name="TextAppearanceSecondaryItem">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-
-    <style name="TextAppearanceUnderMenuIcon">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
-    <style name="HighlightTextAppearancePrimary">
-    <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-
-    <style name="HighlightTextAppearanceSecondary">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-
-    <style name="NoteTheme" 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">
-        <!--<item name="android:displayOptions" /-->
-        <item name="android:visibility">visible</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
deleted file mode 100644
index fe58f8f..0000000
--- a/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,30 +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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:key="pref_sync_account_key">
-    </PreferenceCategory>
-
-    <PreferenceCategory>
-        <CheckBoxPreference
-            android:key="pref_key_bg_random_appear"
-            android:title="@string/preferences_bg_random_appear_title"
-            android:defaultValue="false" />
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/src/main/res/xml/searchable.xml b/src/main/res/xml/searchable.xml
deleted file mode 100644
index bf74f14..0000000
--- a/src/main/res/xml/searchable.xml
+++ /dev/null
@@ -1,27 +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.
--->
-
-<searchable
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/search_label"
-    android:hint="@string/search_hint"
-    android:searchMode="queryRewriteFromText"
-
-    android:searchSuggestAuthority="notes"
-    android:searchSuggestIntentAction="android.intent.action.VIEW"
-    android:searchSettingsDescription="@string/search_setting_description"
-    android:includeInGlobalSearch="true" />
diff --git a/src/main/res/xml/widget_2x_info.xml b/src/main/res/xml/widget_2x_info.xml
deleted file mode 100644
index ac8b225..0000000
--- a/src/main/res/xml/widget_2x_info.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<appwidget-provider
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget_2x"
-    android:minWidth="146dip"
-    android:minHeight="146dip">
-</appwidget-provider>
diff --git a/src/main/res/xml/widget_4x_info.xml b/src/main/res/xml/widget_4x_info.xml
deleted file mode 100644
index cf79f9c..0000000
--- a/src/main/res/xml/widget_4x_info.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<appwidget-provider
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget_4x"
-    android:minWidth="294dip"
-    android:minHeight="294dip">
-</appwidget-provider>