diff --git a/.gitignore b/.gitignore
index b06e864..99a0670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -210,3 +210,6 @@ FakesAssemblies/
 GeneratedArtifacts/
 _Pvt_Extensions/
 ModelManifest.xml
+/AnimateRaw/BundleArtifacts
+/AnimateRaw/_language-zh-hans.appx
+/AnimateRaw.Shared/XamarinInsights.cs
diff --git a/AnimateRaw.Android/Activity/AboutActivity.cs b/AnimateRaw.Android/Activity/AboutActivity.cs
index ea1205b..fbcc0e2 100644
--- a/AnimateRaw.Android/Activity/AboutActivity.cs
+++ b/AnimateRaw.Android/Activity/AboutActivity.cs
@@ -10,10 +10,11 @@
 using Android.Views;
 using Android.Widget;
 using Android.Support.V7.App;
+using AnimateRaw.Android.Common.Helpers;
 
 namespace AnimateRaw.Android.Activity
 {
-    [Activity(Label = "About")]
+    [Activity(Label = "About", Theme = "@style/AppTheme.NoActionBar")]
     public class AboutActivity : AppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
@@ -21,6 +22,7 @@ protected override void OnCreate(Bundle savedInstanceState)
             base.OnCreate(savedInstanceState);
             SetContentView(Resource.Layout.AboutPage);
             var toolbar = FindViewById<global::Android.Support.V7.Widget.Toolbar>(Resource.Id.AboutToolbar);
+            ((LinearLayout.LayoutParams)toolbar.LayoutParameters).SetMargins(0, StatusBarHelper.GetStatusBarHeight(this), 0, 0);
             SetSupportActionBar(toolbar);
             SupportActionBar.Title = "About";
         }
diff --git a/AnimateRaw.Android/Activity/DetailActivity.cs b/AnimateRaw.Android/Activity/DetailActivity.cs
index 0e51ae2..8c325b5 100644
--- a/AnimateRaw.Android/Activity/DetailActivity.cs
+++ b/AnimateRaw.Android/Activity/DetailActivity.cs
@@ -14,10 +14,12 @@
 using Android.Support.V7.Widget;
 using Android.Support.V7.App;
 using Android.Util;
+using AnimateRaw.Shared;
+using AnimateRaw.Android.Common.Helpers;
 
 namespace AnimateRaw.Android
 {
-    [Activity(Label = "Detail")]
+    [Activity(Label = "Detail", Theme = "@style/AppTheme.NoActionBar")]
     public class DetailActivity : AppCompatActivity
     {
         private double _id;
@@ -32,6 +34,7 @@ protected override async void OnCreate(Bundle savedInstanceState)
             _id = Intent.Extras.GetDouble("id");
             SetContentView(Resource.Layout.MainPage);
             var toolbar = FindViewById<global::Android.Support.V7.Widget.Toolbar>(Resource.Id.toolbar);
+            ((LinearLayout.LayoutParams)toolbar.LayoutParameters).SetMargins(0, StatusBarHelper.GetStatusBarHeight(this), 0, 0);
             SetSupportActionBar(toolbar);
             SupportActionBar.Title = _name;
             _exRecyclerView = FindViewById<ExRecyclerView>(Resource.Id.MainPageRecyclerView);
@@ -43,23 +46,18 @@ protected override async void OnCreate(Bundle savedInstanceState)
             _exRecyclerView.ViewLayoutManager = new GridLayoutManager(this, heightm > widthm ? 2 : 3);
             _refresher = FindViewById<ScrollChildSwipeRefreshLayout>(Resource.Id.MainPageRefresher);
             _refresher.SetColorSchemeResources(Resource.Color.MediumVioletRed);
-            _refresher.Refresh += refresher_Refresh;
+            _refresher.Refresh += async delegate { await Refresh(); };
             _refresher.Post(() => _refresher.Refreshing = true);
             await Refresh();
         }
-
-        private async void refresher_Refresh(object sender, EventArgs e)
-        {
-            await Refresh();
-        }
-
+        
         private async Task Refresh()
         {
             try
             {
                 using (var client = new HttpClient())
                 {
-                    var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}");
+                    var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}&prefLang={LanguageHelper.PrefLang}");
                     var list = (from item in (JArray)((JObject)JsonConvert.DeserializeObject(jsstr))["SetList"]
                                 select new AnimateSetModel
                                 {
@@ -87,7 +85,7 @@ private void Ada_ItemClick(object sender, int e)
             try
             {
                 using (var client = new HttpClient())
-                    client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}&filename={item.FileName}");
+                    client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}&filename={item.FileName}&prefLang={LanguageHelper.PrefLang}");
             }
             catch
             {
diff --git a/AnimateRaw.Android/Activity/MainActivity.cs b/AnimateRaw.Android/Activity/MainActivity.cs
index fafd094..21eea14 100644
--- a/AnimateRaw.Android/Activity/MainActivity.cs
+++ b/AnimateRaw.Android/Activity/MainActivity.cs
@@ -19,10 +19,13 @@
 using Android.Support.V7.Widget;
 using Android.Support.V7.App;
 using AnimateRaw.Android.Activity;
+using Java.Util;
+using AnimateRaw.Shared;
+using AnimateRaw.Android.Common.Helpers;
 
 namespace AnimateRaw.Android
 {
-    [Activity(Label = "Animate Raw", MainLauncher = true, Icon = "@drawable/icon")]
+    [Activity(Label = "Animate Raw", MainLauncher = true, Icon = "@drawable/icon", Theme = "@style/AppTheme.NoActionBar")]
     public class MainActivity : AppCompatActivity
     {
         private ExRecyclerView _recyclerView;
@@ -31,6 +34,7 @@ public class MainActivity : AppCompatActivity
         private int _page = 0;
         private bool _hasMore = true;
         private LinearLayoutManager _layoutManager;
+        private string _serverLink => $"http://oneechan.moe/api/list?page={_page++}&prefLang={LanguageHelper.PrefLang}";
 
         protected override async void OnCreate(Bundle bundle)
         {
@@ -40,19 +44,19 @@ protected override async void OnCreate(Bundle bundle)
             base.OnCreate(bundle);
             SetContentView(Resource.Layout.MainPage);
             var toolbar = FindViewById<global::Android.Support.V7.Widget.Toolbar>(Resource.Id.toolbar);
+            ((LinearLayout.LayoutParams)toolbar.LayoutParameters).SetMargins(0, StatusBarHelper.GetStatusBarHeight(this), 0, 0);
             SetSupportActionBar(toolbar);
             SupportActionBar.Title = "Animate Raw";
             _recyclerView = FindViewById<ExRecyclerView>(Resource.Id.MainPageRecyclerView);
-            _recyclerView.OnScroll += recyclerView_OnScroll;
             _layoutManager = new LinearLayoutManager(this);
             _recyclerView.ViewLayoutManager = _layoutManager;
+            _recyclerView.LoadMore += (sender, e) => LoadMore();
             _refresher = FindViewById<ScrollChildSwipeRefreshLayout>(Resource.Id.MainPageRefresher);
             _refresher.SetColorSchemeResources(Resource.Color.MediumVioletRed);
-            _refresher.Refresh += refresher_Refresh;
+            _refresher.Refresh += async delegate { await Refresh(); };
             _refresher.Post(() => _refresher.Refreshing = true);
             await Refresh();
         }
-
         public override bool OnOptionsItemSelected(IMenuItem item)
         {
             switch (item.ItemId)
@@ -63,27 +67,8 @@ public override bool OnOptionsItemSelected(IMenuItem item)
                 default:
                     break;
             }
-
             return base.OnOptionsItemSelected(item);
         }
-        private void recyclerView_OnScroll(object sender, OnScrollEventArgs e)
-        {
-            if (e.dy > 0)
-            {
-                var visibleItemCount = _layoutManager.ChildCount;
-                var totalItemCount = _layoutManager.ItemCount;
-                var pastVisiblesItems = _layoutManager.FindFirstVisibleItemPosition();
-
-                if (!_isLoading)
-                {
-                    if ((visibleItemCount + pastVisiblesItems) >= totalItemCount - 3)
-                    {
-                        _isLoading = true;
-                        LoadMore();
-                    }
-                }
-            }
-        }
 
         public override bool OnCreateOptionsMenu(IMenu menu)
         {
@@ -93,9 +78,12 @@ public override bool OnCreateOptionsMenu(IMenu menu)
 
         private async void LoadMore()
         {
+            if (_isLoading)
+                return;
+            _isLoading = true;
             using (var client = new HttpClient())
             {
-                var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/list?page={_page++}");
+                var jsstr = await client.GetStringAsync(_serverLink);
                 var obj = (JObject)JsonConvert.DeserializeObject(jsstr);
                 _hasMore = (bool)obj["HasMore"];
                 var list = (from item in (JArray)obj["List"]
@@ -109,12 +97,6 @@ private async void LoadMore()
                 _isLoading = false;
             }
         }
-        
-
-        private async void refresher_Refresh(object sender, EventArgs e)
-        {
-            await Refresh();
-        }
 
         private async System.Threading.Tasks.Task Refresh()
         {
@@ -123,7 +105,7 @@ private async System.Threading.Tasks.Task Refresh()
                 using (var client = new HttpClient())
                 {
                     _page = 0;
-                    var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/list?page={_page++}");
+                    var jsstr = await client.GetStringAsync(_serverLink);
                     var obj = (JObject)JsonConvert.DeserializeObject(jsstr);
                     _hasMore = (bool)obj["HasMore"];
                     var list = (from item in (JArray)obj["List"]
diff --git a/AnimateRaw.Android/Adapter/DetailListAdapter.cs b/AnimateRaw.Android/Adapter/DetailListAdapter.cs
index b5af10b..223e736 100644
--- a/AnimateRaw.Android/Adapter/DetailListAdapter.cs
+++ b/AnimateRaw.Android/Adapter/DetailListAdapter.cs
@@ -21,32 +21,26 @@ namespace AnimateRaw.Android.Adapter
     public class DetailListAdapter : RecyclerView.Adapter
     {
         public event EventHandler<int> ItemClick;
-        public List<AnimateSetModel> Items { get; private set; }
+        public List<AnimateSetModel> Items { get; }
         public DetailListAdapter(List<AnimateSetModel> items) : base()
         {
             Items = items;
         }
-        public override long GetItemId(int position)
-        {
-            return position;
-        }
+        public override long GetItemId(int position) => position;
 
         public override int ItemCount => Items.Count;
 
         public override async void OnBindViewHolder(RecyclerView.ViewHolder holder, int position)
         {
-            DetailViewHolder vh = holder as DetailViewHolder;
-            vh.Name.Text = Items[position].FileName;
-            vh.ClickCount.Text = $"Click Count:{Items[position].ClickCount}";
+            var vh = holder as ViewHolderBase;
+            vh.SetText(Resource.Id.DetailListLayoutName,Items[position].FileName).SetText(Resource.Id.DetailListLayoutClickCount, $"Click Count:{Items[position].ClickCount}");
             if (string.IsNullOrEmpty(Items[position].FileThumb))
             {
-                vh.Image.SetBackgroundColor(Color.MediumVioletRed);
-                vh.Image.SetImageResource(Resource.Drawable.SplashScreen);
+                vh.SetBackgroundColor(Resource.Id.DetailListImage, Color.MediumVioletRed).SetImageResource(Resource.Id.DetailListImage, Resource.Drawable.SplashScreen);
             }
             else
             {
-
-                vh.Image.SetImageBitmap(await GetImageBitmapFromUrl(Items[position].FileThumb));
+                vh.SetImageBitmap(Resource.Id.DetailListImage, await GetImageBitmapFromUrl(Items[position].FileThumb));
             }
         }
         private async System.Threading.Tasks.Task<Bitmap> GetImageBitmapFromUrl(string url)
@@ -74,7 +68,7 @@ public override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup parent, int
         {
             View itemView = LayoutInflater.From(parent.Context).
                Inflate(Resource.Layout.DetailListLayout, parent, false);
-            DetailViewHolder vh = new DetailViewHolder(itemView);
+            var vh = new ViewHolderBase(itemView, Resource.Id.DetailListLayoutName, Resource.Id.DetailListLayoutClickCount, Resource.Id.DetailListImage);
             itemView.Click += (s, e) => ItemClick?.Invoke(s, vh.LayoutPosition);
             return vh;
         }
diff --git a/AnimateRaw.Android/Adapter/MainListAdapter.cs b/AnimateRaw.Android/Adapter/MainListAdapter.cs
index 459d8a9..11d4e15 100644
--- a/AnimateRaw.Android/Adapter/MainListAdapter.cs
+++ b/AnimateRaw.Android/Adapter/MainListAdapter.cs
@@ -12,6 +12,7 @@
 using AnimateRaw.Shared.Model;
 using System.Collections.ObjectModel;
 using Android.Support.V7.Widget;
+using AnimateRaw.Android.ViewHolder;
 
 namespace AnimateRaw.Android.Adapter
 {
@@ -52,16 +53,14 @@ private string GetUpdate(TimeSpan time)
 
         public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int position)
         {
-            MainViewHolder vh = holder as MainViewHolder;
-            vh.Name.Text = Items[position].Name;
-            vh.UpdateTime.Text = GetUpdate(Items[position].LastUpdate);
+            (holder as ViewHolderBase).SetText(Resource.Id.MainListLayoutName, Items[position].Name).SetText(Resource.Id.MainListLayoutUpdateTime, GetUpdate(Items[position].LastUpdate));
         }
 
         public override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup parent, int viewType)
         {
             View itemView = LayoutInflater.From(parent.Context).
                Inflate(Resource.Layout.MainListLayout, parent, false);
-            MainViewHolder vh = new MainViewHolder(itemView);
+            var vh = new ViewHolderBase(itemView, Resource.Id.MainListLayoutName, Resource.Id.MainListLayoutUpdateTime);
             itemView.Click += (s, e) => ItemClick?.Invoke(s, vh.LayoutPosition);
             return vh;
         }
diff --git a/AnimateRaw.Android/AnimateRaw.Android.csproj b/AnimateRaw.Android/AnimateRaw.Android.csproj
index 4254f0b..6df16e0 100644
--- a/AnimateRaw.Android/AnimateRaw.Android.csproj
+++ b/AnimateRaw.Android/AnimateRaw.Android.csproj
@@ -17,6 +17,8 @@
     <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <XamarinInsightsApiKey>482c5e28d8c914da1e468a8e58a6b12f5d6c45f8</XamarinInsightsApiKey>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,6 +43,10 @@
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="Mono.Android.Export" />
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Json" />
@@ -48,21 +54,21 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Xamarin.Android.Support.v4.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Android.Support.v4.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
-      <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Insights">
-      <HintPath>..\packages\Xamarin.Insights.1.11.3\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
+    <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Xamarin.Insights, Version=1.12.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xamarin.Insights.1.12.2\lib\MonoAndroid10\Xamarin.Insights.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -70,18 +76,18 @@
     <Compile Include="Adapter\DetailListAdapter.cs" />
     <Compile Include="Adapter\MainListAdapter.cs" />
     <Compile Include="Activity\DetailActivity.cs" />
-    <Compile Include="ViewHolder\DetailViewHolder.cs" />
+    <Compile Include="Common\Helpers\StatusBarHelper.cs" />
+    <Compile Include="ViewHolder\ViewHolderBase.cs" />
     <Compile Include="View\ExRecyclerView.cs" />
     <Compile Include="Activity\MainActivity.cs" />
-    <Compile Include="ViewHolder\MainViewHolder.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="View\ScrollChildSwipeRefreshLayout.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
-    <None Include="packages.config" />
     <AndroidResource Include="Resources\layout\MainListLayout.axml">
       <SubType>AndroidResource</SubType>
     </AndroidResource>
@@ -105,7 +111,9 @@
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\values\theme.xml" />
+    <AndroidResource Include="Resources\values\theme.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\SplashScreen.png" />
@@ -118,9 +126,18 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values\styles.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\color.xml" />
+  </ItemGroup>
   <Import Project="..\AnimateRaw.Shared\AnimateRaw.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.3\build\MonoAndroid10\Xamarin.Insights.targets')" />
+  <Import Project="..\packages\Xamarin.Insights.1.12.2\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.2\build\MonoAndroid10\Xamarin.Insights.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Xamarin.Insights.1.12.2\build\MonoAndroid10\Xamarin.Insights.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Insights.1.12.2\build\MonoAndroid10\Xamarin.Insights.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
 		<Target Name="BeforeBuild">
diff --git a/AnimateRaw.Android/Common/Helpers/StatusBarHelper.cs b/AnimateRaw.Android/Common/Helpers/StatusBarHelper.cs
new file mode 100644
index 0000000..8ac289e
--- /dev/null
+++ b/AnimateRaw.Android/Common/Helpers/StatusBarHelper.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace AnimateRaw.Android.Common.Helpers
+{
+    internal static class StatusBarHelper
+    {
+        public static int GetStatusBarHeight(Context context)
+        {
+            int result = 0;
+            int resourceId = context.Resources.GetIdentifier("status_bar_height", "dimen", "android");
+            if (resourceId > 0)
+            {
+                result = context.Resources.GetDimensionPixelSize(resourceId);
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/AnimateRaw.Android/Properties/AndroidManifest.xml b/AnimateRaw.Android/Properties/AndroidManifest.xml
index 3c54f19..e8d0be5 100644
--- a/AnimateRaw.Android/Properties/AndroidManifest.xml
+++ b/AnimateRaw.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="AnimateRaw.Android" android:versionCode="1" android:versionName="1.2.2" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="moe.tlaster.animateRaw" android:versionCode="1" android:versionName="1.3.0" android:installLocation="auto">
 	<uses-sdk android:targetSdkVersion="23" android:minSdkVersion="15" />
 	<uses-permission android:name="android.permission.INTERNET" />
-	<application android:label="Animate Raw" android:theme="@style/MyTheme" android:icon="@drawable/Icon"></application>
+	<application android:label="Animate Raw" android:theme="@style/AppTheme" android:icon="@drawable/Icon"></application>
 </manifest>
\ No newline at end of file
diff --git a/AnimateRaw.Android/Resources/Resource.Designer.cs b/AnimateRaw.Android/Resources/Resource.Designer.cs
index 5e7324c..5ff190a 100644
--- a/AnimateRaw.Android/Resources/Resource.Designer.cs
+++ b/AnimateRaw.Android/Resources/Resource.Designer.cs
@@ -754,35 +754,35 @@ private Boolean()
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7f0b003a
-			public const int MediumVioletRed = 2131427386;
-			
-			// aapt resource value: 0x7f0b003b
-			public const int abc_background_cache_hint_selector_material_dark = 2131427387;
-			
-			// aapt resource value: 0x7f0b003c
-			public const int abc_background_cache_hint_selector_material_light = 2131427388;
-			
 			// aapt resource value: 0x7f0b003d
-			public const int abc_color_highlight_material = 2131427389;
-			
-			// aapt resource value: 0x7f0b0000
-			public const int abc_input_method_navigation_guard = 2131427328;
+			public const int MediumVioletRed = 2131427389;
 			
 			// aapt resource value: 0x7f0b003e
-			public const int abc_primary_text_disable_only_material_dark = 2131427390;
+			public const int abc_background_cache_hint_selector_material_dark = 2131427390;
 			
 			// aapt resource value: 0x7f0b003f
-			public const int abc_primary_text_disable_only_material_light = 2131427391;
+			public const int abc_background_cache_hint_selector_material_light = 2131427391;
 			
 			// aapt resource value: 0x7f0b0040
-			public const int abc_primary_text_material_dark = 2131427392;
+			public const int abc_color_highlight_material = 2131427392;
+			
+			// aapt resource value: 0x7f0b0000
+			public const int abc_input_method_navigation_guard = 2131427328;
 			
 			// aapt resource value: 0x7f0b0041
-			public const int abc_primary_text_material_light = 2131427393;
+			public const int abc_primary_text_disable_only_material_dark = 2131427393;
 			
 			// aapt resource value: 0x7f0b0042
-			public const int abc_search_url_text = 2131427394;
+			public const int abc_primary_text_disable_only_material_light = 2131427394;
+			
+			// aapt resource value: 0x7f0b0043
+			public const int abc_primary_text_material_dark = 2131427395;
+			
+			// aapt resource value: 0x7f0b0044
+			public const int abc_primary_text_material_light = 2131427396;
+			
+			// aapt resource value: 0x7f0b0045
+			public const int abc_search_url_text = 2131427397;
 			
 			// aapt resource value: 0x7f0b0001
 			public const int abc_search_url_text_normal = 2131427329;
@@ -793,11 +793,11 @@ public partial class Color
 			// aapt resource value: 0x7f0b0003
 			public const int abc_search_url_text_selected = 2131427331;
 			
-			// aapt resource value: 0x7f0b0043
-			public const int abc_secondary_text_material_dark = 2131427395;
+			// aapt resource value: 0x7f0b0046
+			public const int abc_secondary_text_material_dark = 2131427398;
 			
-			// aapt resource value: 0x7f0b0044
-			public const int abc_secondary_text_material_light = 2131427396;
+			// aapt resource value: 0x7f0b0047
+			public const int abc_secondary_text_material_light = 2131427399;
 			
 			// aapt resource value: 0x7f0b0004
 			public const int accent_material_dark = 2131427332;
@@ -841,6 +841,15 @@ public partial class Color
 			// aapt resource value: 0x7f0b0011
 			public const int button_material_light = 2131427345;
 			
+			// aapt resource value: 0x7f0b003c
+			public const int colorAccent = 2131427388;
+			
+			// aapt resource value: 0x7f0b003a
+			public const int colorPrimary = 2131427386;
+			
+			// aapt resource value: 0x7f0b003b
+			public const int colorPrimaryDark = 2131427387;
+			
 			// aapt resource value: 0x7f0b0012
 			public const int dim_foreground_disabled_material_dark = 2131427346;
 			
@@ -955,11 +964,11 @@ public partial class Color
 			// aapt resource value: 0x7f0b0037
 			public const int switch_thumb_disabled_material_light = 2131427383;
 			
-			// aapt resource value: 0x7f0b0045
-			public const int switch_thumb_material_dark = 2131427397;
+			// aapt resource value: 0x7f0b0048
+			public const int switch_thumb_material_dark = 2131427400;
 			
-			// aapt resource value: 0x7f0b0046
-			public const int switch_thumb_material_light = 2131427398;
+			// aapt resource value: 0x7f0b0049
+			public const int switch_thumb_material_light = 2131427401;
 			
 			// aapt resource value: 0x7f0b0038
 			public const int switch_thumb_normal_material_dark = 2131427384;
@@ -2043,6 +2052,18 @@ public partial class Style
 			// aapt resource value: 0x7f090080
 			public const int Animation_AppCompat_DropDownUp = 2131296384;
 			
+			// aapt resource value: 0x7f090133
+			public const int AppTheme = 2131296563;
+			
+			// aapt resource value: 0x7f090135
+			public const int AppTheme_AppBarOverlay = 2131296565;
+			
+			// aapt resource value: 0x7f090134
+			public const int AppTheme_NoActionBar = 2131296564;
+			
+			// aapt resource value: 0x7f090136
+			public const int AppTheme_PopupOverlay = 2131296566;
+			
 			// aapt resource value: 0x7f090081
 			public const int Base_AlertDialog_AppCompat = 2131296385;
 			
@@ -2463,9 +2484,6 @@ public partial class Style
 			// aapt resource value: 0x7f090073
 			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131296371;
 			
-			// aapt resource value: 0x7f090133
-			public const int MyTheme = 2131296563;
-			
 			// aapt resource value: 0x7f090010
 			public const int Platform_AppCompat = 2131296272;
 			
diff --git a/AnimateRaw.Android/Resources/layout/MainPage.axml b/AnimateRaw.Android/Resources/layout/MainPage.axml
index 7c49224..1dd5a2e 100644
--- a/AnimateRaw.Android/Resources/layout/MainPage.axml
+++ b/AnimateRaw.Android/Resources/layout/MainPage.axml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,10 +10,10 @@
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
+        android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/AppTheme.PopupOverlay" />
     <animateraw.android.ScrollChildSwipeRefreshLayout
         android:id="@+id/MainPageRefresher"
         android:layout_width="match_parent"
diff --git a/AnimateRaw.Android/Resources/values/color.xml b/AnimateRaw.Android/Resources/values/color.xml
new file mode 100644
index 0000000..3a5836c
--- /dev/null
+++ b/AnimateRaw.Android/Resources/values/color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="colorPrimary">#c71585</color>
+  <color name="colorPrimaryDark">#8B0E5D</color>
+  <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/AnimateRaw.Android/Resources/values/styles.xml b/AnimateRaw.Android/Resources/values/styles.xml
index ab996f1..b8df0f5 100644
--- a/AnimateRaw.Android/Resources/values/styles.xml
+++ b/AnimateRaw.Android/Resources/values/styles.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <resources>
-  <style name="MyTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <item name="colorPrimary">#c71585</item>
-    <item name="colorPrimaryDark">#c71585</item>
-    <item name="android:navigationBarColor">#c71585</item>
+  <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <!-- Customize your theme here. -->
+    <item name="colorPrimary">@color/colorPrimary</item>
+    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    <item name="colorAccent">@color/colorAccent</item>
+    <item name="android:windowTranslucentNavigation">true</item>
   </style>
+
+  <style name="AppTheme.NoActionBar">
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
+  </style>
+
+  <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+  <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file
diff --git a/AnimateRaw.Android/View/ExRecyclerView.cs b/AnimateRaw.Android/View/ExRecyclerView.cs
index a0f38db..7cc1ddf 100644
--- a/AnimateRaw.Android/View/ExRecyclerView.cs
+++ b/AnimateRaw.Android/View/ExRecyclerView.cs
@@ -14,9 +14,11 @@
 
 namespace AnimateRaw.Android
 {
+
     public class ExRecyclerView : RecyclerView
     {
-        public event EventHandler<OnScrollEventArgs> OnScroll;
+        public event EventHandler<ScrollEventArgs> Scroll;
+        public event EventHandler LoadMore;
         public Adapter ViewAdapter
         {
             get { return GetAdapter(); }
@@ -28,7 +30,7 @@ public LayoutManager ViewLayoutManager
             set { SetLayoutManager(value); }
         }
 
-        public ExRecyclerView(Context context):base(context)
+        public ExRecyclerView(Context context) : base(context)
         {
 
         }
@@ -47,12 +49,19 @@ protected ExRecyclerView(IntPtr javaReference, JniHandleOwnership transfer) : ba
         public override void OnScrolled(int dx, int dy)
         {
             base.OnScrolled(dx, dy);
-            OnScroll?.Invoke(this, new OnScrollEventArgs(dx, dy));
+            Scroll?.Invoke(this, new ScrollEventArgs(dx, dy));
+            if (dy <= 0)
+                return;
+            var visibleItemCount = ViewLayoutManager.ChildCount;
+            var totalItemCount = ViewLayoutManager.ItemCount;
+            var pastVisiblesItems = (ViewLayoutManager is LinearLayoutManager ? ViewLayoutManager as LinearLayoutManager : ViewLayoutManager is GridLayoutManager ? ViewLayoutManager as GridLayoutManager : null).FindFirstVisibleItemPosition();
+            if ((visibleItemCount + pastVisiblesItems) >= totalItemCount - 3)
+                LoadMore?.Invoke(this, new EventArgs());
         }
     }
-    public class OnScrollEventArgs : EventArgs
+    public class ScrollEventArgs : EventArgs
     {
-        public OnScrollEventArgs(int dx,int dy)
+        public ScrollEventArgs(int dx,int dy)
         {
             this.dx = dx;
             this.dy = dy;
diff --git a/AnimateRaw.Android/ViewHolder/DetailViewHolder.cs b/AnimateRaw.Android/ViewHolder/DetailViewHolder.cs
deleted file mode 100644
index 08197ba..0000000
--- a/AnimateRaw.Android/ViewHolder/DetailViewHolder.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using Android.Support.V7.Widget;
-
-namespace AnimateRaw.Android.ViewHolder
-{
-    public class DetailViewHolder : RecyclerView.ViewHolder
-    {
-        public TextView Name { get; private set; }
-        public TextView ClickCount { get; private set; }
-        public ImageView Image { get; private set; }
-
-
-        public DetailViewHolder(View itemView) : base (itemView)
-        {
-            Name = itemView.FindViewById<TextView>(Resource.Id.DetailListLayoutName);
-            ClickCount = itemView.FindViewById<TextView>(Resource.Id.DetailListLayoutClickCount);
-            Image = ItemView.FindViewById<ImageView>(Resource.Id.DetailListImage);
-        }
-    }
-}
\ No newline at end of file
diff --git a/AnimateRaw.Android/ViewHolder/MainViewHolder.cs b/AnimateRaw.Android/ViewHolder/MainViewHolder.cs
deleted file mode 100644
index 769bd0f..0000000
--- a/AnimateRaw.Android/ViewHolder/MainViewHolder.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using Android.Support.V7.Widget;
-
-namespace AnimateRaw.Android
-{
-    public class MainViewHolder: RecyclerView.ViewHolder
-    {
-        public TextView Name { get; private set; }
-        public TextView UpdateTime { get; private set; }
-
-
-        public MainViewHolder(View itemView) : base (itemView)
-        {
-            Name = itemView.FindViewById<TextView>(Resource.Id.MainListLayoutName);
-            UpdateTime = itemView.FindViewById<TextView>(Resource.Id.MainListLayoutUpdateTime);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/AnimateRaw.Android/ViewHolder/ViewHolderBase.cs b/AnimateRaw.Android/ViewHolder/ViewHolderBase.cs
new file mode 100644
index 0000000..635321f
--- /dev/null
+++ b/AnimateRaw.Android/ViewHolder/ViewHolderBase.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Graphics;
+using Android.OS;
+using Android.Runtime;
+using Android.Support.V7.Widget;
+using Android.Views;
+using Android.Widget;
+
+namespace AnimateRaw.Android.ViewHolder
+{
+    internal class ViewHolderBase : RecyclerView.ViewHolder
+    {
+        internal Dictionary<int, View> Views { get; } = new Dictionary<int, View>();
+        internal ViewHolderBase(View itemView, params int[] ids) : base(itemView)
+        {
+            foreach (var id in ids)
+            {
+                Views.Add(id, itemView.FindViewById(id));
+            }
+        }
+        internal ViewHolderBase SetText(int id, string text)
+        {
+            (Views[id] as TextView).Text = text;
+            return this;
+        }
+        internal ViewHolderBase SetBackgroundResource(int id, int res)
+        {
+            Views[id].SetBackgroundResource(res);
+            return this;
+        }
+        internal ViewHolderBase SetBackgroundColor(int id, Color color)
+        {
+            Views[id].SetBackgroundColor(color);
+            return this;
+        }
+        internal ViewHolderBase SetImageBitmap(int id, Bitmap bm)
+        {
+            (Views[id] as ImageView).SetImageBitmap(bm);
+            return this;
+        }
+        internal ViewHolderBase SetTextFormatted(int id, Java.Lang.ICharSequence text)
+        {
+            (Views[id] as TextView).TextFormatted = text;
+            return this;
+        }
+
+        internal ViewHolderBase SetImageResource(int id, int res)
+        {
+            (Views[id] as ImageView).SetImageResource(res);
+            return this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/AnimateRaw.Android/packages.config b/AnimateRaw.Android/packages.config
index 8c9ce44..1134cf9 100644
--- a/AnimateRaw.Android/packages.config
+++ b/AnimateRaw.Android/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="MonoAndroid60" />
-  <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="monoandroid60" />
-  <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0" targetFramework="monoandroid60" />
-  <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.1.1.0" targetFramework="MonoAndroid60" />
-  <package id="Xamarin.Insights" version="1.11.3" targetFramework="MonoAndroid60" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="monoandroid60" />
+  <package id="Xamarin.Android.Support.v4" version="23.1.1.1" targetFramework="monoandroid60" />
+  <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.1" targetFramework="monoandroid60" />
+  <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.1.1.1" targetFramework="monoandroid60" />
+  <package id="Xamarin.Insights" version="1.12.2" targetFramework="monoandroid60" />
 </packages>
\ No newline at end of file
diff --git a/AnimateRaw.Shared/AnimateRaw.Shared.projitems b/AnimateRaw.Shared/AnimateRaw.Shared.projitems
index d5fbaaf..448b45a 100644
--- a/AnimateRaw.Shared/AnimateRaw.Shared.projitems
+++ b/AnimateRaw.Shared/AnimateRaw.Shared.projitems
@@ -9,7 +9,9 @@
     <Import_RootNamespace>AnimateRaw.Shared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)LanguageHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\AnimateListModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Model\AnimateSetModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)XamarinInsights.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/AnimateRaw.Shared/LanguageHelper.cs b/AnimateRaw.Shared/LanguageHelper.cs
new file mode 100644
index 0000000..112a0cd
--- /dev/null
+++ b/AnimateRaw.Shared/LanguageHelper.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+#if WINDOWS_UWP
+using Windows.Globalization;
+using Windows.System.UserProfile;
+#else
+using Java.Util;
+#endif
+
+namespace AnimateRaw.Shared
+{
+    internal static class LanguageHelper
+    {
+        public static string PrefLang
+        {
+            get
+            {
+#if WINDOWS_UWP
+                var lang = GlobalizationPreferences.Languages[0];
+
+#else
+                var lang = Locale.Default.Language.ToLower();
+#endif
+                if (lang.Contains("en"))
+                {
+                    lang = "en";
+                }
+                else if (lang.Contains("zh"))
+                {
+                    lang = "zh";
+                }
+                else if (lang.Contains("ru"))
+                {
+                    lang = "ru";
+                }
+                else
+                {
+                    lang = "jp";
+                }
+                return lang;
+            }
+        }
+    }
+}
diff --git a/AnimateRaw/AnimateRaw.csproj b/AnimateRaw/AnimateRaw.csproj
index ec6f45a..86125c4 100644
--- a/AnimateRaw/AnimateRaw.csproj
+++ b/AnimateRaw/AnimateRaw.csproj
@@ -18,7 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>AnimateRaw_StoreKey.pfx</PackageCertificateKeyFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <PackageCertificateThumbprint>09612FFCEF70CD64D43F1B9BBF204EC008D7BF30</PackageCertificateThumbprint>
   </PropertyGroup>
@@ -95,8 +95,6 @@
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <None Include="AnimateRaw_StoreKey.pfx" />
     <None Include="project.json" />
-    <PRIResource Include="Strings\zh-CN\Resources.resw" />
-    <PRIResource Include="Strings\en-US\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Common\AnimateListIncrementalLoadingClass.cs" />
@@ -162,6 +160,11 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="WindowsMobile, Version=10.0.10240.0">
+      <Name>Windows Mobile Extensions for the UWP</Name>
+    </SDKReference>
+  </ItemGroup>
   <Import Project="..\AnimateRaw.Shared\AnimateRaw.Shared.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
diff --git a/AnimateRaw/App.xaml.cs b/AnimateRaw/App.xaml.cs
index e8d7cfa..0a07832 100644
--- a/AnimateRaw/App.xaml.cs
+++ b/AnimateRaw/App.xaml.cs
@@ -7,6 +7,7 @@
 using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.UI;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -46,8 +47,28 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             {
                 this.DebugSettings.EnableFrameRateCounter = true;
             }
+#else
+            Xamarin.Insights.HasPendingCrashReport += (sender, isStartupCrash) =>
+            {
+                if (isStartupCrash)
+                {
+                    Xamarin.Insights.PurgePendingCrashReports().Wait();
+                }
+            };
+            Xamarin.Insights.Initialize(XamarinInsights.ApiKey);
 #endif
 
+            if (Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.UI.ViewManagement.StatusBar"))
+            {
+                Windows.UI.ViewManagement.StatusBar.GetForCurrentView().BackgroundColor = Color.FromArgb(255, 139, 14, 93);
+                Windows.UI.ViewManagement.StatusBar.GetForCurrentView().BackgroundOpacity = 1d;
+                Windows.UI.ViewManagement.StatusBar.GetForCurrentView().ForegroundColor = Colors.White;
+            }
+            else
+            {
+                Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar.BackgroundColor = Color.FromArgb(255, 139, 14, 93);
+                Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar.ButtonBackgroundColor = Color.FromArgb(255, 139, 14, 93);
+            }
             Frame rootFrame = Window.Current.Content as Frame;
 
             // 不要在窗口已包含内容时重复应用程序初始化，
@@ -69,12 +90,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             }
             rootFrame.Navigated += RootFrame_Navigated;
             Windows.ApplicationModel.Core.CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = false;
-            //SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = AppViewBackButtonVisibility.Visible;
             SystemNavigationManager.GetForCurrentView().BackRequested += App_BackRequested;
-            //Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
-            //Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar.ButtonBackgroundColor = Colors.Transparent;
-            //Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar.BackgroundColor = Colors.Transparent;
-            //Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar.ButtonForegroundColor = Colors.White;
 
             if (rootFrame.Content == null)
             {
diff --git a/AnimateRaw/Common/AnimateListIncrementalLoadingClass.cs b/AnimateRaw/Common/AnimateListIncrementalLoadingClass.cs
index a6e4618..62f5dad 100644
--- a/AnimateRaw/Common/AnimateListIncrementalLoadingClass.cs
+++ b/AnimateRaw/Common/AnimateListIncrementalLoadingClass.cs
@@ -8,6 +8,7 @@
 using System.Net.Http;
 using Windows.Data.Json;
 using AnimateRaw.Extension;
+using AnimateRaw.Shared;
 
 namespace AnimateRaw.Common
 {
@@ -22,7 +23,7 @@ protected override async Task<IList<object>> LoadMoreItemsOverrideAsync(Cancella
         {
             using (var client = new HttpClient())
             {
-                var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/list?page={_page++}");
+                var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/list?page={_page++}&prefLang={LanguageHelper.PrefLang}");
                 var obj = JsonObject.Parse(jsstr);
                 _hasMore = obj.GetNamedBoolean("HasMore");
                 if (obj.GetNamedBoolean("Success"))
diff --git a/AnimateRaw/Package.StoreAssociation.xml b/AnimateRaw/Package.StoreAssociation.xml
index 7aec220..e8630e8 100644
--- a/AnimateRaw/Package.StoreAssociation.xml
+++ b/AnimateRaw/Package.StoreAssociation.xml
@@ -360,7 +360,7 @@
   <ProductReservedInfo>
     <MainPackageIdentityName>51945Tlaster.AnimateRawBETA</MainPackageIdentityName>
     <ReservedNames>
-      <ReservedName>Animate Raw(BETA)</ReservedName>
+      <ReservedName>Animate Raw</ReservedName>
     </ReservedNames>
   </ProductReservedInfo>
   <AccountPackageIdentityNames>
diff --git a/AnimateRaw/Package.appxmanifest b/AnimateRaw/Package.appxmanifest
index 4589964..2f8647d 100644
--- a/AnimateRaw/Package.appxmanifest
+++ b/AnimateRaw/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="51945Tlaster.AnimateRawBETA" Publisher="CN=F82B0EE7-EF8D-4515-BEAB-DD968D07D67F" Version="1.2.2.0" />
+  <Identity Name="51945Tlaster.AnimateRawBETA" Publisher="CN=F82B0EE7-EF8D-4515-BEAB-DD968D07D67F" Version="1.3.0.0" />
   <mp:PhoneIdentity PhoneProductId="fb76821d-bc17-48ca-b46f-cf06b49da610" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Animate Raw</DisplayName>
@@ -12,6 +12,19 @@
   </Dependencies>
   <Resources>
     <Resource Language="x-generate" />
+    <Resource Language="zh-Hant" />
+    <Resource Language="zh-hk" />
+    <Resource Language="zh-mo" />
+    <Resource Language="zh-tw" />
+    <Resource Language="zh-hant-hk" />
+    <Resource Language="zh-hant-mo" />
+    <Resource Language="zh-hant-tw" />
+    <Resource Language="en" />
+    <Resource Language="en-us" />
+    <Resource Language="ja" />
+    <Resource Language="ja-jp" />
+    <Resource Language="ru" />
+    <Resource Language="ru-ru" />
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="AnimateRaw.App">
diff --git a/AnimateRaw/Strings/en-US/Resources.resw b/AnimateRaw/Strings/en-US/Resources.resw
deleted file mode 100644
index 89f891f..0000000
--- a/AnimateRaw/Strings/en-US/Resources.resw
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="FavorPovitItem.Header" xml:space="preserve">
-    <value>Favor</value>
-  </data>
-  <data name="RawPovitItem.Header" xml:space="preserve">
-    <value>Raws</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/AnimateRaw/Strings/zh-CN/Resources.resw b/AnimateRaw/Strings/zh-CN/Resources.resw
deleted file mode 100644
index d05bbe8..0000000
--- a/AnimateRaw/Strings/zh-CN/Resources.resw
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="FavorPovitItem.Header" xml:space="preserve">
-    <value>收藏</value>
-  </data>
-  <data name="RawPovitItem.Header" xml:space="preserve">
-    <value>列表</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/AnimateRaw/View/MainPage.xaml b/AnimateRaw/View/MainPage.xaml
index 1854580..0280b67 100644
--- a/AnimateRaw/View/MainPage.xaml
+++ b/AnimateRaw/View/MainPage.xaml
@@ -11,207 +11,6 @@
     xmlns:ptr="using:PullToRefresh.UWP">
     <Page.Resources>
         <converter:TimeSpanToShortTimeConverter x:Key="TimeSpanToShortTimeConverter"/>
-        <Style x:Key="PivotStyle1" TargetType="Pivot">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Pivot">
-                        <Grid x:Name="RootElement" Background="{TemplateBinding Background}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                            <Grid.Resources>
-                                <Style x:Key="BaseContentControlStyle" TargetType="ContentControl">
-                                    <Setter Property="FontFamily" Value="XamlAutoFontFamily"/>
-                                    <Setter Property="FontWeight" Value="SemiBold"/>
-                                    <Setter Property="FontSize" Value="15"/>
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="ContentControl">
-                                                <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" OpticalMarginAlignment="TrimSideBearings" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                                <Style x:Key="TitleContentControlStyle" BasedOn="{StaticResource BaseContentControlStyle}" TargetType="ContentControl">
-                                    <Setter Property="FontFamily" Value="{ThemeResource PivotTitleFontFamily}"/>
-                                    <Setter Property="FontWeight" Value="{ThemeResource PivotTitleThemeFontWeight}"/>
-                                    <Setter Property="FontSize" Value="{ThemeResource PivotTitleFontSize}"/>
-                                </Style>
-                            </Grid.Resources>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="Orientation">
-                                    <VisualState x:Name="Portrait">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Margin" Storyboard.TargetName="TitleContentControl">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPortraitThemePadding}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Landscape">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Margin" Storyboard.TargetName="TitleContentControl">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotLandscapeThemePadding}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="NavigationButtonsVisibility">
-                                    <VisualState x:Name="NavigationButtonsHidden"/>
-                                    <VisualState x:Name="NavigationButtonsVisible">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NextButton">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsEnabled" Storyboard.TargetName="NextButton">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PreviousButton">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsEnabled" Storyboard.TargetName="PreviousButton">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="HeaderStates">
-                                    <VisualState x:Name="HeaderDynamic"/>
-                                    <VisualState x:Name="HeaderStatic">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="Header">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="StaticHeader">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <ContentControl x:Name="TitleContentControl" ContentTemplate="{TemplateBinding TitleTemplate}" Content="{TemplateBinding Title}" IsTabStop="False" Margin="{StaticResource PivotPortraitThemePadding}" Style="{StaticResource TitleContentControlStyle}" Visibility="Collapsed"/>
-                            <Grid Grid.Row="1">
-                                <Grid.Resources>
-                                    <ControlTemplate x:Key="NextTemplate" TargetType="Button">
-                                        <Border x:Name="Root" BorderBrush="{ThemeResource SystemControlForegroundTransparentBrush}" BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}" Background="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}">
-                                            <VisualStateManager.VisualStateGroups>
-                                                <VisualStateGroup x:Name="CommonStates">
-                                                    <VisualState x:Name="Normal"/>
-                                                    <VisualState x:Name="PointerOver">
-                                                        <Storyboard>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="Root">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseMediumBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="Arrow">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltAltMediumHighBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                        </Storyboard>
-                                                    </VisualState>
-                                                    <VisualState x:Name="Pressed">
-                                                        <Storyboard>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="Root">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseMediumHighBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="Arrow">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltAltMediumHighBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                        </Storyboard>
-                                                    </VisualState>
-                                                </VisualStateGroup>
-                                            </VisualStateManager.VisualStateGroups>
-                                            <FontIcon x:Name="Arrow" Foreground="{ThemeResource SystemControlForegroundAltMediumHighBrush}" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE0E3;" HorizontalAlignment="Center" MirroredWhenRightToLeft="True" UseLayoutRounding="False" VerticalAlignment="Center"/>
-                                        </Border>
-                                    </ControlTemplate>
-                                    <ControlTemplate x:Key="PreviousTemplate" TargetType="Button">
-                                        <Border x:Name="Root" BorderBrush="{ThemeResource SystemControlForegroundTransparentBrush}" BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}" Background="{ThemeResource SystemControlBackgroundBaseMediumLowBrush}">
-                                            <VisualStateManager.VisualStateGroups>
-                                                <VisualStateGroup x:Name="CommonStates">
-                                                    <VisualState x:Name="Normal"/>
-                                                    <VisualState x:Name="PointerOver">
-                                                        <Storyboard>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="Root">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseMediumBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="Arrow">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltAltMediumHighBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                        </Storyboard>
-                                                    </VisualState>
-                                                    <VisualState x:Name="Pressed">
-                                                        <Storyboard>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="Root">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightBaseMediumHighBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="Arrow">
-                                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlHighlightAltAltMediumHighBrush}"/>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                        </Storyboard>
-                                                    </VisualState>
-                                                </VisualStateGroup>
-                                            </VisualStateManager.VisualStateGroups>
-                                            <FontIcon x:Name="Arrow" Foreground="{ThemeResource SystemControlForegroundAltMediumHighBrush}" FontSize="12" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE0E2;" HorizontalAlignment="Center" MirroredWhenRightToLeft="True" UseLayoutRounding="False" VerticalAlignment="Center"/>
-                                        </Border>
-                                    </ControlTemplate>
-                                </Grid.Resources>
-                                <ScrollViewer x:Name="ScrollViewer" BringIntoViewOnFocusChange="False" HorizontalSnapPointsAlignment="Center" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollBarVisibility="Hidden" Margin="{TemplateBinding Padding}" Template="{StaticResource ScrollViewerScrollBarlessTemplate}" VerticalSnapPointsType="None" VerticalScrollBarVisibility="Disabled" VerticalScrollMode="Disabled" VerticalContentAlignment="Stretch" ZoomMode="Disabled">
-                                    <PivotPanel x:Name="Panel" VerticalAlignment="Stretch">
-                                        <Grid x:Name="PivotLayoutElement">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                            </Grid.ColumnDefinitions>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto"/>
-                                                <RowDefinition Height="*"/>
-                                            </Grid.RowDefinitions>
-                                            <Grid.RenderTransform>
-                                                <CompositeTransform x:Name="PivotLayoutElementTranslateTransform"/>
-                                            </Grid.RenderTransform>
-                                            <ContentPresenter x:Name="LeftHeaderPresenter" ContentTemplate="{TemplateBinding LeftHeaderTemplate}" Content="{TemplateBinding LeftHeader}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-                                            <ContentControl x:Name="HeaderClipper" Grid.Column="1" HorizontalContentAlignment="Stretch" UseSystemFocusVisuals="True">
-                                                <ContentControl.Clip>
-                                                    <RectangleGeometry x:Name="HeaderClipperGeometry"/>
-                                                </ContentControl.Clip>
-                                                <Grid Background="MediumVioletRed" RequestedTheme="Dark">
-                                                    <PivotHeaderPanel x:Name="StaticHeader" Visibility="Collapsed"/>
-                                                    <PivotHeaderPanel x:Name="Header">
-                                                        <PivotHeaderPanel.RenderTransform>
-                                                            <TransformGroup>
-                                                                <CompositeTransform x:Name="HeaderTranslateTransform"/>
-                                                                <CompositeTransform x:Name="HeaderOffsetTranslateTransform"/>
-                                                            </TransformGroup>
-                                                        </PivotHeaderPanel.RenderTransform>
-                                                    </PivotHeaderPanel>
-                                                    <Button Click="Button_Click" Style="{ThemeResource DateTimePickerFlyoutButtonStyle}" HorizontalAlignment="Right" VerticalAlignment="Center">
-                                                        <SymbolIcon Symbol="Refresh"/>
-                                                    </Button>
-                                                </Grid>
-                                            </ContentControl>
-                                            <Button x:Name="PreviousButton" Background="Transparent" Grid.Column="1" HorizontalAlignment="Left" Height="36" IsTabStop="False" IsEnabled="False" Margin="{ThemeResource PivotNavButtonMargin}" Opacity="0" Template="{StaticResource PreviousTemplate}" UseSystemFocusVisuals="False" VerticalAlignment="Top" Width="20"/>
-                                            <Button x:Name="NextButton" Background="Transparent" Grid.Column="1" HorizontalAlignment="Right" Height="36" IsTabStop="False" IsEnabled="False" Margin="{ThemeResource PivotNavButtonMargin}" Opacity="0" Template="{StaticResource NextTemplate}" UseSystemFocusVisuals="False" VerticalAlignment="Top" Width="20"/>
-                                            <ContentPresenter x:Name="RightHeaderPresenter" ContentTemplate="{TemplateBinding RightHeaderTemplate}" Content="{TemplateBinding RightHeader}" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-                                            <ItemsPresenter x:Name="PivotItemPresenter" Grid.ColumnSpan="3" Grid.Row="1">
-                                                <ItemsPresenter.RenderTransform>
-                                                    <TransformGroup>
-                                                        <TranslateTransform x:Name="ItemsPresenterTranslateTransform"/>
-                                                        <CompositeTransform x:Name="ItemsPresenterCompositeTransform"/>
-                                                    </TransformGroup>
-                                                </ItemsPresenter.RenderTransform>
-                                            </ItemsPresenter>
-                                        </Grid>
-                                    </PivotPanel>
-                                </ScrollViewer>
-                            </Grid>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="PivotItemStyle1" TargetType="PivotItem">
-            <Setter Property="Margin" Value="0"/>
-        </Style>
-
         <MenuFlyout x:Key="TitleMenu">
             <MenuFlyoutItem Text="About" Click="MenuFlyoutItem_Click"/>
         </MenuFlyout>
@@ -223,17 +22,17 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Border Background="MediumVioletRed">
-            <Grid>
+            <Grid RequestedTheme="Dark">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="auto"/>
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Foreground="White" Padding="16">Animate Raw</TextBlock>
-                <Button Click="Button_Click" Grid.Column="1" Style="{ThemeResource DateTimePickerFlyoutButtonStyle}" Foreground="White">
+                <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Padding="16">Animate Raw</TextBlock>
+                <Button Click="Button_Click" Grid.Column="1" Style="{ThemeResource DateTimePickerFlyoutButtonStyle}">
                     <SymbolIcon Symbol="Refresh"/>
                 </Button>
-                <Button Click="Button_Click_1" Grid.Column="2" Style="{ThemeResource DateTimePickerFlyoutButtonStyle}" Foreground="White">
+                <Button Click="Button_Click_1" Grid.Column="2" Style="{ThemeResource DateTimePickerFlyoutButtonStyle}">
                     <SymbolIcon Symbol="More" RenderTransformOrigin="0.5,0.5">
                         <SymbolIcon.RenderTransform>
                             <CompositeTransform Rotation="90"/>
diff --git a/AnimateRaw/ViewModel/AnimateDetailViewModel.cs b/AnimateRaw/ViewModel/AnimateDetailViewModel.cs
index b88acce..dfe658f 100644
--- a/AnimateRaw/ViewModel/AnimateDetailViewModel.cs
+++ b/AnimateRaw/ViewModel/AnimateDetailViewModel.cs
@@ -8,6 +8,7 @@
 using System.Net.Http;
 using Windows.Data.Json;
 using Windows.UI.Popups;
+using AnimateRaw.Shared;
 
 namespace AnimateRaw.ViewModel
 {
@@ -35,7 +36,7 @@ private async void Init()
             {
                 using (var client = new HttpClient())
                 {
-                    var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}");
+                    var jsstr = await client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}&prefLang={LanguageHelper.PrefLang}");
                     var obj = JsonObject.Parse(jsstr);
                     SetList = (from item in obj.GetNamedArray("SetList")
                                select new AnimateSetModel
@@ -59,7 +60,7 @@ private async void Init()
         internal async void Click(string fileName)
         {
             using (var client = new HttpClient())
-                await client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}&filename={fileName}");
+                await client.GetStringAsync($"http://oneechan.moe/api/detail?id={_id}&filename={fileName}&prefLang={LanguageHelper.PrefLang}");
         }
     }
 }
diff --git a/AnimateRaw/_pkginfo.txt b/AnimateRaw/_pkginfo.txt
index 35c6775..5f64cdb 100644
--- a/AnimateRaw/_pkginfo.txt
+++ b/AnimateRaw/_pkginfo.txt
@@ -1 +1 @@
-C:\Users\Jades\Documents\Visual Studio 2015\Projects\AnimateRaw\AnimateRaw\AppPackages\AnimateRaw_1.1.0.0\AnimateRaw_1.1.0.0_x86_x64_arm.appxbundle
+C:\Users\Tlaster\Documents\Visual Studio 2015\Projects\AnimateRaw\AnimateRaw\AppPackages\AnimateRaw_1.3.0.0\AnimateRaw_1.3.0.0_x86_x64_arm.appxbundle