diff --git a/build/pipelines/templates/build-app-internal.yaml b/build/pipelines/templates/build-app-internal.yaml
index 96958fbb..fbaafc18 100644
--- a/build/pipelines/templates/build-app-internal.yaml
+++ b/build/pipelines/templates/build-app-internal.yaml
@@ -29,7 +29,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.33
+      vstsPackageVersion: 0.0.35
 
   - template: ./build-single-architecture.yaml
     parameters:
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorAppList.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorAppList.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorAppList.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorAppList.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorAppList.scale-125_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_scale-125.png
rename to src/Calculator/Assets/CalculatorAppList.scale-125_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorAppList.scale-125_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_scale-125.png
rename to src/Calculator/Assets/CalculatorAppList.scale-125_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorAppList.scale-150_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_scale-150.png
rename to src/Calculator/Assets/CalculatorAppList.scale-150_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorAppList.scale-150_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_scale-150.png
rename to src/Calculator/Assets/CalculatorAppList.scale-150_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorAppList.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorAppList.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorAppList.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorAppList.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorAppList.scale-400_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_scale-400.png
rename to src/Calculator/Assets/CalculatorAppList.scale-400_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorAppList.scale-400_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_scale-400.png
rename to src/Calculator/Assets/CalculatorAppList.scale-400_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-16.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-16.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-16_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-16.png b/src/Calculator/Assets/CalculatorAppList.targetsize-16_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-16.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-16_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-20.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-20.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-20_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-20.png b/src/Calculator/Assets/CalculatorAppList.targetsize-20_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-20.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-20_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-24.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-24.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-24_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-24.png b/src/Calculator/Assets/CalculatorAppList.targetsize-24_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-24.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-24_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-256.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-256.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-256_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-256.png b/src/Calculator/Assets/CalculatorAppList.targetsize-256_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-256.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-256_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-30.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-30.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-30_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-30.png b/src/Calculator/Assets/CalculatorAppList.targetsize-30_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-30.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-30_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-32.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-32.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-32_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-32.png b/src/Calculator/Assets/CalculatorAppList.targetsize-32_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-32.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-32_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-36.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-36.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-36_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-36.png b/src/Calculator/Assets/CalculatorAppList.targetsize-36_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-36.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-36_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-40.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-40.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-40_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-40.png b/src/Calculator/Assets/CalculatorAppList.targetsize-40_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-40.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-40_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-48.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-48.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-48_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-48.png b/src/Calculator/Assets/CalculatorAppList.targetsize-48_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-48.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-48_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-60.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-60.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-60_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-60.png b/src/Calculator/Assets/CalculatorAppList.targetsize-60_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-60.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-60_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-64.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-64.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-64_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-64.png b/src/Calculator/Assets/CalculatorAppList.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-64.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-64_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-72.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-72.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-72_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-72.png b/src/Calculator/Assets/CalculatorAppList.targetsize-72_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-72.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-72_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-80.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-80.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-80_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-80.png b/src/Calculator/Assets/CalculatorAppList.targetsize-80_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-80.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-80_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-96.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-black_targetsize-96.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-96_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-96.png b/src/Calculator/Assets/CalculatorAppList.targetsize-96_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorAppList.contrast-white_targetsize-96.png
rename to src/Calculator/Assets/CalculatorAppList.targetsize-96_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorLargeTile.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorLargeTile.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorLargeTile.scale-125_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-125.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-125_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorLargeTile.scale-125_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-125.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-125_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorLargeTile.scale-150_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-150.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-150_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorLargeTile.scale-150_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-150.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-150_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorLargeTile.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorLargeTile.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorLargeTile.scale-400_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-black_scale-400.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-400_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorLargeTile.scale-400_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorLargeTile.contrast-white_scale-400.png
rename to src/Calculator/Assets/CalculatorLargeTile.scale-400_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorMedTile.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorMedTile.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorMedTile.scale-125_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-125.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-125_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorMedTile.scale-125_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-125.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-125_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorMedTile.scale-150_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-150.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-150_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorMedTile.scale-150_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-150.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-150_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorMedTile.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorMedTile.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorMedTile.scale-400_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-black_scale-400.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-400_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorMedTile.scale-400_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorMedTile.contrast-white_scale-400.png
rename to src/Calculator/Assets/CalculatorMedTile.scale-400_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorSmallTile.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorSmallTile.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorSmallTile.scale-125_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-125.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-125_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorSmallTile.scale-125_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-125.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-125_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorSmallTile.scale-150_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-150.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-150_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorSmallTile.scale-150_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-150.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-150_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorSmallTile.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorSmallTile.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorSmallTile.scale-400_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-black_scale-400.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-400_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorSmallTile.scale-400_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSmallTile.contrast-white_scale-400.png
rename to src/Calculator/Assets/CalculatorSmallTile.scale-400_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-125_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-125.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-125_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-125_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-125.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-125_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-150_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-150.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-150_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-150_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-150.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-150_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-400_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-black_scale-400.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-400_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-400_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
rename to src/Calculator/Assets/CalculatorSplashScreen.scale-400_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorStoreLogo.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorStoreLogo.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorStoreLogo.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorStoreLogo.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorStoreLogo.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorStoreLogo.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorStoreLogo.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorStoreLogo.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorStoreLogo.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-100.png b/src/Calculator/Assets/CalculatorWideTile.scale-100_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-100.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-100_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-100.png b/src/Calculator/Assets/CalculatorWideTile.scale-100_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-100.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-100_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-125.png b/src/Calculator/Assets/CalculatorWideTile.scale-125_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-125.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-125_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-125.png b/src/Calculator/Assets/CalculatorWideTile.scale-125_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-125.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-125_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-150.png b/src/Calculator/Assets/CalculatorWideTile.scale-150_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-150.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-150_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-150.png b/src/Calculator/Assets/CalculatorWideTile.scale-150_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-150.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-150_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-200.png b/src/Calculator/Assets/CalculatorWideTile.scale-200_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-200.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-200_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-200.png b/src/Calculator/Assets/CalculatorWideTile.scale-200_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-200.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-200_contrast-white.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-400.png b/src/Calculator/Assets/CalculatorWideTile.scale-400_contrast-black.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-black_scale-400.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-400_contrast-black.png
diff --git a/src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-400.png b/src/Calculator/Assets/CalculatorWideTile.scale-400_contrast-white.png
similarity index 100%
rename from src/Calculator/Assets/CalculatorWideTile.contrast-white_scale-400.png
rename to src/Calculator/Assets/CalculatorWideTile.scale-400_contrast-white.png
diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index 5901fdec..843d744e 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -653,60 +653,109 @@
     <PRIResource Include="Resources\zh-tw\CEngineStrings.resw" />
     <PRIResource Include="Resources\zh-tw\Resources.resw" />
   </ItemGroup>
+  <ItemGroup Condition="'$(IsStoreBuild)' == 'True'">
+    <Image Include="Assets\CalculatorAppList.scale-100.png" />
+    <Image Include="Assets\CalculatorAppList.scale-125.png" />
+    <Image Include="Assets\CalculatorAppList.scale-150.png" />
+    <Image Include="Assets\CalculatorAppList.scale-200.png" />
+    <Image Include="Assets\CalculatorAppList.scale-400.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-100.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-125.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-150.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-200.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-400.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-100.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-125.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-150.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-200.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-400.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-100.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-125.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-150.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-200.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-400.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-100.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-125.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-150.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-200.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-400.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-100.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-125.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-150.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-200.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-400.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-400_contrast-white.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-100.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-125.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-150.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-200.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-400.png" />
+  </ItemGroup>
   <ItemGroup>
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-125.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-150.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-400.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-16.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-20.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-24.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-256.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-30.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-32.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-36.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-40.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-48.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-60.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-64.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-72.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-80.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-96.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-125.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-150.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-400.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-16.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-20.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-24.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-256.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-30.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-32.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-36.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-40.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-48.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-60.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-64.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-72.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-80.png" />
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-96.png" />
+    <Image Include="Assets\CalculatorAppList.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.scale-400_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-16.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-16_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-16_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-16_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-20.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-20_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-20_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-20_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-24.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-24_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-24_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-24_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-256.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated_devicefamily-colorfulunplated.png" />
@@ -716,26 +765,36 @@
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-white_devicefamily-colorfulunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_devicefamily-colorfulunplated.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-256_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-256_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-30.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-30_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-30_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-30_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-32.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-32_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-32_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-32_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-36.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-36_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-36_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-36_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-40.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-40_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-40_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-40_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-48.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-lightunplated_devicefamily-colorfulunplated.png" />
@@ -745,26 +804,36 @@
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-white_devicefamily-colorfulunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_devicefamily-colorfulunplated.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-48_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-48_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-60.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-60_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-60_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-60_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-64.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-64_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-64_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-64_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-72.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-72_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-72_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-72_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-80.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-80_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-80_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-80_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-96.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated_devicefamily-colorfulunplated.png" />
@@ -774,60 +843,62 @@
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-white_devicefamily-colorfulunplated.png" />
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_devicefamily-colorfulunplated.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-125.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-150.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-400.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-125.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-150.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-400.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-125.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-150.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-400.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-125.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-150.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-400.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-125.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-150.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-400.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-125.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-150.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-400.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-125.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-150.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-400.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-125.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-150.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-400.png" />
-    <Image Include="Assets\CalculatorStoreLogo.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorStoreLogo.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorStoreLogo.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorStoreLogo.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-100.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-125.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-150.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-200.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-400.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-100.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-125.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-150.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-200.png" />
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-400.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-96_contrast-black.png" />
+    <Image Include="Assets\CalculatorAppList.targetsize-96_contrast-white.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorLargeTile.scale-400_contrast-white.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorMedTile.scale-400_contrast-white.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorSmallTile.scale-400_contrast-white.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorSplashScreen.scale-400_contrast-white.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorStoreLogo.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-100_contrast-black.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-100_contrast-white.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-125_contrast-black.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-125_contrast-white.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-150_contrast-black.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-150_contrast-white.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-200_contrast-black.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-200_contrast-white.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-400_contrast-black.png" />
+    <Image Include="Assets\CalculatorWideTile.scale-400_contrast-white.png" />
     <Image Include="Assets\Date.targetsize-16_contrast-black.png" />
     <Image Include="Assets\Date.targetsize-16_contrast-white.png" />
     <Image Include="Assets\Date.targetsize-20_contrast-black.png" />
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index 74210968..e5141694 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -521,6 +521,8 @@
       <Filter>Views\GraphingCalculator</Filter>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)DensityStyles\Compact.xaml" />
+    <Page Include="Controls\PreviewTagControl.xaml" />
+    <Page Include="EquationStylePanelControl.xaml" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="Resources\en-US\CEngineStrings.resw">
@@ -915,450 +917,6 @@
     </PRIResource>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Assets\CalculatorAppList.targetsize-16.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-20.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-24.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-32.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-40.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-48.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-64.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-80.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-96.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-256.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-16.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-20.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-24.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-32.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-40.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-48.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-64.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-80.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-96.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-256.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-white_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-white_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-white_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-white_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-16.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-20.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-24.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-32.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-40.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-48.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-64.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-80.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-96.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-256.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorLargeTile.contrast-black_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorMedTile.contrast-black_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSmallTile.contrast-black_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorWideTile.contrast-black_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-30.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-36.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-60.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-black_targetsize-72.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-30.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-36.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-60.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.contrast-white_targetsize-72.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-30.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-36.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-60.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-72.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorStoreLogo.contrast-black_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorStoreLogo.contrast-white_scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-white_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-400.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-150.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorSplashScreen.contrast-black_scale-125.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorStoreLogo.contrast-black_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorStoreLogo.contrast-white_scale-200.png">
-      <Filter>Assets</Filter>
-    </Image>
     <Image Include="Assets\Standard.targetsize-64_contrast-white.png">
       <Filter>Assets</Filter>
     </Image>
@@ -1479,84 +1037,528 @@
     <Image Include="Assets\Date.targetsize-16_contrast-black.png">
       <Filter>Assets</Filter>
     </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-lightunplated.png">
+    <Image Include="Assets\CalculatorAppList.scale-100_contrast-black.png">
       <Filter>Assets</Filter>
     </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated.png">
+    <Image Include="Assets\CalculatorAppList.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-125_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-125_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-150_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-150_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-400_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.scale-400_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-16.png">
       <Filter>Assets</Filter>
     </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-16_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-16_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-16_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-16_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-20.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-20_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-20_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-20_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-20_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-24.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-24_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-24_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-24_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-24_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-30.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-30_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-30_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-30_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-30_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-32.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-32_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-32_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-32_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-32_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-36.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-36_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-36_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-36_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-36_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-40.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-40_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-40_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-40_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-40_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-48.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-lightunplated.png">
       <Filter>Assets</Filter>
     </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-lightunplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-lightunplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-lightunplated.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated.png">
-      <Filter>Assets</Filter>
-    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-lightunplated_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-black_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_contrast-white_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-48_altform-unplated_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-48_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-48_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-lightunplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-60_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-lightunplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-64_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-lightunplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-72_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-lightunplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-80_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-lightunplated_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-black_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_contrast-white_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-96_altform-unplated_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-96_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-lightunplated_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-black_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_contrast-white_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
     <Image Include="Assets\CalculatorAppList.targetsize-256_altform-unplated_devicefamily-colorfulunplated.png">
       <Filter>Assets</Filter>
     </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorAppList.targetsize-256_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-100_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-125_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-125_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-150_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-150_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-400_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorLargeTile.scale-400_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-100_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-125_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-125_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-150_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-150_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-400_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorMedTile.scale-400_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-100_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-125_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-125_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-150_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-150_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-400_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSmallTile.scale-400_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-100_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-125_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-125_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-150_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-150_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-400_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorSplashScreen.scale-400_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorStoreLogo.scale-100_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorStoreLogo.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorStoreLogo.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorStoreLogo.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-100_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-100_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-125_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-125_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-150_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-150_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-200_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-200_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-400_contrast-black.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\CalculatorWideTile.scale-400_contrast-white.png">
+      <Filter>Assets</Filter>
+    </Image>
   </ItemGroup>
   <ItemGroup>
     <Font Include="Assets\CalcMDL2.ttf">
@@ -1569,5 +1571,7 @@
   <ItemGroup>
     <CopyFileToFolders Include="$(GraphingImplDll)" />
     <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
   </ItemGroup>
 </Project>
\ No newline at end of file