diff --git a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
index ab90e5468..43cfa0520 100644
--- a/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
+++ b/source/Grabacr07.KanColleViewer/KanColleViewer.csproj
@@ -37,6 +37,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -85,8 +86,8 @@
       <HintPath>..\packages\Nekoxy.1.5.2.20\lib\net45\Nekoxy.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
+    <Reference Include="StatefulModel">
+      <HintPath>..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -619,6 +620,21 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="readme.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\LICENSE.txt">
+      <Visible>False</Visible>
+      <Link>license.txt</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\licenses\*.*">
+      <Visible>False</Visible>
+      <Link>Licenses\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <ItemGroup>
     <COMReference Include="MSHTML">
       <Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
@@ -639,22 +655,6 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="readme.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\LICENSE.txt">
-      <Visible>False</Visible>
-      <Link>license.txt</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\licenses\*.*">
-      <Visible>False</Visible>
-      <Link>Licenses\%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
index c941db5c2..136ddf370 100644
--- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -21,4 +21,4 @@
 	ResourceDictionaryLocation.None,
 	ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("4.2.5.0")]
+[assembly: AssemblyVersion("4.2.7.0")]
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
index 44af004cb..e37e4ab13 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/ShipCatalogSortWorker.cs
@@ -29,7 +29,8 @@ public class ShipCatalogSortWorker : ViewModel
 		public static readonly SortableColumn LuckColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_Luck, KeySelector = x => x.Luck.Current, DefaultIsDescending = true, };
 		public static readonly SortableColumn HPColumn = new SortableColumn { Name = Resources.ShipCatalog_SortBy_MaxHP, KeySelector = x => x.HP.Maximum, DefaultIsDescending = true, };
 		public static readonly SortableColumn ViewRangeColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_ViewRange, KeySelector = x => x.ViewRange, DefaultIsDescending = true, };
-		public static readonly SortableColumn TimeToRepairColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_TTR, KeySelector = x => x.TimeToRepair.Ticks, DefaultIsDescending = true, };
+        public static readonly SortableColumn ASWColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_ASW, KeySelector = x => x.ASW, DefaultIsDescending = true, };
+        public static readonly SortableColumn TimeToRepairColumn = new SortableColumn { Name = Resources.ShipCatalog_Column_TTR, KeySelector = x => x.TimeToRepair.Ticks, DefaultIsDescending = true, };
 
 		public static SortableColumn[] Columns { get; set; }
 
@@ -51,6 +52,7 @@ static ShipCatalogSortWorker()
 				LuckColumn,
 				HPColumn,
 				ViewRangeColumn,
+				ASWColumn,
 				TimeToRepairColumn,
 			};
 		}
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
index e680a43ec..b3bf076cc 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCatalogViewModel.cs
@@ -94,7 +94,7 @@ private static List<SlotItemCounter> UpdateCore()
 			{
 				foreach (var target in ship.EquippedItems.Select(slot => new { slot, counter = dic[slot.Item.Info.Id] }))
 				{
-					target.counter.AddShip(ship, target.slot.Item.Level, target.slot.Item.Adept);
+					target.counter.AddShip(ship, target.slot.Item.Level, target.slot.Item.Proficiency);
 				}
 			}
 
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
index 1089132ec..332e9e0a0 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Catalogs/SlotItemCounter.cs
@@ -45,7 +45,7 @@ public SlotItemCounter(SlotItemInfo target, IEnumerable<SlotItem> items)
 			this.Target = target;
 
 			this.itemsByLevel = items
-				.GroupBy(x => new SlotItemCounterKey(x.Level, x.Adept))
+				.GroupBy(x => new SlotItemCounterKey(x.Level, x.Proficiency))
 				.ToDictionary(
 					x => x.Key,
 					x => new SlotItemCounterByLevel { CounterKey = x.Key, Count = x.Count(), }
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
index 0594acab9..85e81fe88 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Contents/Fleets/FleetStateViewModel.cs
@@ -17,13 +17,11 @@ public class FleetStateViewModel : ViewModel
 
 		public string TotalLevel => this.Source.TotalLevel.ToString("###0");
 
-		public string AirSuperiorityPotential => this.Source.AirSuperiorityPotential.ToString("##0");
-
 		public string MinAirSuperiorityPotential => this.Source.MinAirSuperiorityPotential.ToString("##0");
 
 		public string MaxAirSuperiorityPotential => this.Source.MaxAirSuperiorityPotential.ToString("##0");
 
-		public string ViewRange => this.Source.ViewRange.ToString("##0.##");
+		public string ViewRange => (Math.Floor(this.Source.ViewRange * 100) / 100).ToString("##0.##");
 
 		public string Speed
 		{
diff --git a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
index fa9e473a8..16ebfd761 100644
--- a/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Catalogs/ShipCatalogWindow.xaml
@@ -837,6 +837,23 @@
 								</GridViewColumn.CellTemplate>
 							</GridViewColumn>
 
+							<GridViewColumn Width="45">
+								<GridViewColumn.Header>
+									<metro2:SortButton MethodName="Sort"
+													   MethodParameter="{x:Static viewModels:ShipCatalogSortWorker.ASWColumn}">
+										<TextBlock Text="対潜"
+												   ToolTip="装備によるステータス上昇を含んだ値です" />
+									</metro2:SortButton>
+								</GridViewColumn.Header>
+								<GridViewColumn.CellTemplate>
+									<DataTemplate>
+										<TextBlock Text="{Binding Ship.ASW, Mode=OneWay}"
+												   Foreground="{DynamicResource ActiveForegroundBrushKey}"
+												   Margin="0,3" />
+									</DataTemplate>
+								</GridViewColumn.CellTemplate>
+							</GridViewColumn>
+
 							<GridViewColumn Width="{Binding ShipSallyAreaFilter.ColumnWidth}">
 								<GridViewColumn.Header>
 									<TextBlock Text="{Binding Resources.ShipCatalog_SortieWaters, Source={x:Static models:ResourceService.Current}, Mode=OneWay}" />
diff --git a/source/Grabacr07.KanColleViewer/packages.config b/source/Grabacr07.KanColleViewer/packages.config
index 8a366094e..437a66756 100644
--- a/source/Grabacr07.KanColleViewer/packages.config
+++ b/source/Grabacr07.KanColleViewer/packages.config
@@ -11,5 +11,5 @@
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="Rx-WPF" version="2.2.5" targetFramework="net45" />
   <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
-  <package id="StatefulModel" version="0.5.0" targetFramework="net46" />
+  <package id="StatefulModel" version="0.6.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/readme.txt b/source/Grabacr07.KanColleViewer/readme.txt
index f54ef0bdf..17d423892 100644
--- a/source/Grabacr07.KanColleViewer/readme.txt
+++ b/source/Grabacr07.KanColleViewer/readme.txt
@@ -1,6 +1,6 @@
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 提督業も忙しい！ (KanColleViewer)
-                                             version 4.2.1  2016/02/12
+                                             version 4.2.6  2016/06/20
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 
@@ -167,6 +167,8 @@ Desktop Toast
 
 ■更新履歴
 
+2016/06/20 - version 4.2.6 リリース
+ (わすれました)
 2016/02/12 - version 4.2.1 リリース
 2016/02/08 - version 4.2 リリース
 2015/11/10 - version 4.1.6 リリース
diff --git a/source/Grabacr07.KanColleWrapper/Calculator.cs b/source/Grabacr07.KanColleWrapper/Calculator.cs
index 8abb31095..6a8bee0f1 100644
--- a/source/Grabacr07.KanColleWrapper/Calculator.cs
+++ b/source/Grabacr07.KanColleWrapper/Calculator.cs
@@ -8,146 +8,6 @@ namespace Grabacr07.KanColleWrapper
 {
 	internal static class Calculator
 	{
-		#region 制空値計算
-
-		/// <summary>
-		/// 装備と搭載数を指定して、スロット単位の制空能力を計算します。
-		/// </summary>
-		/// <param name="slotItem">対空能力を持つ装備。</param>
-		/// <param name="onslot">搭載数。</param>
-		/// <returns></returns>
-		public static int CalcAirSuperiorityPotential(this SlotItem slotItem, int onslot)
-		{
-			if (slotItem.Info.IsAirSuperiorityFighter)
-			{
-				return (int)(slotItem.Info.AA * Math.Sqrt(onslot));
-			}
-
-			return 0;
-		}
-		/// <summary>
-		/// 指定した艦の制空能力を計算します。
-		/// </summary>
-		public static int CalcAirSuperiorityPotential(this Ship ship)
-		{
-			return ship.EquippedItems
-				.Select(x => x.Item.CalcAirSuperiorityPotential(x.Current))
-				.Sum();
-		}
-
-		/// <summary>
-		/// 指定した艦の制空能力の最小値を計算します。
-		/// </summary>
-		public static int CalcMinAirSuperiorityPotential(this Ship ship)
-		{
-			return ship.EquippedItems
-				.Select(x => (x.Item.Info.Type == SlotItemType.艦上戦闘機
-							|| x.Item.Info.Type == SlotItemType.水上戦闘機
-								? x.Item.CalcAirSuperiorityPotential(x.Current)
-								: 0)
-							 + x.Item.CalcMinAirecraftAdeptBonus(x.Current))
-				.Select(x => (int)x)
-				.Sum();
-		}
-
-		/// <summary>
-		/// 指定した艦の制空能力の最大値を計算します。
-		/// </summary>
-		public static int CalcMaxAirSuperiorityPotential(this Ship ship)
-		{
-			return ship.EquippedItems
-				.Select(x => x.Item.CalcAirSuperiorityPotential(x.Current)
-							+ x.Item.CalcMaxAirecraftAdeptBonus(x.Current))
-				.Select(x => (int)x)
-				.Sum();
-		}
-
-		/// <summary>
-		/// 熟練度による制空能力ボーナス最小値を計算します。
-		/// </summary>
-		/// <param name="slotItem">対空能力を持つ装備。</param>
-		/// <param name="onslot">搭載数。</param>
-		/// <returns></returns>
-		private static double CalcMinAirecraftAdeptBonus(this SlotItem slotItem, int onslot)
-		{
-			if(onslot < 1) return 0;
-			return slotItem.Info.Type == SlotItemType.艦上戦闘機
-				|| slotItem.Info.Type == SlotItemType.水上戦闘機
-				? slotItem.CalcAirecraftAdeptBonusOfType() + slotItem.CalcMinInternalAirecraftAdeptBonus()
-				: 0; // 艦戦・水戦以外は簡単に吹き飛ぶので最小値としては計算に入れない
-		}
-
-		/// <summary>
-		/// 熟練度による制空能力ボーナス最大値を計算します。
-		/// </summary>
-		/// <param name="slotItem">対空能力を持つ装備。</param>
-		/// <param name="onslot">搭載数。</param>
-		/// <returns></returns>
-		private static double CalcMaxAirecraftAdeptBonus(this SlotItem slotItem, int onslot)
-			=> onslot < 1 ? 0
-			: slotItem.CalcAirecraftAdeptBonusOfType() + slotItem.CalcMaxInternalAirecraftAdeptBonus();
-
-		/// <summary>
-		/// 各表記熟練度に対応した機種別熟練度ボーナスを計算します。
-		/// </summary>
-		/// <param name="slotItem"></param>
-		/// <returns></returns>
-		private static int CalcAirecraftAdeptBonusOfType(this SlotItem slotItem)
-			=> slotItem.Info.Type == SlotItemType.艦上戦闘機
-			|| slotItem.Info.Type == SlotItemType.水上戦闘機
-				? slotItem.Adept == 1 ? 0
-				: slotItem.Adept == 2 ? 2
-				: slotItem.Adept == 3 ? 5
-				: slotItem.Adept == 4 ? 9
-				: slotItem.Adept == 5 ? 14
-				: slotItem.Adept == 6 ? 14
-				: slotItem.Adept == 7 ? 22
-				: 0 // Adept == 0
-			: slotItem.Info.Type == SlotItemType.水上爆撃機
-				? slotItem.Adept == 1 ? 0
-				: slotItem.Adept == 2 ? 1
-				: slotItem.Adept == 3 ? 1
-				: slotItem.Adept == 4 ? 1
-				: slotItem.Adept == 5 ? 3
-				: slotItem.Adept == 6 ? 3
-				: slotItem.Adept == 7 ? 6
-				: 0 // Adept == 0
-			: 0;
-
-		/// <summary>
-		/// 各表記熟練度に対応した艦載機内部熟練度ボーナスの最小値を計算します。
-		/// </summary>
-		/// <param name="slotItem"></param>
-		/// <returns></returns>
-		private static double CalcMinInternalAirecraftAdeptBonus(this SlotItem slotItem)
-		{
-			return slotItem.Info.IsAirSuperiorityFighter
-				? Math.Sqrt((slotItem.Adept != 0 ? (slotItem.Adept - 1) * 15 + 10 : 0) / 10d)
-				: 0;
-		}
-
-		/// <summary>
-		/// 各表記熟練度に対応した艦載機内部熟練度ボーナスの最大値を計算します。
-		/// </summary>
-		/// <param name="slotItem"></param>
-		/// <returns></returns>
-		private static double CalcMaxInternalAirecraftAdeptBonus(this SlotItem slotItem)
-		{
-			if (!slotItem.Info.IsAirSuperiorityFighter)
-				return 0;
-			switch (slotItem.Adept)
-			{
-				case 0:
-					return Math.Sqrt(9d / 10);
-				case 7:
-					return Math.Sqrt(120d / 10);
-				default:
-					return Math.Sqrt((slotItem.Adept * 15 + 9) / 10d);
-			}
-		}
-
-		#endregion
-
 		public static double CalcViewRange(this Fleet fleet)
 		{
 			return ViewRangeCalcLogic.Get(KanColleClient.Current.Settings.ViewRangeCalcType).Calc(new[] { fleet });
diff --git a/source/Grabacr07.KanColleWrapper/KanColleClient.cs b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
index e435dd58e..be91a1868 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleClient.cs
+++ b/source/Grabacr07.KanColleWrapper/KanColleClient.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
 using System.Threading.Tasks;
-using Grabacr07.KanColleWrapper.Models;
 using Grabacr07.KanColleWrapper.Models.Raw;
 
 namespace Grabacr07.KanColleWrapper
@@ -98,32 +96,38 @@ private KanColleClient()
 		public void Initialieze()
 		{
 			var proxy = this.Proxy ?? (this.Proxy = new KanColleProxy());
-			var requireInfoSource = proxy.api_get_member_require_info
-				.TryParse<kcsapi_require_info>()
-				.FirstAsync()
-				.ToTask();
 
-			proxy.api_start2.FirstAsync().Subscribe(async session =>
-			{
-				var timeout = Task.Delay(TimeSpan.FromSeconds(20));
-				var canInitialize = await Task.WhenAny(requireInfoSource, timeout) != timeout;
-
-				SvData<kcsapi_start2> svd;
-				if (!SvData.TryParse(session, out svd)) return;
-
-				this.Master = new Master(svd.Data);
-				if (this.Homeport == null) this.Homeport = new Homeport(proxy);
+			var start2Source = proxy.api_start2.TryParse<kcsapi_start2>();
+			var requireInfoSource = proxy.api_get_member_require_info.TryParse<kcsapi_require_info>();
+			var firstTime = start2Source
+				.CombineLatest(requireInfoSource, (start2, requireInfo) => new { start2, requireInfo, })
+				.FirstAsync();
 
-				if (canInitialize)
-				{
-					var requireInfo = await requireInfoSource;
-					this.Homeport.UpdateAdmiral(requireInfo.Data.api_basic);
-					this.Homeport.Itemyard.Update(requireInfo.Data.api_slot_item);
-					this.Homeport.Dockyard.Update(requireInfo.Data.api_kdock);
-				}
+			// Homeport の初期化と require_info の適用に Master のインスタンスが必要なため、初回のみ足並み揃えて実行
+			// 2 回目以降は受信したタイミングでそれぞれ更新すればよい
 
+			firstTime.Subscribe(x =>
+			{
+				this.Master = new Master(x.start2.Data);
+				this.Homeport = new Homeport(proxy);
+				this.SetRequireInfo(x.requireInfo.Data);
 				this.IsStarted = true;
 			});
+
+			start2Source
+				.SkipUntil(firstTime)
+				.Subscribe(x => this.Master = new Master(x.Data));
+
+			requireInfoSource
+				.SkipUntil(firstTime)
+				.Subscribe(x => this.SetRequireInfo(x.Data));
+		}
+
+		private void SetRequireInfo(kcsapi_require_info data)
+		{
+			this.Homeport.UpdateAdmiral(data.api_basic);
+			this.Homeport.Itemyard.Update(data.api_slot_item);
+			this.Homeport.Dockyard.Update(data.api_kdock);
 		}
 	}
 }
diff --git a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
index 08af9dc3c..b309b6c9d 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
+++ b/source/Grabacr07.KanColleWrapper/KanColleWrapper.csproj
@@ -62,8 +62,8 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
+    <Reference Include="StatefulModel">
+      <HintPath>..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -95,6 +95,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Models\AirSuperiorityPotential.cs" />
     <Compile Include="Annotations\DarkAttribute.cs" />
     <Compile Include="Annotations\ElementalAttribute.cs" />
     <Compile Include="Annotations\LightAttribute.cs" />
diff --git a/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec b/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec
index 0ccc04856..8f26fbb85 100644
--- a/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec
+++ b/source/Grabacr07.KanColleWrapper/KanColleWrapper.nuspec
@@ -15,7 +15,7 @@
     <dependencies>
       <dependency id="Nekoxy" version="1.5.2" />
       <dependency id="Rx-Main" version="2.2.5" />
-      <dependency id="StatefulModel" version="0.5.0" />
+      <dependency id="StatefulModel" version="0.6.0" />
       <dependency id="MetroTrilithon" version="0.1.7" />
     </dependencies>
   </metadata>
diff --git a/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
new file mode 100644
index 000000000..d1e850378
--- /dev/null
+++ b/source/Grabacr07.KanColleWrapper/Models/AirSuperiorityPotential.cs
@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Grabacr07.KanColleWrapper.Models
+{
+	[Flags]
+	public enum AirSuperiorityCalculationOptions
+	{
+		Default = Maximum,
+
+		Minimum = InternalProficiencyMinValue | Fighter,
+		Maximum = InternalProficiencyMaxValue | Fighter | Attacker | SeaplaneBomber,
+
+		/// <summary>艦上戦闘機、水上戦闘機。</summary>
+		Fighter = 0x0001,
+
+		/// <summary>艦上攻撃機、艦上爆撃機。</summary>
+		Attacker = 0x0002,
+
+		/// <summary>水上爆撃機。</summary>
+		SeaplaneBomber = 0x0004,
+
+		/// <summary>内部熟練度最小値による計算。</summary>
+		InternalProficiencyMinValue = 0x0100,
+
+		/// <summary>内部熟練度最大値による計算。</summary>
+		InternalProficiencyMaxValue = 0x0200,
+	}
+
+	public static class AirSuperiorityPotential
+	{
+		/// <summary>
+		/// 艦娘の制空能力を計算します。
+		/// </summary>
+		public static int GetAirSuperiorityPotential(this Ship ship, AirSuperiorityCalculationOptions options = AirSuperiorityCalculationOptions.Default)
+		{
+			return ship.EquippedItems
+				.Select(x => GetAirSuperiorityPotential(x.Item, x.Current, options))
+				.Sum();
+		}
+
+		/// <summary>
+		/// 装備と搭載数を指定して、スロット単位の制空能力を計算します。
+		/// </summary>
+		public static int GetAirSuperiorityPotential(this SlotItem slotItem, int onslot, AirSuperiorityCalculationOptions options = AirSuperiorityCalculationOptions.Default)
+		{
+			var calculator = slotItem.GetCalculator();
+			return options.HasFlag(calculator.Options) && onslot >= 1
+				? calculator.GetAirSuperiority(slotItem, onslot, options)
+				: 0;
+		}
+
+		private static AirSuperiorityCalculator GetCalculator(this SlotItem slotItem)
+		{
+			switch (slotItem.Info.Type)
+			{
+				case SlotItemType.艦上戦闘機:
+				case SlotItemType.水上戦闘機:
+					return new FighterCalculator();
+
+				case SlotItemType.艦上攻撃機:
+				case SlotItemType.艦上爆撃機:
+					return new AttackerCalculator();
+
+				case SlotItemType.水上爆撃機:
+					return new SeaplaneBomberCalculator();
+
+				default:
+					return EmptyCalculator.Instance;
+			}
+		}
+
+		private abstract class AirSuperiorityCalculator
+		{
+			public abstract AirSuperiorityCalculationOptions Options { get; }
+
+			public int GetAirSuperiority(SlotItem slotItem, int onslot, AirSuperiorityCalculationOptions options)
+			{
+				// 装備の対空値とスロットの搭載数による制空値
+				var airSuperiority = this.GetAirSuperiority(slotItem, onslot);
+
+				// 装備の熟練度による制空値ボーナス
+				airSuperiority += this.GetProficiencyBonus(slotItem, options);
+
+				return (int)airSuperiority;
+			}
+
+			protected virtual double GetAirSuperiority(SlotItem slotItem, int onslot)
+			{
+				return slotItem.Info.AA * Math.Sqrt(onslot);
+			}
+
+			protected abstract double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options);
+		}
+
+		#region AirSuperiorityCalculator 派生型
+
+		private class FighterCalculator : AirSuperiorityCalculator
+		{
+			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Fighter;
+
+			protected override double GetAirSuperiority(SlotItem slotItem, int onslot)
+			{
+				// 装備改修による対空値加算 (★ x 0.2)
+				return (slotItem.Info.AA + slotItem.Level * 0.2) * Math.Sqrt(onslot);
+			}
+
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			{
+				var proficiency = slotItem.GetProficiency();
+				return Math.Sqrt(proficiency.GetInternalValue(options) / 10.0) + proficiency.FighterBonus;
+			}
+		}
+
+		private class AttackerCalculator : AirSuperiorityCalculator
+		{
+			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.Attacker;
+
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			{
+				var proficiency = slotItem.GetProficiency();
+				return Math.Sqrt(proficiency.GetInternalValue(options) / 10.0);
+			}
+		}
+
+		private class SeaplaneBomberCalculator : AirSuperiorityCalculator
+		{
+			public override AirSuperiorityCalculationOptions Options => AirSuperiorityCalculationOptions.SeaplaneBomber;
+
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options)
+			{
+				var proficiency = slotItem.GetProficiency();
+				return Math.Sqrt(proficiency.GetInternalValue(options) / 10.0) + proficiency.SeaplaneBomberBonus;
+			}
+		}
+
+		private class EmptyCalculator : AirSuperiorityCalculator
+		{
+			public static EmptyCalculator Instance { get; } = new EmptyCalculator();
+
+			public override AirSuperiorityCalculationOptions Options => ~AirSuperiorityCalculationOptions.Default;
+			protected override double GetAirSuperiority(SlotItem slotItem, int onslot) => .0;
+			protected override double GetProficiencyBonus(SlotItem slotItem, AirSuperiorityCalculationOptions options) => .0;
+
+			private EmptyCalculator() { }
+		}
+
+		#endregion
+
+		private class Proficiency
+		{
+			private readonly int internalMinValue;
+			private readonly int internalMaxValue;
+
+			public int FighterBonus { get; }
+			public int SeaplaneBomberBonus { get; }
+
+			public Proficiency(int internalMin, int internalMax, int fighterBonus, int seaplaneBomberBonus)
+			{
+				this.internalMinValue = internalMin;
+				this.internalMaxValue = internalMax;
+				this.FighterBonus = fighterBonus;
+				this.SeaplaneBomberBonus = seaplaneBomberBonus;
+			}
+
+			/// <summary>
+			/// 内部熟練度値を取得します。
+			/// </summary>
+			public int GetInternalValue(AirSuperiorityCalculationOptions options)
+			{
+				if (options.HasFlag(AirSuperiorityCalculationOptions.InternalProficiencyMinValue)) return this.internalMinValue;
+				if (options.HasFlag(AirSuperiorityCalculationOptions.InternalProficiencyMaxValue)) return this.internalMaxValue;
+				return (this.internalMaxValue + this.internalMinValue) / 2; // <- めっちゃ適当
+			}
+		}
+
+		private static readonly Dictionary<int, Proficiency> proficiencies = new Dictionary<int, Proficiency>()
+		{
+			{ 0, new Proficiency(0, 9, 0, 0) },
+			{ 1, new Proficiency(10, 24, 0, 0) },
+			{ 2, new Proficiency(25, 39, 2, 1) },
+			{ 3, new Proficiency(40, 54, 5, 1) },
+			{ 4, new Proficiency(55, 69, 9, 1) },
+			{ 5, new Proficiency(70, 84, 14, 3) },
+			{ 6, new Proficiency(85, 99, 14, 3) },
+			{ 7, new Proficiency(100, 120, 22, 6) },
+		};
+
+		private static Proficiency GetProficiency(this SlotItem slotItem) => proficiencies[Math.Max(Math.Min(slotItem.Proficiency, 7), 0)];
+	}
+}
diff --git a/source/Grabacr07.KanColleWrapper/Models/FleetState.cs b/source/Grabacr07.KanColleWrapper/Models/FleetState.cs
index 54d033878..84f50333d 100644
--- a/source/Grabacr07.KanColleWrapper/Models/FleetState.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/FleetState.cs
@@ -60,28 +60,6 @@ private set
 
 		#endregion
 
-		#region AirSuperiorityPotential 変更通知プロパティ
-
-		private double _AirSuperiorityPotential;
-
-		/// <summary>
-		/// 艦隊の制空能力を取得します。
-		/// </summary>
-		public double AirSuperiorityPotential
-		{
-			get { return this._AirSuperiorityPotential; }
-			private set
-			{
-				if (this._AirSuperiorityPotential != value)
-				{
-					this._AirSuperiorityPotential = value;
-					this.RaisePropertyChanged();
-				}
-			}
-		}
-
-		#endregion
-
 		#region MinAirSuperiorityPotential 変更通知プロパティ
 
 		private double _MinAirSuperiorityPotential;
@@ -257,9 +235,8 @@ public void Calculate()
 
 			this.TotalLevel = ships.HasItems() ? ships.Sum(x => x.Level) : 0;
 			this.AverageLevel = ships.HasItems() ? (double)this.TotalLevel / ships.Length : 0.0;
-			this.AirSuperiorityPotential = firstFleetShips.Sum(s => s.CalcAirSuperiorityPotential());
-			this.MinAirSuperiorityPotential = firstFleetShips.Sum(s => s.CalcMinAirSuperiorityPotential());
-			this.MaxAirSuperiorityPotential = firstFleetShips.Sum(s => s.CalcMaxAirSuperiorityPotential());
+			this.MinAirSuperiorityPotential = firstFleetShips.Sum(x => x.GetAirSuperiorityPotential(AirSuperiorityCalculationOptions.Minimum));
+			this.MaxAirSuperiorityPotential = firstFleetShips.Sum(x => x.GetAirSuperiorityPotential(AirSuperiorityCalculationOptions.Maximum));
 			this.Speed = ships.All(x => x.Info.Speed == ShipSpeed.Fast)
 				? FleetSpeed.Fast
 				: ships.All(x => x.Info.Speed == ShipSpeed.Low)
diff --git a/source/Grabacr07.KanColleWrapper/Models/QuestType.cs b/source/Grabacr07.KanColleWrapper/Models/QuestType.cs
index 95cfbb8d4..bf7d41d95 100644
--- a/source/Grabacr07.KanColleWrapper/Models/QuestType.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/QuestType.cs
@@ -10,34 +10,29 @@ namespace Grabacr07.KanColleWrapper.Models
 	/// </summary>
 	public enum QuestType
 	{
-		/// <summary>
-		/// 1 回のみの任務。
-		/// </summary>
-		OneTime = 1,
-
 		/// <summary>
 		/// デイリー任務。
 		/// </summary>
-		Daily = 2,
+		Daily = 1,
 
 		/// <summary>
 		/// ウィークリー任務。
 		/// </summary>
-		Weekly = 3,
+		Weekly = 2,
 
 		/// <summary>
-		/// 日付の一の位が3,7,0の日のみ出現する任務。
+		/// マンスリー任務。
 		/// </summary>
-		X3X7X0 = 4,
+		Monthly = 3,
 
 		/// <summary>
-		/// 日付の一の位が2,8の日のみ出現する任務。
+		/// 1 回のみの任務。
 		/// </summary>
-		X2X8 = 5,
+		OneTime = 4,
 
 		/// <summary>
-		/// マンスリー任務。
+		/// その他。
 		/// </summary>
-		Monthly = 6,
+		Other = 5,
 	}
 }
diff --git a/source/Grabacr07.KanColleWrapper/Models/Ship.cs b/source/Grabacr07.KanColleWrapper/Models/Ship.cs
index 131a6eafc..52fd1d762 100644
--- a/source/Grabacr07.KanColleWrapper/Models/Ship.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/Ship.cs
@@ -312,6 +312,8 @@ public TimeSpan TimeToRepair
 		/// </summary>
 		public int ViewRange => this.RawData.api_sakuteki.Get(0) ?? 0;
 
+		public int ASW => this.RawData.api_taisen.Get(0) ?? 0;
+
 		/// <summary>
 		/// 火力・雷装・対空・装甲のすべてのステータス値が最大値に達しているかどうかを示す値を取得します。
 		/// </summary>
diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs
index cecee0943..a2a625a3d 100644
--- a/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/SlotItem.cs
@@ -16,11 +16,11 @@ public class SlotItem : RawDataWrapper<kcsapi_slotitem>, IIdentifiable
 
 		public string LevelText => this.Level >= 10 ? "★max" : this.Level >= 1 ? ("★+" + this.Level) : "";
 
-		public string NameWithLevel => $"{this.Info.Name}{(this.Level >= 1 ? (" " + this.LevelText) : "")}{(this.Adept >= 1 ? (" " + this.AdeptText) : "")}";
+		public string NameWithLevel => $"{this.Info.Name}{(this.Level >= 1 ? (" " + this.LevelText) : "")}{(this.Proficiency >= 1 ? (" " + this.ProficiencyText) : "")}";
 
-		public int Adept => this.RawData.api_alv;
+		public int Proficiency => this.RawData.api_alv;
 
-		public string AdeptText => this.Adept >= 1 ? (" (熟練度 " + this.Adept + ")") : "";
+		public string ProficiencyText => this.Proficiency >= 1 ? (" (熟練度 " + this.Proficiency + ")") : "";
 
 		internal SlotItem(kcsapi_slotitem rawData)
 			: base(rawData)
@@ -40,7 +40,7 @@ public void Remodel(int level, int masterId)
 
 		public override string ToString()
 		{
-			return $"ID = {this.Id}, Name = \"{this.Info.Name}\", Level = {this.Level}, Adapt = {this.Adept}";
+			return $"ID = {this.Id}, Name = \"{this.Info.Name}\", Level = {this.Level}, Proficiency = {this.Proficiency}";
 		}
 
 
diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs
index ee7777814..9ddb1cd8a 100644
--- a/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemInfo.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Grabacr07.KanColleWrapper.Internal;
 using Grabacr07.KanColleWrapper.Models.Raw;
@@ -73,22 +72,7 @@ public class SlotItemInfo : RawDataWrapper<kcsapi_mst_slotitem>, IIdentifiable
 		/// </summary>
 		public int ViewRange => this.RawData.api_saku;
 
-		/// <summary>
-		/// 制空戦に参加できる戦闘機または水上機かどうかを示す値を取得します。
-		/// </summary>
-		public bool IsAirSuperiorityFighter => this.Type == SlotItemType.艦上戦闘機
-											   || this.Type == SlotItemType.艦上攻撃機
-											   || this.Type == SlotItemType.艦上爆撃機
-											   || this.Type == SlotItemType.水上爆撃機
-											   || this.Type == SlotItemType.水上戦闘機;
-
-		public bool IsNumerable => this.Type == SlotItemType.艦上偵察機
-								   || this.Type == SlotItemType.艦上戦闘機
-								   || this.Type == SlotItemType.艦上攻撃機
-								   || this.Type == SlotItemType.艦上爆撃機
-								   || this.Type == SlotItemType.水上偵察機
-								   || this.Type == SlotItemType.水上爆撃機
-								   || this.Type == SlotItemType.水上戦闘機;
+		public bool IsNumerable => this.Type.IsNumerable();
 
 		public SlotItemEquipType EquipType { get; }
 
@@ -104,12 +88,14 @@ public override string ToString()
 
 		#region static members
 
-	    public static SlotItemInfo Dummy { get; } = new SlotItemInfo(new kcsapi_mst_slotitem()
-		{
-		    api_id = 0,
-		    api_name = "？？？",
-		}, new MasterTable<SlotItemEquipType>());
+		public static SlotItemInfo Dummy { get; } = new SlotItemInfo(
+			new kcsapi_mst_slotitem()
+			{
+				api_id = 0,
+				api_name = "？？？",
+			},
+			new MasterTable<SlotItemEquipType>());
 
-	    #endregion
+		#endregion
 	}
 }
diff --git a/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs b/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs
index 5b9b7007e..104aada4d 100644
--- a/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/SlotItemType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// ReSharper disable InconsistentNaming
 
 namespace Grabacr07.KanColleWrapper.Models
 {
@@ -59,4 +55,29 @@ public enum SlotItemType
 		大型電探_II = 93,
 		艦上偵察機_II = 94,
 	}
+
+	public static class SlotItemTypeExtensions
+	{
+		public static bool IsNumerable(this SlotItemType type)
+		{
+			switch (type)
+			{
+				case SlotItemType.艦上偵察機:
+				case SlotItemType.艦上偵察機_II:
+				case SlotItemType.艦上戦闘機:
+				case SlotItemType.艦上攻撃機:
+				case SlotItemType.艦上爆撃機:
+				case SlotItemType.水上偵察機:
+				case SlotItemType.水上爆撃機:
+				case SlotItemType.水上戦闘機:
+				case SlotItemType.オートジャイロ:
+				case SlotItemType.対潜哨戒機:
+				case SlotItemType.大型飛行艇:
+					return true;
+
+				default:
+					return false;
+			}
+		}
+	}
 }
diff --git a/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs b/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs
index 742488bfd..5268daf09 100644
--- a/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs
+++ b/source/Grabacr07.KanColleWrapper/Models/ViewRange.cs
@@ -221,7 +221,7 @@ public override double Calc(Fleet[] fleets)
 			var itemScore = ships
 				.SelectMany(x => x.EquippedItems)
 				.Select(x => x.Item)
-				.Sum(x => (x.Info.ViewRange + GetAdeptCoefficient(x)) * GetTypeCoefficient(x.Info.Type));
+				.Sum(x => (x.Info.ViewRange + GetLevelCoefficient(x)) * GetTypeCoefficient(x.Info.Type));
 
 			var shipScore = ships
 				.Select(x => x.ViewRange - x.EquippedItems.Sum(s => s.Item.Info.RawData.api_saku))
@@ -255,17 +255,17 @@ private Ship[] GetTargetShips(Fleet[] fleets)
 			return new Ship[0];
 		}
 
-		private static double GetAdeptCoefficient(SlotItem item)
+		private static double GetLevelCoefficient(SlotItem item)
 		{
 			switch (item.Info.Type)
 			{
 				case SlotItemType.水上偵察機:
-					return Math.Sqrt(item.Adept) * 1.2;
+					return Math.Sqrt(item.Level) * 1.2;
 
 				case SlotItemType.小型電探:
 				case SlotItemType.大型電探:
 				case SlotItemType.大型電探_II:
-					return Math.Sqrt(item.Adept) * 1.25;
+					return Math.Sqrt(item.Level) * 1.25;
 
 				default:
 					return 0;
diff --git a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
index 62d964519..601dda8c1 100644
--- a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
@@ -10,5 +10,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("8A13AB28-4E9F-423D-80AD-23EEF2821959")]
 
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyInformationalVersion("1.5.2")]
+[assembly: AssemblyVersion("1.6.0")]
+[assembly: AssemblyInformationalVersion("1.6.0")]
diff --git a/source/Grabacr07.KanColleWrapper/Quests.cs b/source/Grabacr07.KanColleWrapper/Quests.cs
index 0c71f34f3..adea916a7 100644
--- a/source/Grabacr07.KanColleWrapper/Quests.cs
+++ b/source/Grabacr07.KanColleWrapper/Quests.cs
@@ -14,6 +14,7 @@
 using Grabacr07.KanColleWrapper.Internal;
 using Grabacr07.KanColleWrapper.Models;
 using Grabacr07.KanColleWrapper.Models.Raw;
+using System.Web;
 
 namespace Grabacr07.KanColleWrapper
 {
@@ -108,6 +109,7 @@ internal Quests(KanColleProxy proxy)
 			this.All = this.Current = new List<Quest>();
 
 			proxy.api_get_member_questlist
+				.Where(x => HttpUtility.ParseQueryString(x.Request.BodyAsString)["api_tab_id"] == "0")
 				.Select(Serialize)
 				.Where(x => x != null)
 				.Subscribe(this.Update);
diff --git a/source/Grabacr07.KanColleWrapper/packages.config b/source/Grabacr07.KanColleWrapper/packages.config
index a8ef60b9b..7b1ae0be1 100644
--- a/source/Grabacr07.KanColleWrapper/packages.config
+++ b/source/Grabacr07.KanColleWrapper/packages.config
@@ -12,5 +12,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
-  <package id="StatefulModel" version="0.5.0" targetFramework="net45" />
+  <package id="StatefulModel" version="0.6.0" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/source/KanColleViewer.sln.DotSettings b/source/KanColleViewer.sln.DotSettings
index d02b631ae..7bb37ce0a 100644
--- a/source/KanColleViewer.sln.DotSettings
+++ b/source/KanColleViewer.sln.DotSettings
@@ -7,12 +7,17 @@
 	<s:Boolean x:Key="/Default/CodeEditing/TypingAssist/Xaml/AutoInsertTagFooter/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Grabacr07_002EKanColleViewer_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AccessToModifiedClosure/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CompareOfFloatsByEqualityOperator/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DoNotCallOverridableMethodsInConstructor/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ExplicitCallerInfoArgument/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FieldCanBeMadeReadOnly_002ELocal/@EntryIndexedValue">HINT</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InvokeAsExtensionMethod/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAnonymousTypePropertyName/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCaseLabel/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInEnumDeclaration/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCommaInInitializer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantEmptyObjectCreationArgumentList/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantIfElseBlock/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantNameQualifier/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
diff --git a/source/MetroRadiance b/source/MetroRadiance
index 4e416a846..2b091772a 160000
--- a/source/MetroRadiance
+++ b/source/MetroRadiance
@@ -1 +1 @@
-Subproject commit 4e416a8461d9fb367f0cffdc7526c40fcf72eda7
+Subproject commit 2b091772a2907172c9b8788a9f8920c0087d098e
diff --git a/source/MetroTrilithon b/source/MetroTrilithon
index 25bb02e7e..bd31e38ce 160000
--- a/source/MetroTrilithon
+++ b/source/MetroTrilithon
@@ -1 +1 @@
-Subproject commit 25bb02e7ea2494730498287043ae335c8d555abc
+Subproject commit bd31e38ce976fdc7a1689057f3b775fa9cec0f51
diff --git a/source/Plugins/TaskbarProgress/TaskbarProgress.csproj b/source/Plugins/TaskbarProgress/TaskbarProgress.csproj
index 3f3b80fb0..28bc36231 100644
--- a/source/Plugins/TaskbarProgress/TaskbarProgress.csproj
+++ b/source/Plugins/TaskbarProgress/TaskbarProgress.csproj
@@ -42,7 +42,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="StatefulModel, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\StatefulModel.0.5.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
+      <HintPath>..\..\packages\StatefulModel.0.6.0\lib\portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\StatefulModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/source/Plugins/TaskbarProgress/packages.config b/source/Plugins/TaskbarProgress/packages.config
index 7c8f44d45..7e88d0938 100644
--- a/source/Plugins/TaskbarProgress/packages.config
+++ b/source/Plugins/TaskbarProgress/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="LivetCask" version="1.3.1.0" targetFramework="net46" />
-  <package id="StatefulModel" version="0.5.0" targetFramework="net46" />
+  <package id="StatefulModel" version="0.6.0" targetFramework="net46" />
 </packages>
\ No newline at end of file