diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs
index 820c3d1..6d8c9e3 100644
--- a/TheGameExtreme.Android/MainActivity.cs
+++ b/TheGameExtreme.Android/MainActivity.cs
@@ -16,26 +16,25 @@ namespace TheGameExtreme.Droid
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            base.OnCreate(savedInstanceState);
+
             TabLayoutResource = Resource.Layout.Tabbar;
             ToolbarResource = Resource.Layout.Toolbar;
+            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
+            Forms.Init(this, savedInstanceState);
+            LoadApplication(new App());
 
-            /*int uiOptions = (int)Window.DecorView.SystemUiVisibility;
+            int uiOptions = (int)Window.DecorView.SystemUiVisibility;
             uiOptions |= (int)SystemUiFlags.LowProfile;
             uiOptions |= (int)SystemUiFlags.Fullscreen;
             uiOptions |= (int)SystemUiFlags.HideNavigation;
-            uiOptions |= (int)SystemUiFlags.ImmersiveSticky;            
-            Window.DecorView.SystemUiVisibility = (StatusBarVisibility)uiOptions;*/
-            
-            base.OnCreate(savedInstanceState);
-            Rg.Plugins.Popup.Popup.Init(this, savedInstanceState);
-            Xamarin.Essentials.Platform.Init(this, savedInstanceState);
-            global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
-            LoadApplication(new App());
+            uiOptions |= (int)SystemUiFlags.ImmersiveSticky;
+            Window.DecorView.SystemUiVisibility = (StatusBarVisibility)uiOptions;
             Window.SetStatusBarColor(Android.Graphics.Color.Argb(255, 0, 0, 0));
-            this.Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn);
-            
+            Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn);
+
         }
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
+        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)
         {
             Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
 
diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml
index 84a14d8..469b73b 100644
--- a/TheGameExtreme.Android/Properties/AndroidManifest.xml
+++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="13" android:versionName="5.0" package="com.uca.thegameextreme" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="15" android:versionName="5.1" package="com.uca.thegameextreme" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
 	<application android:icon="@drawable/TrierImageB" android:label="OrderStacks"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs
index 24ca1cb..4d79f6d 100644
--- a/TheGameExtreme.Android/Resources/Resource.designer.cs
+++ b/TheGameExtreme.Android/Resources/Resource.designer.cs
@@ -317,8 +317,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.behavior_overlapTop = global::TheGameExtreme.Droid.Resource.Attribute.behavior_overlapTop;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.behavior_peekHeight = global::TheGameExtreme.Droid.Resource.Attribute.behavior_peekHeight;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.behavior_skipCollapsed = global::TheGameExtreme.Droid.Resource.Attribute.behavior_skipCollapsed;
-			global::Xamarin.Forms.Platform.Android.Resource.Attribute.borderWidth = global::TheGameExtreme.Droid.Resource.Attribute.borderWidth;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.borderlessButtonStyle = global::TheGameExtreme.Droid.Resource.Attribute.borderlessButtonStyle;
+			global::Xamarin.Forms.Platform.Android.Resource.Attribute.borderWidth = global::TheGameExtreme.Droid.Resource.Attribute.borderWidth;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.bottomAppBarStyle = global::TheGameExtreme.Droid.Resource.Attribute.bottomAppBarStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.bottomNavigationStyle = global::TheGameExtreme.Droid.Resource.Attribute.bottomNavigationStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.bottomSheetDialogTheme = global::TheGameExtreme.Droid.Resource.Attribute.bottomSheetDialogTheme;
@@ -384,9 +384,9 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.closeIconVisible = global::TheGameExtreme.Droid.Resource.Attribute.closeIconVisible;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.closeItemLayout = global::TheGameExtreme.Droid.Resource.Attribute.closeItemLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.collapseContentDescription = global::TheGameExtreme.Droid.Resource.Attribute.collapseContentDescription;
-			global::Xamarin.Forms.Platform.Android.Resource.Attribute.collapseIcon = global::TheGameExtreme.Droid.Resource.Attribute.collapseIcon;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.collapsedTitleGravity = global::TheGameExtreme.Droid.Resource.Attribute.collapsedTitleGravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.collapsedTitleTextAppearance = global::TheGameExtreme.Droid.Resource.Attribute.collapsedTitleTextAppearance;
+			global::Xamarin.Forms.Platform.Android.Resource.Attribute.collapseIcon = global::TheGameExtreme.Droid.Resource.Attribute.collapseIcon;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.color = global::TheGameExtreme.Droid.Resource.Attribute.color;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.colorAccent = global::TheGameExtreme.Droid.Resource.Attribute.colorAccent;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.colorBackgroundFloating = global::TheGameExtreme.Droid.Resource.Attribute.colorBackgroundFloating;
@@ -432,8 +432,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.dividerVertical = global::TheGameExtreme.Droid.Resource.Attribute.dividerVertical;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.drawableSize = global::TheGameExtreme.Droid.Resource.Attribute.drawableSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.drawerArrowStyle = global::TheGameExtreme.Droid.Resource.Attribute.drawerArrowStyle;
-			global::Xamarin.Forms.Platform.Android.Resource.Attribute.dropDownListViewStyle = global::TheGameExtreme.Droid.Resource.Attribute.dropDownListViewStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.dropdownListPreferredItemHeight = global::TheGameExtreme.Droid.Resource.Attribute.dropdownListPreferredItemHeight;
+			global::Xamarin.Forms.Platform.Android.Resource.Attribute.dropDownListViewStyle = global::TheGameExtreme.Droid.Resource.Attribute.dropDownListViewStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.editTextBackground = global::TheGameExtreme.Droid.Resource.Attribute.editTextBackground;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.editTextColor = global::TheGameExtreme.Droid.Resource.Attribute.editTextColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.editTextStyle = global::TheGameExtreme.Droid.Resource.Attribute.editTextStyle;
@@ -495,12 +495,12 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.icon = global::TheGameExtreme.Droid.Resource.Attribute.icon;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconEndPadding = global::TheGameExtreme.Droid.Resource.Attribute.iconEndPadding;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconGravity = global::TheGameExtreme.Droid.Resource.Attribute.iconGravity;
+			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconifiedByDefault = global::TheGameExtreme.Droid.Resource.Attribute.iconifiedByDefault;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconPadding = global::TheGameExtreme.Droid.Resource.Attribute.iconPadding;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconSize = global::TheGameExtreme.Droid.Resource.Attribute.iconSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconStartPadding = global::TheGameExtreme.Droid.Resource.Attribute.iconStartPadding;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconTint = global::TheGameExtreme.Droid.Resource.Attribute.iconTint;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconTintMode = global::TheGameExtreme.Droid.Resource.Attribute.iconTintMode;
-			global::Xamarin.Forms.Platform.Android.Resource.Attribute.iconifiedByDefault = global::TheGameExtreme.Droid.Resource.Attribute.iconifiedByDefault;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.imageButtonStyle = global::TheGameExtreme.Droid.Resource.Attribute.imageButtonStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.indeterminateProgressStyle = global::TheGameExtreme.Droid.Resource.Attribute.indeterminateProgressStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.initialActivityCount = global::TheGameExtreme.Droid.Resource.Attribute.initialActivityCount;
@@ -704,9 +704,9 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMargin = global::TheGameExtreme.Droid.Resource.Attribute.titleMargin;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMarginBottom = global::TheGameExtreme.Droid.Resource.Attribute.titleMarginBottom;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMarginEnd = global::TheGameExtreme.Droid.Resource.Attribute.titleMarginEnd;
+			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMargins = global::TheGameExtreme.Droid.Resource.Attribute.titleMargins;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMarginStart = global::TheGameExtreme.Droid.Resource.Attribute.titleMarginStart;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMarginTop = global::TheGameExtreme.Droid.Resource.Attribute.titleMarginTop;
-			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleMargins = global::TheGameExtreme.Droid.Resource.Attribute.titleMargins;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleTextAppearance = global::TheGameExtreme.Droid.Resource.Attribute.titleTextAppearance;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleTextColor = global::TheGameExtreme.Droid.Resource.Attribute.titleTextColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.titleTextStyle = global::TheGameExtreme.Droid.Resource.Attribute.titleTextStyle;
@@ -835,11 +835,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_tabs_icon_color_selector_colored = global::TheGameExtreme.Droid.Resource.Color.mtrl_tabs_icon_color_selector_colored;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_tabs_legacy_text_color_selector = global::TheGameExtreme.Droid.Resource.Color.mtrl_tabs_legacy_text_color_selector;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_tabs_ripple_color = global::TheGameExtreme.Droid.Resource.Color.mtrl_tabs_ripple_color;
-			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_text_btn_text_color_selector = global::TheGameExtreme.Droid.Resource.Color.mtrl_text_btn_text_color_selector;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_textinput_default_box_stroke_color = global::TheGameExtreme.Droid.Resource.Color.mtrl_textinput_default_box_stroke_color;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_textinput_disabled_color = global::TheGameExtreme.Droid.Resource.Color.mtrl_textinput_disabled_color;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_textinput_filled_box_default_background_color = global::TheGameExtreme.Droid.Resource.Color.mtrl_textinput_filled_box_default_background_color;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_textinput_hovered_box_stroke_color = global::TheGameExtreme.Droid.Resource.Color.mtrl_textinput_hovered_box_stroke_color;
+			global::Xamarin.Forms.Platform.Android.Resource.Color.mtrl_text_btn_text_color_selector = global::TheGameExtreme.Droid.Resource.Color.mtrl_text_btn_text_color_selector;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.notification_action_color_filter = global::TheGameExtreme.Droid.Resource.Color.notification_action_color_filter;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.notification_icon_bg_color = global::TheGameExtreme.Droid.Resource.Color.notification_icon_bg_color;
 			global::Xamarin.Forms.Platform.Android.Resource.Color.notification_material_background_media_default_color = global::TheGameExtreme.Droid.Resource.Color.notification_material_background_media_default_color;
@@ -1155,6 +1155,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_switch_track_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_switch_track_mtrl_alpha;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_tab_indicator_material = global::TheGameExtreme.Droid.Resource.Drawable.abc_tab_indicator_material;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_tab_indicator_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_tab_indicator_mtrl_alpha;
+			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_activated_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_activated_mtrl_alpha;
+			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_default_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_default_mtrl_alpha;
+			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_search_activated_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_search_activated_mtrl_alpha;
+			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_search_default_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_search_default_mtrl_alpha;
+			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_search_material = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_search_material;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_text_cursor_material = global::TheGameExtreme.Droid.Resource.Drawable.abc_text_cursor_material;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_text_select_handle_left_mtrl_dark = global::TheGameExtreme.Droid.Resource.Drawable.abc_text_select_handle_left_mtrl_dark;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_text_select_handle_left_mtrl_light = global::TheGameExtreme.Droid.Resource.Drawable.abc_text_select_handle_left_mtrl_light;
@@ -1162,11 +1167,6 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_text_select_handle_middle_mtrl_light = global::TheGameExtreme.Droid.Resource.Drawable.abc_text_select_handle_middle_mtrl_light;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_text_select_handle_right_mtrl_dark = global::TheGameExtreme.Droid.Resource.Drawable.abc_text_select_handle_right_mtrl_dark;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_text_select_handle_right_mtrl_light = global::TheGameExtreme.Droid.Resource.Drawable.abc_text_select_handle_right_mtrl_light;
-			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_activated_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_activated_mtrl_alpha;
-			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_default_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_default_mtrl_alpha;
-			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_search_activated_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_search_activated_mtrl_alpha;
-			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_search_default_mtrl_alpha = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_search_default_mtrl_alpha;
-			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_textfield_search_material = global::TheGameExtreme.Droid.Resource.Drawable.abc_textfield_search_material;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.abc_vector_test = global::TheGameExtreme.Droid.Resource.Drawable.abc_vector_test;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.avd_hide_password = global::TheGameExtreme.Droid.Resource.Drawable.avd_hide_password;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.avd_show_password = global::TheGameExtreme.Droid.Resource.Drawable.avd_show_password;
@@ -1196,13 +1196,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.notify_panel_notification_icon_bg = global::TheGameExtreme.Droid.Resource.Drawable.notify_panel_notification_icon_bg;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.tooltip_frame_dark = global::TheGameExtreme.Droid.Resource.Drawable.tooltip_frame_dark;
 			global::Xamarin.Forms.Platform.Android.Resource.Drawable.tooltip_frame_light = global::TheGameExtreme.Droid.Resource.Drawable.tooltip_frame_light;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.ALT = global::TheGameExtreme.Droid.Resource.Id.ALT;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.CTRL = global::TheGameExtreme.Droid.Resource.Id.CTRL;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.FUNCTION = global::TheGameExtreme.Droid.Resource.Id.FUNCTION;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.META = global::TheGameExtreme.Droid.Resource.Id.META;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.SHIFT = global::TheGameExtreme.Droid.Resource.Id.SHIFT;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.SYM = global::TheGameExtreme.Droid.Resource.Id.SYM;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action0 = global::TheGameExtreme.Droid.Resource.Id.action0;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.actions = global::TheGameExtreme.Droid.Resource.Id.actions;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action_bar = global::TheGameExtreme.Droid.Resource.Id.action_bar;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action_bar_activity_content = global::TheGameExtreme.Droid.Resource.Id.action_bar_activity_content;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action_bar_container = global::TheGameExtreme.Droid.Resource.Id.action_bar_container;
@@ -1220,11 +1215,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action_mode_bar_stub = global::TheGameExtreme.Droid.Resource.Id.action_mode_bar_stub;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action_mode_close_button = global::TheGameExtreme.Droid.Resource.Id.action_mode_close_button;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.action_text = global::TheGameExtreme.Droid.Resource.Id.action_text;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.actions = global::TheGameExtreme.Droid.Resource.Id.actions;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.activity_chooser_view_content = global::TheGameExtreme.Droid.Resource.Id.activity_chooser_view_content;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.add = global::TheGameExtreme.Droid.Resource.Id.add;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.alertTitle = global::TheGameExtreme.Droid.Resource.Id.alertTitle;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.all = global::TheGameExtreme.Droid.Resource.Id.all;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.ALT = global::TheGameExtreme.Droid.Resource.Id.ALT;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.always = global::TheGameExtreme.Droid.Resource.Id.always;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.async = global::TheGameExtreme.Droid.Resource.Id.async;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.auto = global::TheGameExtreme.Droid.Resource.Id.auto;
@@ -1247,6 +1242,7 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.content = global::TheGameExtreme.Droid.Resource.Id.content;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.contentPanel = global::TheGameExtreme.Droid.Resource.Id.contentPanel;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.coordinator = global::TheGameExtreme.Droid.Resource.Id.coordinator;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.CTRL = global::TheGameExtreme.Droid.Resource.Id.CTRL;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.custom = global::TheGameExtreme.Droid.Resource.Id.custom;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.customPanel = global::TheGameExtreme.Droid.Resource.Id.customPanel;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.decor_content_parent = global::TheGameExtreme.Droid.Resource.Id.decor_content_parent;
@@ -1263,16 +1259,17 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.enterAlways = global::TheGameExtreme.Droid.Resource.Id.enterAlways;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.enterAlwaysCollapsed = global::TheGameExtreme.Droid.Resource.Id.enterAlwaysCollapsed;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.exitUntilCollapsed = global::TheGameExtreme.Droid.Resource.Id.exitUntilCollapsed;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.expand_activities_button = global::TheGameExtreme.Droid.Resource.Id.expand_activities_button;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.expanded_menu = global::TheGameExtreme.Droid.Resource.Id.expanded_menu;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.expand_activities_button = global::TheGameExtreme.Droid.Resource.Id.expand_activities_button;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.fill = global::TheGameExtreme.Droid.Resource.Id.fill;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.filled = global::TheGameExtreme.Droid.Resource.Id.filled;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.fill_horizontal = global::TheGameExtreme.Droid.Resource.Id.fill_horizontal;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.fill_vertical = global::TheGameExtreme.Droid.Resource.Id.fill_vertical;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.filled = global::TheGameExtreme.Droid.Resource.Id.filled;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.@fixed = global::TheGameExtreme.Droid.Resource.Id.@fixed;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.flyoutcontent_appbar = global::TheGameExtreme.Droid.Resource.Id.flyoutcontent_appbar;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.flyoutcontent_recycler = global::TheGameExtreme.Droid.Resource.Id.flyoutcontent_recycler;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.forever = global::TheGameExtreme.Droid.Resource.Id.forever;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.FUNCTION = global::TheGameExtreme.Droid.Resource.Id.FUNCTION;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.ghost_view = global::TheGameExtreme.Droid.Resource.Id.ghost_view;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.group_divider = global::TheGameExtreme.Droid.Resource.Id.group_divider;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.home = global::TheGameExtreme.Droid.Resource.Id.home;
@@ -1298,6 +1295,7 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.masked = global::TheGameExtreme.Droid.Resource.Id.masked;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.media_actions = global::TheGameExtreme.Droid.Resource.Id.media_actions;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.message = global::TheGameExtreme.Droid.Resource.Id.message;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.META = global::TheGameExtreme.Droid.Resource.Id.META;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.middle = global::TheGameExtreme.Droid.Resource.Id.middle;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.mini = global::TheGameExtreme.Droid.Resource.Id.mini;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.mtrl_child_content_container = global::TheGameExtreme.Droid.Resource.Id.mtrl_child_content_container;
@@ -1326,10 +1324,10 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.save_scale_type = global::TheGameExtreme.Droid.Resource.Id.save_scale_type;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.screen = global::TheGameExtreme.Droid.Resource.Id.screen;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.scroll = global::TheGameExtreme.Droid.Resource.Id.scroll;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.scrollable = global::TheGameExtreme.Droid.Resource.Id.scrollable;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.scrollIndicatorDown = global::TheGameExtreme.Droid.Resource.Id.scrollIndicatorDown;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.scrollIndicatorUp = global::TheGameExtreme.Droid.Resource.Id.scrollIndicatorUp;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.scrollView = global::TheGameExtreme.Droid.Resource.Id.scrollView;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.scrollable = global::TheGameExtreme.Droid.Resource.Id.scrollable;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.search_badge = global::TheGameExtreme.Droid.Resource.Id.search_badge;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.search_bar = global::TheGameExtreme.Droid.Resource.Id.search_bar;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.search_button = global::TheGameExtreme.Droid.Resource.Id.search_button;
@@ -1340,10 +1338,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.search_plate = global::TheGameExtreme.Droid.Resource.Id.search_plate;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.search_src_text = global::TheGameExtreme.Droid.Resource.Id.search_src_text;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.search_voice_btn = global::TheGameExtreme.Droid.Resource.Id.search_voice_btn;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.select_dialog_listview = global::TheGameExtreme.Droid.Resource.Id.select_dialog_listview;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.selected = global::TheGameExtreme.Droid.Resource.Id.selected;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.select_dialog_listview = global::TheGameExtreme.Droid.Resource.Id.select_dialog_listview;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.shellcontent_appbar = global::TheGameExtreme.Droid.Resource.Id.shellcontent_appbar;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.shellcontent_toolbar = global::TheGameExtreme.Droid.Resource.Id.shellcontent_toolbar;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.SHIFT = global::TheGameExtreme.Droid.Resource.Id.SHIFT;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.shortcut = global::TheGameExtreme.Droid.Resource.Id.shortcut;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.showCustom = global::TheGameExtreme.Droid.Resource.Id.showCustom;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.showHome = global::TheGameExtreme.Droid.Resource.Id.showHome;
@@ -1363,19 +1362,20 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Id.stretch = global::TheGameExtreme.Droid.Resource.Id.stretch;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.submenuarrow = global::TheGameExtreme.Droid.Resource.Id.submenuarrow;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.submit_area = global::TheGameExtreme.Droid.Resource.Id.submit_area;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.SYM = global::TheGameExtreme.Droid.Resource.Id.SYM;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.tabMode = global::TheGameExtreme.Droid.Resource.Id.tabMode;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.tag_transition_group = global::TheGameExtreme.Droid.Resource.Id.tag_transition_group;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.tag_unhandled_key_event_manager = global::TheGameExtreme.Droid.Resource.Id.tag_unhandled_key_event_manager;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.tag_unhandled_key_listeners = global::TheGameExtreme.Droid.Resource.Id.tag_unhandled_key_listeners;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.text = global::TheGameExtreme.Droid.Resource.Id.text;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.text2 = global::TheGameExtreme.Droid.Resource.Id.text2;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.textinput_counter = global::TheGameExtreme.Droid.Resource.Id.textinput_counter;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.textinput_error = global::TheGameExtreme.Droid.Resource.Id.textinput_error;
+			global::Xamarin.Forms.Platform.Android.Resource.Id.textinput_helper_text = global::TheGameExtreme.Droid.Resource.Id.textinput_helper_text;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.textSpacerNoButtons = global::TheGameExtreme.Droid.Resource.Id.textSpacerNoButtons;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.textSpacerNoTitle = global::TheGameExtreme.Droid.Resource.Id.textSpacerNoTitle;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.textStart = global::TheGameExtreme.Droid.Resource.Id.textStart;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.text_input_password_toggle = global::TheGameExtreme.Droid.Resource.Id.text_input_password_toggle;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.textinput_counter = global::TheGameExtreme.Droid.Resource.Id.textinput_counter;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.textinput_error = global::TheGameExtreme.Droid.Resource.Id.textinput_error;
-			global::Xamarin.Forms.Platform.Android.Resource.Id.textinput_helper_text = global::TheGameExtreme.Droid.Resource.Id.textinput_helper_text;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.time = global::TheGameExtreme.Droid.Resource.Id.time;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.title = global::TheGameExtreme.Droid.Resource.Id.title;
 			global::Xamarin.Forms.Platform.Android.Resource.Id.titleDividerNoCustom = global::TheGameExtreme.Droid.Resource.Id.titleDividerNoCustom;
@@ -1486,8 +1486,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_action_bar_up_description = global::TheGameExtreme.Droid.Resource.String.abc_action_bar_up_description;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_action_menu_overflow_description = global::TheGameExtreme.Droid.Resource.String.abc_action_menu_overflow_description;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_action_mode_done = global::TheGameExtreme.Droid.Resource.String.abc_action_mode_done;
-			global::Xamarin.Forms.Platform.Android.Resource.String.abc_activity_chooser_view_see_all = global::TheGameExtreme.Droid.Resource.String.abc_activity_chooser_view_see_all;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_activitychooserview_choose_application = global::TheGameExtreme.Droid.Resource.String.abc_activitychooserview_choose_application;
+			global::Xamarin.Forms.Platform.Android.Resource.String.abc_activity_chooser_view_see_all = global::TheGameExtreme.Droid.Resource.String.abc_activity_chooser_view_see_all;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_capital_off = global::TheGameExtreme.Droid.Resource.String.abc_capital_off;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_capital_on = global::TheGameExtreme.Droid.Resource.String.abc_capital_on;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_font_family_body_1_material = global::TheGameExtreme.Droid.Resource.String.abc_font_family_body_1_material;
@@ -1512,12 +1512,12 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_menu_space_shortcut_label = global::TheGameExtreme.Droid.Resource.String.abc_menu_space_shortcut_label;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_menu_sym_shortcut_label = global::TheGameExtreme.Droid.Resource.String.abc_menu_sym_shortcut_label;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_prepend_shortcut_label = global::TheGameExtreme.Droid.Resource.String.abc_prepend_shortcut_label;
-			global::Xamarin.Forms.Platform.Android.Resource.String.abc_search_hint = global::TheGameExtreme.Droid.Resource.String.abc_search_hint;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_searchview_description_clear = global::TheGameExtreme.Droid.Resource.String.abc_searchview_description_clear;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_searchview_description_query = global::TheGameExtreme.Droid.Resource.String.abc_searchview_description_query;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_searchview_description_search = global::TheGameExtreme.Droid.Resource.String.abc_searchview_description_search;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_searchview_description_submit = global::TheGameExtreme.Droid.Resource.String.abc_searchview_description_submit;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_searchview_description_voice = global::TheGameExtreme.Droid.Resource.String.abc_searchview_description_voice;
+			global::Xamarin.Forms.Platform.Android.Resource.String.abc_search_hint = global::TheGameExtreme.Droid.Resource.String.abc_search_hint;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_shareactionprovider_share_with = global::TheGameExtreme.Droid.Resource.String.abc_shareactionprovider_share_with;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_shareactionprovider_share_with_application = global::TheGameExtreme.Droid.Resource.String.abc_shareactionprovider_share_with_application;
 			global::Xamarin.Forms.Platform.Android.Resource.String.abc_toolbar_collapse_description = global::TheGameExtreme.Droid.Resource.String.abc_toolbar_collapse_description;
@@ -1548,8 +1548,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Animation_AppCompat_DropDownUp = global::TheGameExtreme.Droid.Resource.Style.Base_Animation_AppCompat_DropDownUp;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Animation_AppCompat_Tooltip = global::TheGameExtreme.Droid.Resource.Style.Base_Animation_AppCompat_Tooltip;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_CardView = global::TheGameExtreme.Droid.Resource.Style.Base_CardView;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_DialogWindowTitle_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_DialogWindowTitle_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_DialogWindowTitleBackground_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_DialogWindowTitleBackground_AppCompat;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_DialogWindowTitle_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_DialogWindowTitle_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_TextAppearance_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_TextAppearance_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_TextAppearance_AppCompat_Body1 = global::TheGameExtreme.Droid.Resource.Style.Base_TextAppearance_AppCompat_Body1;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_TextAppearance_AppCompat_Body2 = global::TheGameExtreme.Droid.Resource.Style.Base_TextAppearance_AppCompat_Body2;
@@ -1598,46 +1598,48 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = global::TheGameExtreme.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = global::TheGameExtreme.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Title = global::TheGameExtreme.Droid.Resource.Style.Base_TextAppearance_Widget_AppCompat_Toolbar_Title;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_ActionBar = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dark = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dark_ActionBar = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark_ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog_Alert;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Light;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_CompactMenu = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_CompactMenu;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Dialog_FixedSize = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_FixedSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_DarkActionBar = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_DarkActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_Dialog_FixedSize = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_FixedSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_AppCompat_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_AppCompat_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Bridge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_CompactMenu = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_CompactMenu;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Dialog_FixedSize = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Dialog_FixedSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_Bridge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_DarkActionBar = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_DarkActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_DarkActionBar_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog_FixedSize = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog_FixedSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Theme_MaterialComponents_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Base_Theme_MaterialComponents_Light_DialogWhenLarge;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_ActionBar = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_ActionBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dark = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dark_ActionBar = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dark_ActionBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Dialog_Alert;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_AppCompat_Light;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_ThemeOverlay_MaterialComponents_Dialog_Alert;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_Theme_MaterialComponents = global::TheGameExtreme.Droid.Resource.Style.Base_V14_Theme_MaterialComponents;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_Theme_MaterialComponents_Bridge = global::TheGameExtreme.Droid.Resource.Style.Base_V14_Theme_MaterialComponents_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_Theme_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V14_Theme_MaterialComponents_Dialog;
@@ -1645,13 +1647,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_Theme_MaterialComponents_Light_Bridge = global::TheGameExtreme.Droid.Resource.Style.Base_V14_Theme_MaterialComponents_Light_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge = global::TheGameExtreme.Droid.Resource.Style.Base_V14_Theme_MaterialComponents_Light_DarkActionBar_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_Theme_MaterialComponents_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V14_Theme_MaterialComponents_Light_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Base_V14_ThemeOverlay_MaterialComponents_Dialog_Alert;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V21_ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V21_ThemeOverlay_AppCompat_Dialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V21_Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_V21_Theme_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V21_Theme_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V21_Theme_AppCompat_Dialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V21_Theme_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_V21_Theme_AppCompat_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V21_Theme_AppCompat_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V21_Theme_AppCompat_Light_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V21_ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V21_ThemeOverlay_AppCompat_Dialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V22_Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_V22_Theme_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V22_Theme_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_V22_Theme_AppCompat_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V23_Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_V23_Theme_AppCompat;
@@ -1661,11 +1661,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V26_Widget_AppCompat_Toolbar = global::TheGameExtreme.Droid.Resource.Style.Base_V26_Widget_AppCompat_Toolbar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V28_Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_V28_Theme_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V28_Theme_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_V28_Theme_AppCompat_Light;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V7_ThemeOverlay_AppCompat_Dialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Theme_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Theme_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Theme_AppCompat_Dialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Theme_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Theme_AppCompat_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Theme_AppCompat_Light_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Base_V7_ThemeOverlay_AppCompat_Dialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Widget_AppCompat_AutoCompleteTextView = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Widget_AppCompat_AutoCompleteTextView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Widget_AppCompat_EditText = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Widget_AppCompat_EditText;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_V7_Widget_AppCompat_Toolbar = global::TheGameExtreme.Droid.Resource.Style.Base_V7_Widget_AppCompat_Toolbar;
@@ -1681,13 +1681,13 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_ActivityChooserView = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_ActivityChooserView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_AutoCompleteTextView = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_AutoCompleteTextView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_Button = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_Button;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_ButtonBar = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_ButtonBar_AlertDialog = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar_AlertDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_Button_Borderless = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_Button_Borderless;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_Button_Borderless_Colored = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_Button_Borderless_Colored;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_Button_ButtonBar_AlertDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_Button_Colored = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_Button_Colored;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_Button_Small = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_Button_Small;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_ButtonBar = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_ButtonBar_AlertDialog = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_ButtonBar_AlertDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_CompoundButton_CheckBox = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_CheckBox;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_CompoundButton_RadioButton = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_RadioButton;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Base_Widget_AppCompat_CompoundButton_Switch = global::TheGameExtreme.Droid.Resource.Style.Base_Widget_AppCompat_CompoundButton_Switch;
@@ -1733,6 +1733,7 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.CardView = global::TheGameExtreme.Droid.Resource.Style.CardView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.CardView_Dark = global::TheGameExtreme.Droid.Resource.Style.CardView_Dark;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.CardView_Light = global::TheGameExtreme.Droid.Resource.Style.CardView_Light;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.collectionViewStyle = global::TheGameExtreme.Droid.Resource.Style.collectionViewStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Platform_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Platform_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Platform_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Platform_AppCompat_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Platform_MaterialComponents = global::TheGameExtreme.Droid.Resource.Style.Platform_MaterialComponents;
@@ -1756,12 +1757,12 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_Text;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_Title = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_PopupMenuItem_Title;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_SearchView_MagIcon = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_SearchView_MagIcon;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Query = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Query;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_Search_DropDown_Text;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlOverlay_Widget_AppCompat_SearchView_MagIcon = global::TheGameExtreme.Droid.Resource.Style.RtlOverlay_Widget_AppCompat_SearchView_MagIcon;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton = global::TheGameExtreme.Droid.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = global::TheGameExtreme.Droid.Resource.Style.RtlUnderlay_Widget_AppCompat_ActionButton_Overflow;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_AppCompat = global::TheGameExtreme.Droid.Resource.Style.TextAppearance_AppCompat;
@@ -1848,25 +1849,44 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_Widget_AppCompat_ExpandedMenu_Item = global::TheGameExtreme.Droid.Resource.Style.TextAppearance_Widget_AppCompat_ExpandedMenu_Item;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Subtitle = global::TheGameExtreme.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Subtitle;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Title = global::TheGameExtreme.Droid.Resource.Style.TextAppearance_Widget_AppCompat_Toolbar_Title;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dark = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dark_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark_ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dialog_Alert;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Light;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dark = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dark;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dark_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dark_ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dialog_Alert;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Light = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Light;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_CompactMenu = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_CompactMenu;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_DarkActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_DarkActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_Dialog = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DayNight_NoActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DayNight_NoActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_DarkActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_DarkActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_Light_NoActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_Light_NoActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_AppCompat_NoActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_AppCompat_NoActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_Design = global::TheGameExtreme.Droid.Resource.Style.Theme_Design;
@@ -1880,41 +1900,22 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Bridge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_CompactMenu = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_CompactMenu;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_BottomSheetDialog = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_BottomSheetDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_Bridge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_DarkActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_DarkActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_DarkActionBar_Bridge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_DarkActionBar_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_Dialog = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_Dialog;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_Dialog_Alert;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_Dialog_MinWidth = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_Dialog_MinWidth;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_DialogWhenLarge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_DialogWhenLarge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_NoActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_NoActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_Light_NoActionBar_Bridge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_Light_NoActionBar_Bridge;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_NoActionBar = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_NoActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Theme_MaterialComponents_NoActionBar_Bridge = global::TheGameExtreme.Droid.Resource.Style.Theme_MaterialComponents_NoActionBar_Bridge;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_ActionBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dark = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dark_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dark_ActionBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dialog = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Dialog_Alert;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_AppCompat_Light = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_AppCompat_Light;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_ActionBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dark = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dark;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dark_ActionBar = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dark_ActionBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dialog = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dialog;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Dialog_Alert = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Dialog_Alert;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_Light = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_Light;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_FilledBox_Dense;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense = global::TheGameExtreme.Droid.Resource.Style.ThemeOverlay_MaterialComponents_TextInputEditText_OutlinedBox_Dense;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ActionBar = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ActionBar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ActionBar_Solid = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ActionBar_Solid;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ActionBar_TabBar = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ActionBar_TabBar;
@@ -1927,13 +1928,13 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ActivityChooserView = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ActivityChooserView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_AutoCompleteTextView = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_AutoCompleteTextView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_Button = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_Button;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ButtonBar = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ButtonBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ButtonBar_AlertDialog = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ButtonBar_AlertDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_Button_Borderless = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_Button_Borderless;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_Button_Borderless_Colored = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_Button_Borderless_Colored;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_Button_ButtonBar_AlertDialog = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_Button_ButtonBar_AlertDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_Button_Colored = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_Button_Colored;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_Button_Small = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_Button_Small;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ButtonBar = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ButtonBar;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_ButtonBar_AlertDialog = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_ButtonBar_AlertDialog;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_CompoundButton_CheckBox = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_CompoundButton_CheckBox;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_CompoundButton_RadioButton = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_CompoundButton_RadioButton;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_AppCompat_CompoundButton_Switch = global::TheGameExtreme.Droid.Resource.Style.Widget_AppCompat_CompoundButton_Switch;
@@ -2015,11 +2016,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Button_UnelevatedButton = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Button_UnelevatedButton;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Button_UnelevatedButton_Icon = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Button_UnelevatedButton_Icon;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_CardView = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_CardView;
+			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_ChipGroup = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_ChipGroup;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Chip_Action = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Chip_Action;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Chip_Choice = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Chip_Choice;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Chip_Entry = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Chip_Entry;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Chip_Filter = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Chip_Filter;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_ChipGroup = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_ChipGroup;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_FloatingActionButton = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_FloatingActionButton;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_NavigationView = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_NavigationView;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Snackbar = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Snackbar;
@@ -2036,8 +2037,9 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_TextInputLayout_OutlinedBox_Dense;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_MaterialComponents_Toolbar = global::TheGameExtreme.Droid.Resource.Style.Widget_MaterialComponents_Toolbar;
 			global::Xamarin.Forms.Platform.Android.Resource.Style.Widget_Support_CoordinatorLayout = global::TheGameExtreme.Droid.Resource.Style.Widget_Support_CoordinatorLayout;
-			global::Xamarin.Forms.Platform.Android.Resource.Style.collectionViewStyle = global::TheGameExtreme.Droid.Resource.Style.collectionViewStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBarLayout = global::TheGameExtreme.Droid.Resource.Styleable.ActionBarLayout;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBarLayout_android_layout_gravity = global::TheGameExtreme.Droid.Resource.Styleable.ActionBarLayout_android_layout_gravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar_background = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar_background;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar_backgroundSplit = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar_backgroundSplit;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar_backgroundStacked = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar_backgroundStacked;
@@ -2067,8 +2069,6 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar_subtitleTextStyle = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar_subtitleTextStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar_title = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar_title;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBar_titleTextStyle = global::TheGameExtreme.Droid.Resource.Styleable.ActionBar_titleTextStyle;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBarLayout = global::TheGameExtreme.Droid.Resource.Styleable.ActionBarLayout;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionBarLayout_android_layout_gravity = global::TheGameExtreme.Droid.Resource.Styleable.ActionBarLayout_android_layout_gravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionMenuItemView = global::TheGameExtreme.Droid.Resource.Styleable.ActionMenuItemView;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionMenuItemView_android_minWidth = global::TheGameExtreme.Droid.Resource.Styleable.ActionMenuItemView_android_minWidth;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ActionMenuView = global::TheGameExtreme.Droid.Resource.Styleable.ActionMenuView;
@@ -2107,20 +2107,20 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AnimatedStateListDrawableTransition_android_reversible = global::TheGameExtreme.Droid.Resource.Styleable.AnimatedStateListDrawableTransition_android_reversible;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AnimatedStateListDrawableTransition_android_toId = global::TheGameExtreme.Droid.Resource.Styleable.AnimatedStateListDrawableTransition_android_toId;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_android_background = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_android_background;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_android_keyboardNavigationCluster = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_android_keyboardNavigationCluster;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_android_touchscreenBlocksFocus = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_android_touchscreenBlocksFocus;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_elevation = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_elevation;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_expanded = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_expanded;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_liftOnScroll = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_liftOnScroll;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayoutStates = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayoutStates;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayoutStates_state_collapsed = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayoutStates_state_collapsed;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayoutStates_state_collapsible = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayoutStates_state_collapsible;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayoutStates_state_liftable = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayoutStates_state_liftable;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayoutStates_state_lifted = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayoutStates_state_lifted;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_android_background = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_android_background;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_android_keyboardNavigationCluster = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_android_keyboardNavigationCluster;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_android_touchscreenBlocksFocus = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_android_touchscreenBlocksFocus;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_elevation = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_elevation;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_expanded = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_expanded;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_Layout = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_Layout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_Layout_layout_scrollFlags = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_Layout_layout_scrollFlags;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_Layout_layout_scrollInterpolator = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_Layout_layout_scrollInterpolator;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppBarLayout_liftOnScroll = global::TheGameExtreme.Droid.Resource.Styleable.AppBarLayout_liftOnScroll;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatImageView = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatImageView;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatImageView_android_src = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatImageView_android_src;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatImageView_srcCompat = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatImageView_srcCompat;
@@ -2216,8 +2216,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_dialogTheme = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_dialogTheme;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_dividerHorizontal = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_dividerHorizontal;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_dividerVertical = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_dividerVertical;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_dropDownListViewStyle = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_dropDownListViewStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_dropdownListPreferredItemHeight = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_dropdownListPreferredItemHeight;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_dropDownListViewStyle = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_dropDownListViewStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_editTextBackground = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_editTextBackground;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_editTextColor = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_editTextColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.AppCompatTheme_editTextStyle = global::TheGameExtreme.Droid.Resource.Styleable.AppCompatTheme_editTextStyle;
@@ -2313,6 +2313,13 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CardView_contentPaddingRight = global::TheGameExtreme.Droid.Resource.Styleable.CardView_contentPaddingRight;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CardView_contentPaddingTop = global::TheGameExtreme.Droid.Resource.Styleable.CardView_contentPaddingTop;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip = global::TheGameExtreme.Droid.Resource.Styleable.Chip;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_checkedChip = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_checkedChip;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_chipSpacing = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_chipSpacing;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_chipSpacingHorizontal = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_chipSpacingHorizontal;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_chipSpacingVertical = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_chipSpacingVertical;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_singleLine = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_singleLine;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_singleSelection = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_singleSelection;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip_android_checkable = global::TheGameExtreme.Droid.Resource.Styleable.Chip_android_checkable;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip_android_ellipsize = global::TheGameExtreme.Droid.Resource.Styleable.Chip_android_ellipsize;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip_android_maxWidth = global::TheGameExtreme.Droid.Resource.Styleable.Chip_android_maxWidth;
@@ -2347,13 +2354,6 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip_showMotionSpec = global::TheGameExtreme.Droid.Resource.Styleable.Chip_showMotionSpec;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip_textEndPadding = global::TheGameExtreme.Droid.Resource.Styleable.Chip_textEndPadding;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Chip_textStartPadding = global::TheGameExtreme.Droid.Resource.Styleable.Chip_textStartPadding;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_checkedChip = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_checkedChip;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_chipSpacing = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_chipSpacing;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_chipSpacingHorizontal = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_chipSpacingHorizontal;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_chipSpacingVertical = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_chipSpacingVertical;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_singleLine = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_singleLine;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ChipGroup_singleSelection = global::TheGameExtreme.Droid.Resource.Styleable.ChipGroup_singleSelection;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleGravity = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleGravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleTextAppearance = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_collapsedTitleTextAppearance;
@@ -2365,15 +2365,15 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginStart = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginStart;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginTop = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleMarginTop;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_expandedTitleTextAppearance = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_expandedTitleTextAppearance;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_Layout = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_Layout;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseMode = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseMode;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_scrimAnimationDuration = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_scrimAnimationDuration;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_scrimVisibleHeightTrigger = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_scrimVisibleHeightTrigger;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_statusBarScrim = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_statusBarScrim;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_title = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_title;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_titleEnabled = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_titleEnabled;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_toolbarId = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_toolbarId;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_Layout = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_Layout;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseMode = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseMode;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = global::TheGameExtreme.Droid.Resource.Styleable.CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ColorStateListItem = global::TheGameExtreme.Droid.Resource.Styleable.ColorStateListItem;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ColorStateListItem_alpha = global::TheGameExtreme.Droid.Resource.Styleable.ColorStateListItem_alpha;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ColorStateListItem_android_alpha = global::TheGameExtreme.Droid.Resource.Styleable.ColorStateListItem_android_alpha;
@@ -2384,7 +2384,6 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CompoundButton_buttonTintMode = global::TheGameExtreme.Droid.Resource.Styleable.CompoundButton_buttonTintMode;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_keylines = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_keylines;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_Layout = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_Layout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor;
@@ -2393,6 +2392,7 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::TheGameExtreme.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.DesignTheme = global::TheGameExtreme.Droid.Resource.Styleable.DesignTheme;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.DesignTheme_bottomSheetDialogTheme = global::TheGameExtreme.Droid.Resource.Styleable.DesignTheme_bottomSheetDialogTheme;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.DesignTheme_bottomSheetStyle = global::TheGameExtreme.Droid.Resource.Styleable.DesignTheme_bottomSheetStyle;
@@ -2408,6 +2408,8 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_backgroundTint = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_backgroundTint;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_backgroundTintMode = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_backgroundTintMode;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_Behavior_Layout = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_Behavior_Layout;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_Behavior_Layout_behavior_autoHide = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_Behavior_Layout_behavior_autoHide;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_borderWidth = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_borderWidth;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_elevation = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_elevation;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_fabCustomSize = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_fabCustomSize;
@@ -2419,18 +2421,10 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_rippleColor = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_rippleColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_showMotionSpec = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_showMotionSpec;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_useCompatPadding = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_useCompatPadding;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_Behavior_Layout = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_Behavior_Layout;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FloatingActionButton_Behavior_Layout_behavior_autoHide = global::TheGameExtreme.Droid.Resource.Styleable.FloatingActionButton_Behavior_Layout_behavior_autoHide;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FlowLayout = global::TheGameExtreme.Droid.Resource.Styleable.FlowLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FlowLayout_itemSpacing = global::TheGameExtreme.Droid.Resource.Styleable.FlowLayout_itemSpacing;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FlowLayout_lineSpacing = global::TheGameExtreme.Droid.Resource.Styleable.FlowLayout_lineSpacing;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderAuthority = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderAuthority;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderCerts = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderCerts;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderFetchStrategy;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderFetchTimeout;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderPackage = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderPackage;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderQuery = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderQuery;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamilyFont = global::TheGameExtreme.Droid.Resource.Styleable.FontFamilyFont;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamilyFont_android_font = global::TheGameExtreme.Droid.Resource.Styleable.FontFamilyFont_android_font;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamilyFont_android_fontStyle = global::TheGameExtreme.Droid.Resource.Styleable.FontFamilyFont_android_fontStyle;
@@ -2442,11 +2436,20 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamilyFont_fontVariationSettings = global::TheGameExtreme.Droid.Resource.Styleable.FontFamilyFont_fontVariationSettings;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamilyFont_fontWeight = global::TheGameExtreme.Droid.Resource.Styleable.FontFamilyFont_fontWeight;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamilyFont_ttcIndex = global::TheGameExtreme.Droid.Resource.Styleable.FontFamilyFont_ttcIndex;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderAuthority = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderAuthority;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderCerts = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderCerts;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderFetchStrategy;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderFetchTimeout;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderPackage = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderPackage;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.FontFamily_fontProviderQuery = global::TheGameExtreme.Droid.Resource.Styleable.FontFamily_fontProviderQuery;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ForegroundLinearLayout = global::TheGameExtreme.Droid.Resource.Styleable.ForegroundLinearLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ForegroundLinearLayout_android_foreground = global::TheGameExtreme.Droid.Resource.Styleable.ForegroundLinearLayout_android_foreground;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ForegroundLinearLayout_android_foregroundGravity = global::TheGameExtreme.Droid.Resource.Styleable.ForegroundLinearLayout_android_foregroundGravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ForegroundLinearLayout_foregroundInsidePadding = global::TheGameExtreme.Droid.Resource.Styleable.ForegroundLinearLayout_foregroundInsidePadding;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColorItem = global::TheGameExtreme.Droid.Resource.Styleable.GradientColorItem;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColorItem_android_color = global::TheGameExtreme.Droid.Resource.Styleable.GradientColorItem_android_color;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColorItem_android_offset = global::TheGameExtreme.Droid.Resource.Styleable.GradientColorItem_android_offset;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor_android_centerColor = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor_android_centerColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor_android_centerX = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor_android_centerX;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor_android_centerY = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor_android_centerY;
@@ -2459,9 +2462,6 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor_android_startY = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor_android_startY;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor_android_tileMode = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor_android_tileMode;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColor_android_type = global::TheGameExtreme.Droid.Resource.Styleable.GradientColor_android_type;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColorItem = global::TheGameExtreme.Droid.Resource.Styleable.GradientColorItem;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColorItem_android_color = global::TheGameExtreme.Droid.Resource.Styleable.GradientColorItem_android_color;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.GradientColorItem_android_offset = global::TheGameExtreme.Droid.Resource.Styleable.GradientColorItem_android_offset;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_android_baselineAligned = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAligned;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_android_baselineAlignedChildIndex = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_android_baselineAlignedChildIndex;
@@ -2470,13 +2470,13 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_android_weightSum = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_android_weightSum;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_divider = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_divider;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_dividerPadding = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_dividerPadding;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_measureWithLargestChild = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_measureWithLargestChild;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_showDividers = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_showDividers;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_Layout = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_Layout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_gravity = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_gravity;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_height = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_height;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_weight = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_weight;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_width = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_Layout_android_layout_width;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_measureWithLargestChild = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_measureWithLargestChild;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.LinearLayoutCompat_showDividers = global::TheGameExtreme.Droid.Resource.Styleable.LinearLayoutCompat_showDividers;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ListPopupWindow = global::TheGameExtreme.Droid.Resource.Styleable.ListPopupWindow;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ListPopupWindow_android_dropDownHorizontalOffset = global::TheGameExtreme.Droid.Resource.Styleable.ListPopupWindow_android_dropDownHorizontalOffset;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ListPopupWindow_android_dropDownVerticalOffset = global::TheGameExtreme.Droid.Resource.Styleable.ListPopupWindow_android_dropDownVerticalOffset;
@@ -2588,11 +2588,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.NavigationView_itemTextColor = global::TheGameExtreme.Droid.Resource.Styleable.NavigationView_itemTextColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.NavigationView_menu = global::TheGameExtreme.Droid.Resource.Styleable.NavigationView_menu;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindow = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindow;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindowBackgroundState = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindowBackgroundState;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindowBackgroundState_state_above_anchor = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindowBackgroundState_state_above_anchor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindow_android_popupAnimationStyle = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindow_android_popupAnimationStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindow_android_popupBackground = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindow_android_popupBackground;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindow_overlapAnchor = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindow_overlapAnchor;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindowBackgroundState = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindowBackgroundState;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.PopupWindowBackgroundState_state_above_anchor = global::TheGameExtreme.Droid.Resource.Styleable.PopupWindowBackgroundState_state_above_anchor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.RecycleListView = global::TheGameExtreme.Droid.Resource.Styleable.RecycleListView;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.RecycleListView_paddingBottomNoButtons = global::TheGameExtreme.Droid.Resource.Styleable.RecycleListView_paddingBottomNoButtons;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.RecycleListView_paddingTopNoTitle = global::TheGameExtreme.Droid.Resource.Styleable.RecycleListView_paddingTopNoTitle;
@@ -2631,12 +2631,12 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SearchView_suggestionRowLayout = global::TheGameExtreme.Droid.Resource.Styleable.SearchView_suggestionRowLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SearchView_voiceIcon = global::TheGameExtreme.Droid.Resource.Styleable.SearchView_voiceIcon;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Snackbar = global::TheGameExtreme.Droid.Resource.Styleable.Snackbar;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Snackbar_snackbarButtonStyle = global::TheGameExtreme.Droid.Resource.Styleable.Snackbar_snackbarButtonStyle;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Snackbar_snackbarStyle = global::TheGameExtreme.Droid.Resource.Styleable.Snackbar_snackbarStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SnackbarLayout = global::TheGameExtreme.Droid.Resource.Styleable.SnackbarLayout;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SnackbarLayout_android_maxWidth = global::TheGameExtreme.Droid.Resource.Styleable.SnackbarLayout_android_maxWidth;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SnackbarLayout_elevation = global::TheGameExtreme.Droid.Resource.Styleable.SnackbarLayout_elevation;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SnackbarLayout_maxActionInlineWidth = global::TheGameExtreme.Droid.Resource.Styleable.SnackbarLayout_maxActionInlineWidth;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Snackbar_snackbarButtonStyle = global::TheGameExtreme.Droid.Resource.Styleable.Snackbar_snackbarButtonStyle;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Snackbar_snackbarStyle = global::TheGameExtreme.Droid.Resource.Styleable.Snackbar_snackbarStyle;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Spinner = global::TheGameExtreme.Droid.Resource.Styleable.Spinner;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Spinner_android_dropDownWidth = global::TheGameExtreme.Droid.Resource.Styleable.Spinner_android_dropDownWidth;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Spinner_android_entries = global::TheGameExtreme.Droid.Resource.Styleable.Spinner_android_entries;
@@ -2644,14 +2644,14 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Spinner_android_prompt = global::TheGameExtreme.Droid.Resource.Styleable.Spinner_android_prompt;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Spinner_popupTheme = global::TheGameExtreme.Droid.Resource.Styleable.Spinner_popupTheme;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawableItem = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawableItem;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawableItem_android_drawable = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawableItem_android_drawable;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable_android_constantSize = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable_android_constantSize;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable_android_dither = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable_android_dither;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable_android_enterFadeDuration = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable_android_enterFadeDuration;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable_android_exitFadeDuration = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable_android_exitFadeDuration;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable_android_variablePadding = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable_android_variablePadding;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawable_android_visible = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawable_android_visible;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawableItem = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawableItem;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.StateListDrawableItem_android_drawable = global::TheGameExtreme.Droid.Resource.Styleable.StateListDrawableItem_android_drawable;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SwitchCompat = global::TheGameExtreme.Droid.Resource.Styleable.SwitchCompat;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SwitchCompat_android_textOff = global::TheGameExtreme.Droid.Resource.Styleable.SwitchCompat_android_textOff;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.SwitchCompat_android_textOn = global::TheGameExtreme.Droid.Resource.Styleable.SwitchCompat_android_textOn;
@@ -2769,17 +2769,12 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMargin = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMargin;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMarginBottom = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMarginBottom;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMarginEnd = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMarginEnd;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMargins = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMargins;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMarginStart = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMarginStart;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMarginTop = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMarginTop;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleMargins = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleMargins;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleTextAppearance = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleTextAppearance;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.Toolbar_titleTextColor = global::TheGameExtreme.Droid.Resource.Styleable.Toolbar_titleTextColor;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View = global::TheGameExtreme.Droid.Resource.Styleable.View;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_android_focusable = global::TheGameExtreme.Droid.Resource.Styleable.View_android_focusable;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_android_theme = global::TheGameExtreme.Droid.Resource.Styleable.View_android_theme;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_paddingEnd = global::TheGameExtreme.Droid.Resource.Styleable.View_paddingEnd;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_paddingStart = global::TheGameExtreme.Droid.Resource.Styleable.View_paddingStart;
-			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_theme = global::TheGameExtreme.Droid.Resource.Styleable.View_theme;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ViewBackgroundHelper = global::TheGameExtreme.Droid.Resource.Styleable.ViewBackgroundHelper;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ViewBackgroundHelper_android_background = global::TheGameExtreme.Droid.Resource.Styleable.ViewBackgroundHelper_android_background;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ViewBackgroundHelper_backgroundTint = global::TheGameExtreme.Droid.Resource.Styleable.ViewBackgroundHelper_backgroundTint;
@@ -2788,6 +2783,11 @@ namespace TheGameExtreme.Droid
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ViewStubCompat_android_id = global::TheGameExtreme.Droid.Resource.Styleable.ViewStubCompat_android_id;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ViewStubCompat_android_inflatedId = global::TheGameExtreme.Droid.Resource.Styleable.ViewStubCompat_android_inflatedId;
 			global::Xamarin.Forms.Platform.Android.Resource.Styleable.ViewStubCompat_android_layout = global::TheGameExtreme.Droid.Resource.Styleable.ViewStubCompat_android_layout;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_android_focusable = global::TheGameExtreme.Droid.Resource.Styleable.View_android_focusable;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_android_theme = global::TheGameExtreme.Droid.Resource.Styleable.View_android_theme;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_paddingEnd = global::TheGameExtreme.Droid.Resource.Styleable.View_paddingEnd;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_paddingStart = global::TheGameExtreme.Droid.Resource.Styleable.View_paddingStart;
+			global::Xamarin.Forms.Platform.Android.Resource.Styleable.View_theme = global::TheGameExtreme.Droid.Resource.Styleable.View_theme;
 		}
 		
 		public partial class Animation
diff --git a/TheGameExtreme.Android/Resources/values/styles.xml b/TheGameExtreme.Android/Resources/values/styles.xml
index 088e449..390dd67 100644
--- a/TheGameExtreme.Android/Resources/values/styles.xml
+++ b/TheGameExtreme.Android/Resources/values/styles.xml
@@ -3,7 +3,7 @@
     <style name="MainTheme" parent="MainTheme.Base">
     </style>
     <!-- Base theme applied no matter what API -->
-    <style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="MainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
         <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
         <item name="windowNoTitle">true</item>
         <!--We will be using the toolbar so no need to show ActionBar-->
diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj b/TheGameExtreme.Android/TheGameExtreme.Android.csproj
index 2577a26..30481dc 100644
--- a/TheGameExtreme.Android/TheGameExtreme.Android.csproj
+++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj
@@ -57,20 +57,17 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client">
-      <Version>3.1.0</Version>
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
+    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="TouchTracking.Forms">
+      <Version>1.1.0</Version>
     </PackageReference>
-    <PackageReference Include="Rg.Plugins.Popup">
-      <Version>1.2.0.223</Version>
+    <PackageReference Include="MvvmCross">
+      <Version>6.4.1</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
-    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
     <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.68.0</Version>
-    </PackageReference>
-    <PackageReference Include="TouchTracking.Forms">
-      <Version>1.1.0</Version>
+      <Version>1.68.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj.orig b/TheGameExtreme.Android/TheGameExtreme.Android.csproj.orig
new file mode 100644
index 0000000..d5db279
--- /dev/null
+++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj.orig
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{DD6C4FD6-058C-41F9-824F-84DABA5DD444}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>TheGameExtreme.Droid</RootNamespace>
+    <AssemblyName>TheGameExtreme.Android</AssemblyName>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <MandroidI18n />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <MandroidI18n />
+    <AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86_64;x86</AndroidSupportedAbis>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android.Export" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors" />
+  </ItemGroup>
+  <ItemGroup>
+<<<<<<< HEAD
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client">
+      <Version>3.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Rg.Plugins.Popup">
+      <Version>1.2.0.223</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
+    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
+    <PackageReference Include="SkiaSharp.Views.Forms">
+      <Version>1.68.0</Version>
+    </PackageReference>
+=======
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
+    <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
+    <PackageReference Include="TouchTracking.Forms">
+      <Version>1.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="MvvmCross">
+      <Version>6.4.1</Version>
+    </PackageReference>
+    <PackageReference Include="SkiaSharp.Views.Forms">
+      <Version>1.68.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
+    <AndroidResource Include="Resources\drawable\FontStyle\IndieFlower.ttf" />
+    <AndroidResource Include="Resources\drawable\FontStyle\LicenceFont.pdf" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\Tabbar.xml" />
+    <AndroidResource Include="Resources\layout\Toolbar.xml" />
+    <AndroidResource Include="Resources\values\styles.xml" />
+    <AndroidResource Include="Resources\values\colors.xml" />
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
+    <AndroidResource Include="Resources\mipmap-hdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TheGameExtreme\TheGameExtreme.csproj">
+      <Project>{8DE6C881-FF77-4CC4-B8C4-CDEDD9AB13B3}</Project>
+      <Name>TheGameExtreme</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\FontStyle\SIL_Open_Font_License.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Assets\fonts\" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\EngrenageV1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\ArrowSettingsBack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\HomeIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\TrierImageB.png">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\LuneSombreTheme.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\PointI.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\GMOS.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\Imagetirer1a6.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\UpDownStacks.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\soleil.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\Elsole.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/TheGameExtreme.iOS/AppDelegate.cs b/TheGameExtreme.iOS/AppDelegate.cs
index c99c47a..6dffecf 100644
--- a/TheGameExtreme.iOS/AppDelegate.cs
+++ b/TheGameExtreme.iOS/AppDelegate.cs
@@ -19,7 +19,6 @@ namespace TheGameExtreme.iOS
 
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
-            Rg.Plugins.Popup.Popup.Init();
             global::Xamarin.Forms.Forms.Init();
             var _ = new TouchTracking.Forms.iOS.TouchEffect();
             LoadApplication(new App());
diff --git a/TheGameExtreme.iOS/Info.plist b/TheGameExtreme.iOS/Info.plist
index 35732d1..b2fd2c5 100644
--- a/TheGameExtreme.iOS/Info.plist
+++ b/TheGameExtreme.iOS/Info.plist
@@ -14,8 +14,6 @@
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
@@ -27,8 +25,6 @@
 	<string>8.0</string>
 	<key>CFBundleDisplayName</key>
 	<string>OrderStacks</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>XSAppIconAssets</key>
@@ -37,7 +33,9 @@
 	<string>OrderStacks</string>
 	<key>CFBundleIdentifier</key>
 	<string>fr.iut.clermont.orderstacks</string>
+	<key>CFBundleVersion</key>
+	<string>1.1.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.0</string>
 </dict>
 </plist>
diff --git a/TheGameExtreme.iOS/OrderStacks.csproj b/TheGameExtreme.iOS/OrderStacks.csproj
index 0ac6f4b..d463e16 100644
--- a/TheGameExtreme.iOS/OrderStacks.csproj
+++ b/TheGameExtreme.iOS/OrderStacks.csproj
@@ -152,17 +152,14 @@
     <PackageReference Include="MvvmCross.Plugin.BLE">
       <Version>2.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Rg.Plugins.Popup">
-      <Version>1.2.0.223</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
-    <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.68.0</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
     <PackageReference Include="TouchTracking.Forms">
       <Version>1.1.0</Version>
     </PackageReference>
+    <PackageReference Include="SkiaSharp.Views.Forms">
+      <Version>1.68.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
@@ -187,7 +184,6 @@
     <BundleResource Include="Resources\UpDownStacks.png" />
     <BundleResource Include="Resources\soleil.png" />
     <BundleResource Include="Resources\Elsole.png" />
-    <Content Include="TrierImageB.ico" />
   </ItemGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/TheGameExtreme.iOS/OrderStacks.csproj.orig b/TheGameExtreme.iOS/OrderStacks.csproj.orig
index 055a6c4..b90af58 100644
--- a/TheGameExtreme.iOS/OrderStacks.csproj.orig
+++ b/TheGameExtreme.iOS/OrderStacks.csproj.orig
@@ -76,16 +76,9 @@
     <None Include="Entitlements.plist" />
     <None Include="Info.plist" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <BundleResource Include="Resources\FontStyle\IndieFlower.ttf" />
-    <BundleResource Include="Resources\FontStyle\ENSOTYPE License &amp; FAQ - DO READ THIS!.pdf" />
-    <BundleResource Include="Resources\FontStyle\Ruhaniyat DEMO.otf" />
-    <BundleResource Include="Resources\EngrenageV1.png" />
-    <BundleResource Include="Resources\imagesRules.png" />
-    <BundleResource Include="Resources\TrierImageB.ico" />
     <BundleResource Include="TrierImageB.ico" />
   </ItemGroup>
   <ItemGroup>
-    <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
       <Visible>false</Visible>
     </ImageAsset>
@@ -153,20 +146,20 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client">
+      <Version>3.1.0</Version>
+    </PackageReference>
     <PackageReference Include="MvvmCross.Plugin.BLE">
       <Version>2.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Rg.Plugins.Popup">
-      <Version>1.2.0.223</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.2.0.709249" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
-    <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.68.0</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
     <PackageReference Include="TouchTracking.Forms">
       <Version>1.1.0</Version>
     </PackageReference>
+    <PackageReference Include="SkiaSharp.Views.Forms">
+      <Version>1.68.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
@@ -176,20 +169,26 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\FontStyle\SIL Open Font License.txt" />
+    <ITunesArtwork Include="iTunesArtwork" />
+    <ITunesArtwork Include="iTunesArtwork%402x" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\ArrowSettingsBack.png" />
+    <BundleResource Include="Resources\EngrenageV1.png" />
+    <BundleResource Include="Resources\GMOS.png" />
     <BundleResource Include="Resources\HomeIcon.png" />
-  </ItemGroup>
-  <ItemGroup>
-<<<<<<< HEAD:TheGameExtreme.iOS/TheGameExtreme.iOS.csproj
-    <BundleResource Include="Resources\SoleilThemes.png" />
+    <BundleResource Include="Resources\Imagetirer1a6.png" />
     <BundleResource Include="Resources\LuneSombreTheme.png" />
+    <BundleResource Include="Resources\PointI.png" />
+    <BundleResource Include="Resources\TrierImageB.png" />
+<<<<<<< HEAD
+    <BundleResource Include="Resources\UpDownStacks.png" />
+    <BundleResource Include="Resources\soleil.png" />
+    <BundleResource Include="Resources\Elsole.png" />
     <Content Include="TrierImageB.ico" />
 =======
-    <ITunesArtwork Include="iTunesArtwork" />
-    <ITunesArtwork Include="iTunesArtwork%402x" />
->>>>>>> 3badad823975148fed6467984295274bc7006685:TheGameExtreme.iOS/OrderStacks.csproj
+    <BundleResource Include="Resources\ExempleJeu.png" />
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
   </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/TheGameExtreme.iOS/Properties/AssemblyInfo.cs b/TheGameExtreme.iOS/Properties/AssemblyInfo.cs
index 47dfb04..0154587 100644
--- a/TheGameExtreme.iOS/Properties/AssemblyInfo.cs
+++ b/TheGameExtreme.iOS/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xamarin.Forms;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -34,3 +35,5 @@ using System.Runtime.InteropServices;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ExportRenderer(typeof(WebView), typeof(Xamarin.Forms.Platform.iOS.WkWebViewRenderer))]
+//[assembly: ExportRenderer(typeof(WebView), typeof(Xamarin.Forms.Platform.iOS.WebViewRenderer))]
diff --git a/TheGameExtreme/Resx/AppResources.Designer.cs b/TheGameExtreme/Resx/AppResources.Designer.cs
index a8525da..c7c8c86 100644
--- a/TheGameExtreme/Resx/AppResources.Designer.cs
+++ b/TheGameExtreme/Resx/AppResources.Designer.cs
@@ -1,57 +1,44 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Ce code a été généré par un outil.
-//     Version du runtime :4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-//     le code est régénéré.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace TheGameExtreme.Resx {
     using System;
+    using System.Reflection;
     
     
-    /// <summary>
-    ///   Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
-    /// </summary>
-    // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
-    // à l'aide d'un outil, tel que ResGen ou Visual Studio.
-    // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
-    // avec l'option /str ou régénérez votre projet VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class AppResources {
         
-        private static global::System.Resources.ResourceManager resourceMan;
+        private static System.Resources.ResourceManager resourceMan;
         
-        private static global::System.Globalization.CultureInfo resourceCulture;
+        private static System.Globalization.CultureInfo resourceCulture;
         
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal AppResources() {
         }
         
-        /// <summary>
-        ///   Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static System.Resources.ResourceManager ResourceManager {
             get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TheGameExtreme.Resx.AppResources", typeof(AppResources).Assembly);
+                if (object.Equals(null, resourceMan)) {
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("TheGameExtreme.Resx.AppResources", typeof(AppResources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
         
-        /// <summary>
-        ///   Remplace la propriété CurrentUICulture du thread actuel pour toutes
-        ///   les recherches de ressources à l'aide de cette classe de ressource fortement typée.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -60,179 +47,114 @@ namespace TheGameExtreme.Resx {
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à OrderStacks 
-        ///
-        ///A votre disposition, un mode de jeu en local, jouable jusqu&apos;à 5 joueurs.
-        /// 
-        ///Un mode multijoueur en cours de développement. 
-        ///
-        ///Une présentation des règles du jeu.
-        ///
-        ///Une possibilité de changer le thème de l&apos;application grâce aux images du soleil et lune..
-        /// </summary>
         public static string StrAbout {
             get {
                 return ResourceManager.GetString("StrAbout", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Pile ascendante.
-        /// </summary>
         public static string StrAcendingStack {
             get {
                 return ResourceManager.GetString("StrAcendingStack", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Jouer.
-        /// </summary>
         public static string StrBtnPlay {
             get {
                 return ResourceManager.GetString("StrBtnPlay", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à La pile n&apos;est pas disponnible.
-        /// </summary>
         public static string StrCantGetStack {
             get {
                 return ResourceManager.GetString("StrCantGetStack", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à La carte n&apos;existe pas .
-        /// </summary>
         public static string StrCardDoesntExist {
             get {
                 return ResourceManager.GetString("StrCardDoesntExist", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Vous devez jouer au minimum deux cartes par tour.
-        /// </summary>
         public static string StrCardPlayedLessThanTwo {
             get {
                 return ResourceManager.GetString("StrCardPlayedLessThanTwo", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Fermer.
-        /// </summary>
         public static string StrCloseWind {
             get {
                 return ResourceManager.GetString("StrCloseWind", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Pile descendante.
-        /// </summary>
         public static string StrDownStack {
             get {
                 return ResourceManager.GetString("StrDownStack", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Fin  de tour.
-        /// </summary>
         public static string StrEndTurn {
             get {
                 return ResourceManager.GetString("StrEndTurn", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Entrez votre pseudo.
-        /// </summary>
         public static string StrEnterPseudo {
             get {
                 return ResourceManager.GetString("StrEnterPseudo", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à A propos.
-        /// </summary>
         public static string StrInfo {
             get {
                 return ResourceManager.GetString("StrInfo", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à La partie est terminée.
-        /// </summary>
         public static string String3 {
             get {
                 return ResourceManager.GetString("String3", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Bravo vous avez gagné!.
-        /// </summary>
         public static string String4 {
             get {
                 return ResourceManager.GetString("String4", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Jeu en local.
-        /// </summary>
         public static string StrLocalGame {
             get {
                 return ResourceManager.GetString("StrLocalGame", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à .
-        /// </summary>
         public static string StrLose {
             get {
                 return ResourceManager.GetString("StrLose", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Multijoueur.
-        /// </summary>
         public static string StrMultiplayer {
             get {
                 return ResourceManager.GetString("StrMultiplayer", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Nombre de cartes :.
-        /// </summary>
         public static string StrNbCards {
             get {
                 return ResourceManager.GetString("StrNbCards", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Nombre de joueurs :.
-        /// </summary>
         public static string StrNbPlayers {
             get {
                 return ResourceManager.GetString("StrNbPlayers", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Nombre de piles en jeu :.
-        /// </summary>
         public static string StrNbStacksInGame {
             get {
                 return ResourceManager.GetString("StrNbStacksInGame", resourceCulture);
@@ -257,18 +179,12 @@ namespace TheGameExtreme.Resx {
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Entrez votre pseudo :.
-        /// </summary>
         public static string StrPseudoGM {
             get {
                 return ResourceManager.GetString("StrPseudoGM", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Rejouer.
-        /// </summary>
         public static string StrRetry {
             get {
                 return ResourceManager.GetString("StrRetry", resourceCulture);
@@ -403,108 +319,72 @@ namespace TheGameExtreme.Resx {
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Règles.
-        /// </summary>
         public static string StrTitleRules {
             get {
                 return ResourceManager.GetString("StrTitleRules", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Jouer avec des valeurs :.
-        /// </summary>
         public static string StrValueType {
             get {
                 return ResourceManager.GetString("StrValueType", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Félicitation vous avez gagné.
-        /// </summary>
         public static string StrWin {
             get {
                 return ResourceManager.GetString("StrWin", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à La carte choisie ne convient pas.
-        /// </summary>
         public static string StrWrongStack {
             get {
                 return ResourceManager.GetString("StrWrongStack", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Fractionnées.
-        /// </summary>
         public static string TypeValuefractionated {
             get {
                 return ResourceManager.GetString("TypeValuefractionated", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Décimales (2 chiffres).
-        /// </summary>
         public static string TypeValuehundredth {
             get {
                 return ResourceManager.GetString("TypeValuehundredth", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Relatives.
-        /// </summary>
         public static string TypeValueRelative {
             get {
                 return ResourceManager.GetString("TypeValueRelative", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Décimales (1 chiffre).
-        /// </summary>
         public static string TypeValueTens {
             get {
                 return ResourceManager.GetString("TypeValueTens", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Décimales (3 chiffres).
-        /// </summary>
         public static string TypeValuethousandth {
             get {
                 return ResourceManager.GetString("TypeValuethousandth", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Entière.
-        /// </summary>
         public static string TypeValueWhole {
             get {
                 return ResourceManager.GetString("TypeValueWhole", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Thème clair :.
-        /// </summary>
         public static string WhiteTheme {
             get {
                 return ResourceManager.GetString("WhiteTheme", resourceCulture);
             }
         }
         
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Erreur pseudo :.
-        /// </summary>
         public static string WrongPseudo {
             get {
                 return ResourceManager.GetString("WrongPseudo", resourceCulture);
diff --git a/TheGameExtreme/Resx/AppResources.Designer.cs.orig b/TheGameExtreme/Resx/AppResources.Designer.cs.orig
index abbc9be..578d013 100644
--- a/TheGameExtreme/Resx/AppResources.Designer.cs.orig
+++ b/TheGameExtreme/Resx/AppResources.Designer.cs.orig
@@ -47,6 +47,12 @@ namespace TheGameExtreme.Resx {
             }
         }
         
+        public static string StrAbout {
+            get {
+                return ResourceManager.GetString("StrAbout", resourceCulture);
+            }
+        }
+        
         public static string StrAcendingStack {
             get {
                 return ResourceManager.GetString("StrAcendingStack", resourceCulture);
@@ -101,6 +107,12 @@ namespace TheGameExtreme.Resx {
             }
         }
         
+        public static string StrInfo {
+            get {
+                return ResourceManager.GetString("StrInfo", resourceCulture);
+            }
+        }
+        
         public static string String3 {
             get {
                 return ResourceManager.GetString("String3", resourceCulture);
@@ -149,6 +161,21 @@ namespace TheGameExtreme.Resx {
             }
         }
         
+<<<<<<< HEAD
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Suivant.
+        /// </summary>
+        public static string StrNext {
+            get {
+                return ResourceManager.GetString("StrNext", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à  Veuillez choisir un nombre de joueur ainsi que leur(s) nom(s).
+        /// </summary>
+=======
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
         public static string StrPlayerSelections {
             get {
                 return ResourceManager.GetString("StrPlayerSelections", resourceCulture);
@@ -161,23 +188,132 @@ namespace TheGameExtreme.Resx {
             }
         }
         
+        public static string StrRetry {
+            get {
+                return ResourceManager.GetString("StrRetry", resourceCulture);
+            }
+        }
+        
 <<<<<<< HEAD
         /// <summary>
-        ///   Recherche une chaîne localisée semblable à     - L&apos;objectif est de battre la machine seul et/ou en coopération.
-        ///
-        ///    - Afin d&apos;atteindre l&apos;objectif, les joueurs disposent de 4 piles (par defaut) : deux ascendantes(Verte) et deux descendantes(Rouge).
-        ///
-        ///    - Sur les piles ascendantes, le joueur doit bien entendu poser des cartes plus grandes et inversement sur les piles descendantes.
-        ///
-        ///    - Le but est de poser les 98 cartes du jeu sur les différentes piles à votre disposition.
-        ///      (Pour ce faire confer les règles de tour de jeu ci-dessous)
-        ///   [le reste de la chaîne a été tronqué]&quot;;.
+        ///   Recherche une chaîne localisée semblable à - L&apos;objectif est de battre la machine seul et/ou en coopération..
+        /// </summary>
+        public static string StrTiret1 {
+            get {
+                return ResourceManager.GetString("StrTiret1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Une fois votre tour terminé, vous appuyez sur le boutton &quot;Fin de tour&quot; afin de passer au joueur suivant..
+        /// </summary>
+        public static string StrTiret10 {
+            get {
+                return ResourceManager.GetString("StrTiret10", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - La partie est finie quand toutes les cartes sont jouées ou quand le joueur dont c&apos;est le tour ne peut plus jouer..
+        /// </summary>
+        public static string StrTiret11 {
+            get {
+                return ResourceManager.GetString("StrTiret11", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Afin de préparer la partie, vous disposez d&apos;un écran permettant de choisir le nombre de joueur et leur pseudo, le type de jeu auquels vous souhaitez jouer et enfin le nombre de piles pour jouer..
+        /// </summary>
+        public static string StrTiret12 {
+            get {
+                return ResourceManager.GetString("StrTiret12", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Le type de jeu permet de définir les valeurs présentent sur les cartes. Vous pouvez jouer avec des valeurs entières, relatives, décimales (1 chiffre), décimales (2 chiffres), décimales (3 chiffres) et avec des fractions décimales.
+        /// </summary>
+        public static string StrTiret13 {
+            get {
+                return ResourceManager.GetString("StrTiret13", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Afin d&apos;atteindre l&apos;objectif, les joueurs disposent de 4 piles (par défaut): deux piles ascendantes vertes et deux piles descendantes rouges..
+        /// </summary>
+        public static string StrTiret2 {
+            get {
+                return ResourceManager.GetString("StrTiret2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Sur les piles ascendantes, le joueur doit poser des cartes plus grandes et inversement sur les piles descendantes..
+        /// </summary>
+        public static string StrTiret3 {
+            get {
+                return ResourceManager.GetString("StrTiret3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Le but est de poser les 98 cartes du jeu sur les différentes piles à votre disposition..
+        /// </summary>
+        public static string StrTiret4 {
+            get {
+                return ResourceManager.GetString("StrTiret4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Pour jouer, il suffit de faire glisser une carte sur la pile que vous avez décidé..
+        /// </summary>
+        public static string StrTiret5 {
+            get {
+                return ResourceManager.GetString("StrTiret5", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Cette carte doit être plus grande que celle déjà présente s&apos;il s&apos;agit d&apos;une pile ascendante et plus petite si c&apos;est l&apos;inverse..
+        /// </summary>
+        public static string StrTiret6 {
+            get {
+                return ResourceManager.GetString("StrTiret6", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Il est possible de poser une carte plus petite sur une pile ascendante à condition que ce soit d&apos;&apos;une dizaine inférieur. De la même manière, si la carte est plus grande d&apos;une dizaine, il est possible de la poser sur une pile descendante..
+        /// </summary>
+        public static string StrTiret7 {
+            get {
+                return ResourceManager.GetString("StrTiret7", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Ex : Sur une pile descendante, nous avons 22 =&gt; Nous pouvons alors poser 32.
+        ///    Sur une pile ascendante, nous avons 16 =&gt; Nous pouvons poser 6..
+        /// </summary>
+        public static string StrTiret8 {
+            get {
+                return ResourceManager.GetString("StrTiret8", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à - Chaque joueur doit jouer au minimum deux cartes par tour.
+        ///    Il n&apos;y a donc aucune limite maximale de carte à jouer par tour. Cependant, il est conseillé dans la plupart des cas de ne pas jouer toutes les cartes en sa possessions..
         /// </summary>
+        public static string StrTiret9 {
 =======
->>>>>>> 3badad823975148fed6467984295274bc7006685
         public static string StrRules {
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
             get {
-                return ResourceManager.GetString("StrRules", resourceCulture);
+                return ResourceManager.GetString("StrTiret9", resourceCulture);
             }
         }
         
diff --git a/TheGameExtreme/Resx/AppResources.resx b/TheGameExtreme/Resx/AppResources.resx
index fdbb327..81da45d 100644
--- a/TheGameExtreme/Resx/AppResources.resx
+++ b/TheGameExtreme/Resx/AppResources.resx
@@ -177,7 +177,7 @@ Une possibilité de changer le thème de l'application grâce aux images du sole
     <value>Nombre de cartes :</value>
   </data>
   <data name="StrNbPlayers" xml:space="preserve">
-    <value>Nombre de joueurs :</value>
+    <value>Joueurs :</value>
   </data>
   <data name="StrNbStacksInGame" xml:space="preserve">
     <value>Nombre de piles en jeu :</value>
@@ -242,7 +242,7 @@ Une possibilité de changer le thème de l'application grâce aux images du sole
     <value>Règles</value>
   </data>
   <data name="StrValueType" xml:space="preserve">
-    <value>Jouer avec des valeurs :</value>
+    <value>Valeurs :</value>
   </data>
   <data name="StrWin" xml:space="preserve">
     <value>Félicitation vous avez gagné</value>
diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj
index 7845a7c..19febeb 100644
--- a/TheGameExtreme/TheGameExtreme.csproj
+++ b/TheGameExtreme/TheGameExtreme.csproj
@@ -10,12 +10,11 @@
     <PackageReference Include="MvvmCross" Version="6.4.1" />
     <PackageReference Include="MvvmCross.Plugin.BLE" Version="2.1.1" />
     <PackageReference Include="Plugin.BLE" Version="2.1.1" />
-    <PackageReference Include="Rg.Plugins.Popup" Version="1.2.0.223" />
-    <PackageReference Include="System.Drawing.Common" Version="4.6.1" />
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.1" />
     <PackageReference Include="TouchTracking.Forms" Version="1.1.0" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="model\event\" />
@@ -84,7 +83,7 @@
     <EmbeddedResource Update="view\secondePageRules.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="view\Testconnectivité.xaml">
+    <EmbeddedResource Update="view\Testconnectivité.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/TheGameExtreme/TheGameExtreme.csproj.orig b/TheGameExtreme/TheGameExtreme.csproj.orig
new file mode 100644
index 0000000..8300e07
--- /dev/null
+++ b/TheGameExtreme/TheGameExtreme.csproj.orig
@@ -0,0 +1,105 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>    
+  </PropertyGroup>
+
+  <ItemGroup>
+<<<<<<< HEAD
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
+    <PackageReference Include="MvvmCross" Version="6.4.1" />
+=======
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
+    <PackageReference Include="MvvmCross.Plugin.BLE" Version="2.1.1" />
+    <PackageReference Include="Plugin.BLE" Version="2.1.1" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="TouchTracking.Forms" Version="1.1.0" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="model\event\" />
+    <Folder Include="viewmodel\" />
+    <Folder Include="model\card\" />
+    <Folder Include="model\deck\" />
+    <Folder Include="model\Card\rapidCard\" />
+    <Folder Include="model\gameActions\" />
+    <Folder Include="model\gameActions\extreme\" />
+    <Folder Include="model\gameActions\classic\" />
+    <Folder Include="Media\" />
+    <Folder Include="model\card\cardType\" />
+    <Folder Include="model\piles\" />
+    <Folder Include="model\gameActions\decimals\" />
+    <Folder Include="model\gameActions\abstractRules\" />
+    <Folder Include="model\gameActions\fraction\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="model\effect\StopColm.cs" />
+    <Compile Remove="model\effect\StopCom.cs" />
+    <Compile Remove="model\manager.cs" />
+    <Compile Remove="model\manager\GameManagerSolo.cs" />
+    <Compile Remove="view\AppRessources.Designer.cs" />
+    <Compile Remove="view\AppRessources-br.Designer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="AppRessources.config" />
+    <None Remove="view\MultiPlayerMode.xaml" />
+    <None Remove="Media\thegame.jpg" />
+    <None Remove="Media\Engrenage.jpeg" />
+    <None Remove="Media\moon.jpg" />
+    <None Remove="AppRessources-br.Designer.cs.orig" />
+    <None Remove="Media\TrierImageBMax.png" />
+    <None Remove="Media\TrierImageBMin.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Media\thegame.jpg" />
+    <EmbeddedResource Include="Media\TrierImageBMax.png" />
+    <EmbeddedResource Include="Media\TrierImageBMin.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android">
+      <HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\MonoAndroid\v9.0\Mono.Android.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Resx\AppResources.en-US.resx">
+      <Generator></Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resx\AppResources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="DictionnaireBGCBLACK.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="DictionnaireBGCWhite.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="view\LastPage_Rules.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="view\RulesGame.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="view\secondePageRules.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="view\Testconnectivité.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Resx\AppResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>AppRessources.resx</DependentUpon>
+    </Compile>
+    <Compile Update="Resx\AppResources.Designer.cs">
+      <DependentUpon>AppResources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/TheGameExtreme/model/Fraction.cs b/TheGameExtreme/model/Fraction.cs
index 9bb2a10..238944b 100644
--- a/TheGameExtreme/model/Fraction.cs
+++ b/TheGameExtreme/model/Fraction.cs
@@ -17,7 +17,17 @@ namespace TheGameExtreme.model
 
         public bool isMultiple(Fraction fraction)
         {
-            if (fraction.Numerateur == 1)
+            bool numIsZero = false;
+            bool denIsZero = false;
+            if (fraction.Numerateur == 0)
+            {
+                numIsZero = true;
+            }
+            if (fraction.Denominateur == 0)
+            {
+                denIsZero = true;
+            }
+            if (fraction.Numerateur == 1 && denIsZero)
             {
                 if (fraction.Denominateur != 1
                     && fraction.Denominateur != Denominateur
@@ -26,7 +36,7 @@ namespace TheGameExtreme.model
                     return true;
                 }
             }
-            else if (fraction.Denominateur == 1)
+            else if (fraction.Denominateur == 1 && !numIsZero)
             {
                 if (fraction.Numerateur != 1
                     && fraction.Numerateur != Numerateur
@@ -35,7 +45,7 @@ namespace TheGameExtreme.model
                     return true;
                 }
             }
-            else if (fraction.Numerateur == Numerateur)
+            else if (fraction.Numerateur == Numerateur && !denIsZero)
             {
                 if (fraction.Denominateur != Denominateur
                     && Denominateur % fraction.Denominateur == 0)
@@ -43,7 +53,7 @@ namespace TheGameExtreme.model
                     return true;
                 }
             }
-            else if (fraction.Denominateur == Denominateur)
+            else if (fraction.Denominateur == Denominateur && !numIsZero)
             {
                 if (fraction.Numerateur != Numerateur
                     && Numerateur % fraction.Numerateur == 0)
@@ -53,13 +63,19 @@ namespace TheGameExtreme.model
             }
             else
             {
-                if (Numerateur % fraction.Numerateur == 0)
+                if (!numIsZero)
                 {
-                    return true;
+                    if (Numerateur % fraction.Numerateur == 0)
+                    {
+                        return true;
+                    }
                 }
-                if (Denominateur % fraction.Denominateur == 0)
+                if (denIsZero)
                 {
-                    return true;
+                    if (Denominateur % fraction.Denominateur == 0)
+                    {
+                        return true;
+                    }
                 }
             }
             return false;
diff --git a/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs b/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs
index c020abe..53abaa4 100644
--- a/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs
+++ b/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs
@@ -40,7 +40,6 @@ namespace TheGameExtreme.model.gameActions.classic
             }
             else
             {
-                TestEndGame(currentHand);
                 if (!end)
                 {
                     Message = ((JouerUneCarteClassic)gameActions[1]).ErrorMessage;
diff --git a/TheGameExtreme/model/gameActions/classic/TerminerSonTourClassic.cs b/TheGameExtreme/model/gameActions/classic/TerminerSonTourClassic.cs
index c474bb4..7e537c7 100644
--- a/TheGameExtreme/model/gameActions/classic/TerminerSonTourClassic.cs
+++ b/TheGameExtreme/model/gameActions/classic/TerminerSonTourClassic.cs
@@ -18,7 +18,6 @@ namespace TheGameExtreme.model.gameActions.classic
         {
             if (CurrentHand.Count == 0 || CurrentCardPlayed.Count >= 2)
             {
-                // Vérifier la fin du jeu
                 return true;
             }
             else
@@ -31,7 +30,80 @@ namespace TheGameExtreme.model.gameActions.classic
 
         override protected void tryToFindSoluce(List<Card> playableCard, List<Card> CurrentHand)
         {
-            CurrentHand.ForEach(card =>
+            int findDownCard = 0;
+            int findUpCard = 0;
+            List<Card> hand = new List<Card>();
+            List<Card> playableDownCard = new List<Card>();
+            List<Card> playableUpCard = new List<Card>();
+
+            CurrentHand.ForEach(card => hand.Add(card));
+
+
+            hand.ForEach(card =>
+            {
+                for (int i = 0; i < ListOrderedStacks.Size; i++)
+                {
+                    if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 10) == 0)
+                    {
+                        playableDownCard.Add(card);
+                    }
+                    else if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 10) == 0)
+                    {
+                        playableUpCard.Add(card);
+                    }
+                }
+            });
+
+            playableDownCard.ForEach(card =>
+            {
+                hand.Remove(card);
+            });
+
+            playableUpCard.ForEach(card =>
+            {
+                hand.Remove(card);
+            });
+
+
+            while ((playableDownCard.Count > findDownCard || playableUpCard.Count > findUpCard) && hand.Count > 0)
+            {
+                findDownCard = playableDownCard.Count;
+                findUpCard = playableUpCard.Count;
+
+                hand.ForEach(card =>
+                {
+                    for (int i = 0; i < playableDownCard.Count; i++)
+                    {
+                        if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 10) == 0)
+                        {
+                            playableDownCard.Add(card);
+                        }
+                    }
+                    for (int i = 0; i < playableUpCard.Count; i++)
+                    {
+                        if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 10) == 0)
+                        {
+                            playableUpCard.Add(card);
+                        }
+                    }
+                });
+
+                for (int i = findDownCard; i < playableDownCard.Count; i++)
+                {
+                    hand.Remove(playableDownCard[i]);
+                }
+
+                for (int i = findUpCard; i < playableUpCard.Count; i++)
+                {
+                    hand.Remove(playableUpCard[i]);
+                }
+            }
+
+            playableDownCard.ForEach(card => playableCard.Add(card));
+            playableUpCard.ForEach(card => playableCard.Add(card));
+
+            bool played = false;
+            hand.ForEach(card =>
             {
                 for (int i = 0; i < ListOrderedStacks.Size; i++)
                 {
@@ -40,17 +112,44 @@ namespace TheGameExtreme.model.gameActions.classic
                         if (card.Value > ListOrderedStacks.getStack(i).Peek().Value)
                         {
                             playableCard.Add(card);
+                            played = true;
+                            break;
                         }
                     }
                     else if (card.Value < ListOrderedStacks.getStack(i).Peek().Value)
                     {
                         playableCard.Add(card);
+                        played = true;
+                        break;
                     }
-                    else if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 10) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 10) == 0)
+                }
+
+                if (!played)
+                {
+                    for (int i = 0; i < playableDownCard.Count; i++)
                     {
-                        playableCard.Add(card);
+                        if (card.Value > playableDownCard[i].Value)
+                        {
+                            playableCard.Add(card);
+                            played = true;
+                            break;
+                        }
+                    }
+                }
+                
+                if (!played)
+                {
+                    for (int i = 0; i < playableUpCard.Count; i++)
+                    {
+                        if (card.Value < playableUpCard[i].Value)
+                        {
+                            playableCard.Add(card);
+                            played = true;
+                            break;
+                        }
                     }
                 }
+                played = false;
             });
         }
 
diff --git a/TheGameExtreme/model/gameActions/decimals/GameModeDecimal.cs b/TheGameExtreme/model/gameActions/decimals/GameModeDecimal.cs
index e15b2e1..10bf318 100644
--- a/TheGameExtreme/model/gameActions/decimals/GameModeDecimal.cs
+++ b/TheGameExtreme/model/gameActions/decimals/GameModeDecimal.cs
@@ -40,7 +40,6 @@ namespace TheGameExtreme.model.gameActions.decimals
             }
             else
             {
-                TestEndGame(currentHand);
                 if (!end)
                 {
                     Message = ((JouerUneCarteDecimal)gameActions[1]).ErrorMessage;
diff --git a/TheGameExtreme/model/gameActions/decimals/TerminerSonTourDecimal.cs b/TheGameExtreme/model/gameActions/decimals/TerminerSonTourDecimal.cs
index 7322e75..78ad7c4 100644
--- a/TheGameExtreme/model/gameActions/decimals/TerminerSonTourDecimal.cs
+++ b/TheGameExtreme/model/gameActions/decimals/TerminerSonTourDecimal.cs
@@ -30,7 +30,80 @@ namespace TheGameExtreme.model.gameActions.decimals
 
         override protected void tryToFindSoluce(List<Card> playableCard, List<Card> CurrentHand)
         {
-            CurrentHand.ForEach(card =>
+            int findDownCard = 0;
+            int findUpCard = 0;
+            List<Card> hand = new List<Card>();
+            List<Card> playableDownCard = new List<Card>();
+            List<Card> playableUpCard = new List<Card>();
+
+            CurrentHand.ForEach(card => hand.Add(card));
+
+
+            hand.ForEach(card =>
+            {
+                for (int i = 0; i < ListOrderedStacks.Size; i++)
+                {
+                    if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.01m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.001m) == 0)
+                    {
+                        playableDownCard.Add(card);
+                    }
+                    else if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.01m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.001m) == 0)
+                    {
+                        playableUpCard.Add(card);
+                    }
+                }
+            });
+
+            playableDownCard.ForEach(card =>
+            {
+                hand.Remove(card);
+            });
+
+            playableUpCard.ForEach(card =>
+            {
+                hand.Remove(card);
+            });
+
+
+            while ((playableDownCard.Count > findDownCard || playableUpCard.Count > findUpCard) && hand.Count > 0)
+            {
+                findDownCard = playableDownCard.Count;
+                findUpCard = playableUpCard.Count;
+
+                hand.ForEach(card =>
+                {
+                    for (int i = 0; i < playableDownCard.Count; i++)
+                    {
+                        if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.01m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.001m) == 0)
+                        {
+                            playableDownCard.Add(card);
+                        }
+                    }
+                    for (int i = 0; i < playableUpCard.Count; i++)
+                    {
+                        if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.01m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.001m) == 0)
+                        {
+                            playableUpCard.Add(card);
+                        }
+                    }
+                });
+
+                for (int i = findDownCard; i < playableDownCard.Count; i++)
+                {
+                    hand.Remove(playableDownCard[i]);
+                }
+
+                for (int i = findUpCard; i < playableUpCard.Count; i++)
+                {
+                    hand.Remove(playableUpCard[i]);
+                }
+            }
+
+            playableDownCard.ForEach(card => playableCard.Add(card));
+            playableUpCard.ForEach(card => playableCard.Add(card));
+
+            bool played = false;
+            hand.ForEach(card =>
             {
                 for (int i = 0; i < ListOrderedStacks.Size; i++)
                 {
@@ -39,17 +112,44 @@ namespace TheGameExtreme.model.gameActions.decimals
                         if (card.Value > ListOrderedStacks.getStack(i).Peek().Value)
                         {
                             playableCard.Add(card);
+                            played = true;
+                            break;
                         }
                     }
                     else if (card.Value < ListOrderedStacks.getStack(i).Peek().Value)
                     {
                         playableCard.Add(card);
+                        played = true;
+                        break;
                     }
-                    else if (card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.1m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.01m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.01m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.001m) == 0 || card.Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.001m) == 0)
+                }
+
+                if (!played)
+                {
+                    for (int i = 0; i < playableDownCard.Count; i++)
                     {
-                        playableCard.Add(card);
+                        if (card.Value > playableDownCard[i].Value)
+                        {
+                            playableCard.Add(card);
+                            played = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!played)
+                {
+                    for (int i = 0; i < playableUpCard.Count; i++)
+                    {
+                        if (card.Value < playableUpCard[i].Value)
+                        {
+                            playableCard.Add(card);
+                            played = true;
+                            break;
+                        }
                     }
                 }
+                played = false;
             });
         }
 
diff --git a/TheGameExtreme/model/gameActions/fraction/GameModeFraction.cs b/TheGameExtreme/model/gameActions/fraction/GameModeFraction.cs
index ad4ee86..7f2295c 100644
--- a/TheGameExtreme/model/gameActions/fraction/GameModeFraction.cs
+++ b/TheGameExtreme/model/gameActions/fraction/GameModeFraction.cs
@@ -40,7 +40,6 @@ namespace TheGameExtreme.model.gameActions.fraction
             }
             else
             {
-                TestEndGame(currentHand);
                 if (!end)
                 {
                     Message = ((JouerUneCarteFraction)gameActions[1]).ErrorMessage;
diff --git a/TheGameExtreme/model/gameActions/fraction/TerminerSonTourFraction.cs b/TheGameExtreme/model/gameActions/fraction/TerminerSonTourFraction.cs
index d75dd26..068a503 100644
--- a/TheGameExtreme/model/gameActions/fraction/TerminerSonTourFraction.cs
+++ b/TheGameExtreme/model/gameActions/fraction/TerminerSonTourFraction.cs
@@ -39,7 +39,55 @@ namespace TheGameExtreme.model.gameActions.fraction
 
         protected override void tryToFindSoluce(List<Card> playableCard, List<Card> CurrentHand)
         {
-            CurrentHand.ForEach(card =>
+            int findMultipleCard = 0;
+            List<Card> hand = new List<Card>();
+            List<Card> playableMultipleCard = new List<Card>();
+
+            CurrentHand.ForEach(card => hand.Add(card));
+
+
+            hand.ForEach(card =>
+            {
+                for (int i = 0; i < ListOrderedStacks.Size; i++)
+                {
+                    if (((FractionCard)card).Fraction.isMultiple(((FractionCard)ListOrderedStacks.getStack(i).Peek()).Fraction))
+                    {
+                        playableMultipleCard.Add(card);
+                    }
+                }
+            });
+
+            playableMultipleCard.ForEach(card =>
+            {
+                hand.Remove(card);
+            });
+
+
+            while (playableMultipleCard.Count > findMultipleCard && hand.Count > 0)
+            {
+                findMultipleCard = playableMultipleCard.Count;
+
+                hand.ForEach(card =>
+                {
+                    for (int i = 0; i < playableMultipleCard.Count; i++)
+                    {
+                        if (((FractionCard)card).Fraction.isMultiple(((FractionCard)ListOrderedStacks.getStack(i).Peek()).Fraction))
+                        {
+                            playableMultipleCard.Add(card);
+                        }
+                    }
+                });
+
+                for (int i = findMultipleCard; i < playableMultipleCard.Count; i++)
+                {
+                    hand.Remove(playableMultipleCard[i]);
+                }
+            }
+
+            playableMultipleCard.ForEach(card => playableCard.Add(card));
+
+            bool played = false;
+            hand.ForEach(card =>
             {
                 for (int i = 0; i < ListOrderedStacks.Size; i++)
                 {
@@ -48,17 +96,32 @@ namespace TheGameExtreme.model.gameActions.fraction
                         if (card.Value > ListOrderedStacks.getStack(i).Peek().Value)
                         {
                             playableCard.Add(card);
+                            played = true;
+                            break;
                         }
                     }
                     else if (card.Value < ListOrderedStacks.getStack(i).Peek().Value)
                     {
                         playableCard.Add(card);
+                        played = true;
+                        break;
                     }
-                    else if (((FractionCard)card).Fraction.isMultiple(((FractionCard)ListOrderedStacks.getStack(i).Peek()).Fraction))
+                }
+
+                if (!played)
+                {
+                    for (int i = 0; i < playableMultipleCard.Count; i++)
                     {
-                        playableCard.Add(card);
+                        if (card.Value > playableMultipleCard[i].Value)
+                        {
+                            playableCard.Add(card);
+                            played = true;
+                            break;
+                        }
                     }
                 }
+
+                played = false;
             });
         }
     }
diff --git a/TheGameExtreme/model/manager/GameManager.cs b/TheGameExtreme/model/manager/GameManager.cs
index 03b6d3f..5c4abe1 100644
--- a/TheGameExtreme/model/manager/GameManager.cs
+++ b/TheGameExtreme/model/manager/GameManager.cs
@@ -109,7 +109,6 @@ namespace TheGameExtreme.model.manager
             }
             else
             {
-                parametreur.GameMode.TestEndGame(currentHand);
                 EndMessage = parametreur.GameMode.Message;
                 if (win)
                 {
diff --git a/TheGameExtreme/view/App.xaml.cs b/TheGameExtreme/view/App.xaml.cs
index b77a7be..02177f2 100644
--- a/TheGameExtreme/view/App.xaml.cs
+++ b/TheGameExtreme/view/App.xaml.cs
@@ -12,7 +12,6 @@ namespace TheGameExtreme
             InitializeComponent();
 
             MainPage = new NavigationPage(new HomePage());
-
         }
 
         protected override void OnStart()
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml
index 2a38240..f7895da 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml
+++ b/TheGameExtreme/view/GamePreparationPage.xaml
@@ -8,20 +8,23 @@
     x:Class="TheGameExtreme.view.GamePreparationPage">
 
     <Grid
-        Margin="5,5,5,5">
+        Margin="10,10,10,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="20*" />
             <RowDefinition Height="80*" />
                 
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="50*" />                
-            <ColumnDefinition Width="50*" />
+            <ColumnDefinition Width="35*" />
+            <ColumnDefinition Width="10*" />
+            <ColumnDefinition Width="10*" />
+            <ColumnDefinition Width="45*" />
         </Grid.ColumnDefinitions>
 
         <StackLayout
             Grid.Row="0"
             Grid.Column="0"
+            Grid.ColumnSpan="2"
             Orientation="Horizontal">
             <ImageButton
                 Source="ArrowSettingsBack.png"
@@ -31,116 +34,100 @@
                 WidthRequest="50"                    
                 Clicked="Back"
                 BackgroundColor="Transparent"/>
+        </StackLayout>
 
+        <StackLayout
+            Grid.Row="0"
+            Grid.Column="1"
+            Grid.ColumnSpan="2">
             <Button
                 Text="{x:Static resources:AppResources.StrBtnPlay}"
                 Clicked="Play"
                 VerticalOptions="Start" 
-                HorizontalOptions="End"
+                HorizontalOptions="Center"
                 MinimumWidthRequest="30"
                 WidthRequest="100"
                 BackgroundColor="{DynamicResource Gold}"
                 CornerRadius="10"/>
         </StackLayout>
 
-        
-
         <Grid
             Grid.Row="1"
-            Grid.Column="1">
+            Grid.Column="2"
+            Grid.ColumnSpan="2">
             <Grid.RowDefinitions>
-                <RowDefinition Height="5*" />
-                <RowDefinition Height="10*" />
-                <RowDefinition Height="5*" />
-                <RowDefinition Height="10*" />
+                <RowDefinition Height="25*" />
+                <RowDefinition Height="25*" />
+                <RowDefinition Height="25*" />
+                <RowDefinition Height="25*" />
             </Grid.RowDefinitions>
 
             <StackLayout
                 Grid.Row="0"
-                Grid.Column="0">
+                Orientation="Horizontal">
                 <Label
                     Text="{x:Static resources:AppResources.StrNbPlayers}"
                     TextColor="{DynamicResource WhiteColor}"
                     FontSize="16"
                     VerticalTextAlignment="Center"
                     HorizontalTextAlignment="Center"/>
-            </StackLayout>
-
-            <StackLayout
-                Grid.Row="1"
-                Grid.Column="0">
                 <Picker
                     x:Name="PlayerSelecter"
                     BackgroundColor="{DynamicResource SkyBlueColor}"
                     SelectedIndexChanged="ChangedPseudo"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"
-                    MinimumWidthRequest="30"
-                    WidthRequest="100"/>
-            </StackLayout>
-
-            <StackLayout
-                Grid.Row="2"
-                Grid.Column="0">
-                <Label Text="{x:Static resources:AppResources.StrValueType}"
-                        TextColor="{DynamicResource WhiteColor}"
-                        FontSize="16"
-                        VerticalTextAlignment="Center"
-                        HorizontalTextAlignment="Center"/>
+                    WidthRequest="40"/>
             </StackLayout>
 
             <StackLayout
                 Grid.Row="3"
-                Grid.Column="0">
+                Orientation="Horizontal">
+                <Label
+                    Text="{x:Static resources:AppResources.StrValueType}"
+                    TextColor="{DynamicResource WhiteColor}"
+                    FontSize="16"
+                    VerticalTextAlignment="Center"
+                    HorizontalTextAlignment="Center"/>
                 <Picker
                     x:Name="SelectMode"
                     BackgroundColor="{DynamicResource SkyBlueColor}"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"
                     MinimumWidthRequest="30"
-                    WidthRequest="110"/>
+                    WidthRequest="150"/>
             </StackLayout>
 
             <StackLayout
-                Grid.Row="0"
-                Grid.Column="1">
-                <Label Text="{x:Static resources:AppResources.StrNbStacksInGame}"
+                Grid.Row="1"
+                Orientation="Horizontal">
+                <Label
+                    Text="{x:Static resources:AppResources.StrNbStacksInGame}"
                     TextColor="{DynamicResource WhiteColor}"
                     FontSize="16"
                     VerticalTextAlignment="Center"
                     HorizontalTextAlignment="Center"/>
-            </StackLayout>
-
-            <StackLayout
-                Grid.Row="1"
-                Grid.Column="1">
-                <Picker x:Name="SelectNbStack"
+                <Picker
+                    x:Name="SelectNbStack"
                     BackgroundColor="{DynamicResource SkyBlueColor}"
-                    MinimumWidthRequest="30"
-                    WidthRequest="100"
+                    WidthRequest="40"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"/>
             </StackLayout>
 
             <StackLayout
                 Grid.Row="2"
-                Grid.Column="1">
-                <Label Text="{x:Static resources:AppResources.StrNbCards}"
-                        TextColor="{DynamicResource WhiteColor}"
-                        FontSize="16"
-                        VerticalTextAlignment="Center"
-                        HorizontalTextAlignment="Center"/>
-            </StackLayout>
-
-            <StackLayout
-                Grid.Row="3"
-                Grid.Column="1">
+                Orientation="Horizontal">
+                <Label
+                    Text="{x:Static resources:AppResources.StrNbCards}"
+                    TextColor="{DynamicResource WhiteColor}"
+                    FontSize="16"
+                    VerticalTextAlignment="Center"
+                    HorizontalTextAlignment="Center"/>
                 <Picker
                     x:Name="SelectNbCard"
                     BackgroundColor="{DynamicResource SkyBlueColor}"
-                    Margin="0,0,10,0"
-                    MinimumWidthRequest="30"
-                    WidthRequest="100"
+                    WidthRequest="50"
                     HorizontalOptions="Center"
                     VerticalOptions="Center"/>
             </StackLayout>
@@ -149,24 +136,25 @@
 
         <ScrollView
             Grid.Column="0"
+            Grid.ColumnSpan="2"
             Grid.Row="1">
 
             <StackLayout
                 x:Name="NameList">
 
                 <Label
-                Text="{x:Static resources:AppResources.StrPseudoGM}"
-                TextColor="{DynamicResource WhiteColor}"
-                FontSize="16"
-                VerticalTextAlignment="Center"
-                HorizontalTextAlignment="Center"/>
+                    Text="{x:Static resources:AppResources.StrPseudoGM}"
+                    TextColor="{DynamicResource WhiteColor}"
+                    FontSize="16"
+                    VerticalTextAlignment="Center"
+                    HorizontalTextAlignment="Center"/>
                 
                 <Entry
                     BackgroundColor="{DynamicResource Gold}"                    
                     Placeholder="Pseudo"
                     HorizontalOptions="Center"
                     MinimumWidthRequest="50"
-                    WidthRequest="200"
+                    WidthRequest="150"
                     MaxLength="18"
                     x:Name="FirstEntry"
                     IsTextPredictionEnabled="False"/>
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs
index 038aeed..cd9f0bf 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml.cs
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs
@@ -17,7 +17,9 @@ namespace TheGameExtreme.view
         public GamePreparationPage()
         {
             InitializeComponent();
+
             NavigationPage.SetHasNavigationBar(this, false);
+
             LoadParameterName();
 
             PlayerSelecter.ItemsSource = listNbPlayer;
@@ -42,7 +44,10 @@ namespace TheGameExtreme.view
             IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
-            IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            }
             await Navigation.PopToRootAsync();
         }
 
@@ -52,7 +57,10 @@ namespace TheGameExtreme.view
             IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
-            IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            }
             return base.OnBackButtonPressed();
         }
 
@@ -80,6 +88,14 @@ namespace TheGameExtreme.view
 
         private void ChangedPseudo(object sender, EventArgs args)
         {
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                LoadParameterName();
+            }
+            else
+            {
+                FirstEntry.Text = "";
+            }
             while (NameList.Children.Count - 1 != (int)PlayerSelecter.SelectedItem)
             {
                 if (NameList.Children.Count - 1 < (int)PlayerSelecter.SelectedItem)
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs.orig b/TheGameExtreme/view/GamePreparationPage.xaml.cs.orig
new file mode 100644
index 0000000..8c9f238
--- /dev/null
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs.orig
@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using TheGameExtreme.IO;
+using TheGameExtreme.Resx;
+using Xamarin.Forms;
+
+namespace TheGameExtreme.view
+{
+    public partial class GamePreparationPage : ContentPage
+    {
+        public List<int> listNbPlayer = new List<int> { 1, 2, 3, 4, 5 };
+        public List<string> listGameMode = new List<string> { AppResources.TypeValueWhole, AppResources.TypeValueRelative, AppResources.TypeValueTens, AppResources.TypeValuehundredth, AppResources.TypeValuethousandth, AppResources.TypeValuefractionated };
+        public List<int> listNbStack = new List<int> { 4, 6, 8 };
+        public List<int> listNbCard = new List<int> { 100, 80, 60, 40 };
+ 
+
+        public GamePreparationPage()
+        {
+            InitializeComponent();
+
+            NavigationPage.SetHasNavigationBar(this, false);
+
+            LoadParameterName();
+
+            PlayerSelecter.ItemsSource = listNbPlayer;
+            LoadParameterNbPlayerGamePreparation();
+
+            SelectMode.ItemsSource = listGameMode;
+            LoadParameterGameModeValueGamePreparation();
+
+            SelectNbStack.ItemsSource = listNbStack;
+            LoadParameterNbStacksGamePreparation();
+
+            SelectNbCard.ItemsSource = listNbCard;
+            LoadParameterNbCardsGamePreparation();
+
+
+
+        }
+
+        private async void Back(object sender, EventArgs e)
+        {
+            IOGamePreparation.SaveParamaterGamePreparationNbPlayers(PlayerSelecter.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
+<<<<<<< HEAD
+            IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            await Navigation.PopToRootAsync();
+=======
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            }
+            await Navigation.PopAsync();
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
+        }
+
+        protected override bool OnBackButtonPressed()
+        {
+            IOGamePreparation.SaveParamaterGamePreparationNbPlayers(PlayerSelecter.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            }
+            return base.OnBackButtonPressed();
+        }
+
+        private async void Play(object sender, EventArgs args)
+        {
+            List<string> playersNames = new List<string>();
+            
+
+            for (int i = 1; i < NameList.Children.Count; i++)
+            {
+                playersNames.Add(((Entry)NameList.Children[i]).Text);
+                if (string.IsNullOrWhiteSpace(playersNames[playersNames.Count - 1]))
+                {
+                    await DisplayAlert(AppResources.WrongPseudo, AppResources.StrEnterPseudo, AppResources.StrCloseWind);
+                    return;
+                }
+            }
+            IOGamePreparation.SaveParamaterGamePreparationNbPlayers(PlayerSelecter.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
+            IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            await Navigation.PushAsync(new MainPage(playersNames, (int)SelectNbStack.SelectedItem, (int)SelectMode.SelectedIndex, (int)SelectNbCard.SelectedItem));
+        }
+
+        private void ChangedPseudo(object sender, EventArgs args)
+        {
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                LoadParameterName();
+            }
+            else
+            {
+                FirstEntry.Text = "";
+            }
+            while (NameList.Children.Count - 1 != (int)PlayerSelecter.SelectedItem)
+            {
+                if (NameList.Children.Count - 1 < (int)PlayerSelecter.SelectedItem)
+                {
+
+                    Entry e = new Entry
+                    {
+                        Placeholder = "Pseudo",
+                        BackgroundColor = (Color)Application.Current.Resources["Gold"],
+                        WidthRequest = 200,
+                        MinimumWidthRequest = 50,
+                        HorizontalOptions = LayoutOptions.Center,
+                        MaxLength = 18,
+                        IsTextPredictionEnabled = false
+                    };
+                    
+
+                    NameList.Children.Add(e);
+                }
+                else
+                {
+                    NameList.Children.RemoveAt(NameList.Children.Count - 1);
+                }
+            }
+        }
+        public void LoadParameterNbPlayerGamePreparation()
+        {
+            int nbJoueurs = IOGamePreparation.LoadParameterGamePreparationNbPlayers();
+            PlayerSelecter.SelectedIndex = nbJoueurs;
+        }
+
+        public void LoadParameterGameModeValueGamePreparation()
+        {
+            int gameModeValue = IOGamePreparation.LoadParameterGamePreparationGameModeValue();
+            SelectMode.SelectedIndex = gameModeValue;
+        }
+
+        public void LoadParameterNbStacksGamePreparation()
+        {
+            int nbStackSer = IOGamePreparation.LoadParamaterGamePreparationNbStacks();
+            SelectNbStack.SelectedIndex = nbStackSer;
+        }
+        public void LoadParameterNbCardsGamePreparation()
+        {
+            int nbCards = IOGamePreparation.LoadParameterGamePreparationNbCards();
+            SelectNbCard.SelectedIndex = nbCards;
+        }
+        public void LoadParameterName()
+        {
+            string pseudo = IOGamePreparation.LoadNameFromGamePrepararion();
+            FirstEntry.Text = pseudo;
+        }
+
+
+
+    }
+}
diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml
index 4a906e8..58dee08 100644
--- a/TheGameExtreme/view/HomePage.xaml
+++ b/TheGameExtreme/view/HomePage.xaml
@@ -8,88 +8,98 @@
     x:Class="TheGameExtreme.view.HomePage"
     x:Name="homepageT">
 
-    <StackLayout BackgroundColor="Transparent">
-
-        <Grid x:Name="MainGrid">
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="70*"/>
-                <ColumnDefinition Width="15*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="19*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-            </Grid.RowDefinitions>
-
-            <ImageButton Source="PointI.png"
-                         Grid.Column="0"
-                         Grid.Row="0"
-                         Clicked="ImageButton_Clicked"
-                         BackgroundColor="Transparent"
-                         WidthRequest="40"
-                         HeightRequest="40"
-                         VerticalOptions="End"
-                         HorizontalOptions="Center"/>
-
-            <Label
+    <Grid x:Name="MainGrid">
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="15*"/>
+            <ColumnDefinition Width="70*"/>
+            <ColumnDefinition Width="15*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+        </Grid.RowDefinitions>
+
+        <ImageButton
+            Source="PointI.png"
+            Grid.Column="0"
+            Grid.Row="0"
+            Clicked="ImageButton_Clicked"
+            BackgroundColor="Transparent"
+            WidthRequest="40"
+            HeightRequest="40"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"/>
+
+        <Label
             Text="{x:Static resources:AppResources.StrTitle}"
             TextColor="{DynamicResource WhiteColor}"
             Grid.Row="0"
             Grid.Column="1" 
             HorizontalTextAlignment="Center"  
             FontSize="45"
-            VerticalTextAlignment="Start"
+            VerticalTextAlignment="Center"
             FontFamily=""/>
 
 
 
-            <Button
-                Text="{x:Static resources:AppResources.StrLocalGame}"
-                FontSize="18"
-                Grid.Row="2"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
-                WidthRequest="230" 
-                HeightRequest="57" 
-                VerticalOptions="Center"
-                Clicked="OpenGame"
-                CornerRadius="10"                
-                BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-
-            <Button
-                Text="{x:Static resources:AppResources.StrMultiplayer}"
+        <Button
+            Text="{x:Static resources:AppResources.StrLocalGame}"
+            FontSize="18"
+            Grid.Row="2"
+            Grid.Column="1" 
+            HorizontalOptions="Center" 
+            WidthRequest="230" 
+            HeightRequest="57" 
+            VerticalOptions="Center"
+            Clicked="OpenGame"
+            CornerRadius="10"                
+            BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+
+        <Button
+            Text="{x:Static resources:AppResources.StrMultiplayer}"
+            FontSize="18"
+            Grid.Row="3"
+            Grid.Column="1" 
+            HorizontalOptions="Center" 
+            VerticalOptions="Center"
+            HeightRequest="57" 
+            WidthRequest="230"
+            Clicked="OpenMultiPlayerMode"
+            CornerRadius="10"                                    
+            BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+        <Button Text="{x:Static resources:AppResources.StrTitleRules}"
                 FontSize="18"
-                Grid.Row="3"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
+                Grid.Row="4"
+                Grid.Column="1"
+                HorizontalOptions="Center"
                 VerticalOptions="Center"
-                HeightRequest="57" 
+                HeightRequest="57"
                 WidthRequest="230"
-                Clicked="OpenMultiPlayerMode"
-                CornerRadius="10"                                    
+                Clicked="Rules_Clicked"
+                CornerRadius="10"                    
                 BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
-            <Button Text="{x:Static resources:AppResources.StrTitleRules}"
-                    FontSize="18"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    HorizontalOptions="Center"
-                    VerticalOptions="Center"
-                    HeightRequest="57"
-                    WidthRequest="230"
-                    Clicked="Rules_Clicked"
-                    CornerRadius="10"                    
-                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
+        <Image
+            Source="TrierImageB.png"
+            Grid.Column="1"
+            Grid.Row="1"/>
 
-            <Image Source="TrierImageB.png"
-                         Grid.Column="1"
-                         Grid.Row="1"/>
 
+        <Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="6*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="6*" />
+            </Grid.ColumnDefinitions>
 
             <Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
                 <Grid.RowDefinitions>
@@ -113,6 +123,6 @@
 
         </Grid>
 
-    </StackLayout>
+    </Grid>
 
 </ContentPage>
diff --git a/TheGameExtreme/view/HomePage.xaml.cs b/TheGameExtreme/view/HomePage.xaml.cs
index bd458c9..4aa62c4 100644
--- a/TheGameExtreme/view/HomePage.xaml.cs
+++ b/TheGameExtreme/view/HomePage.xaml.cs
@@ -11,7 +11,7 @@ namespace TheGameExtreme.view
         public HomePage()
         {
             InitializeComponent();
-            NavigationPage.SetHasNavigationBar(this, false);            
+            NavigationPage.SetHasNavigationBar(this, false);
             LoadParameterOptionOnHomepage();
 
         }        
diff --git a/TheGameExtreme/view/HomePage.xaml.cs.orig b/TheGameExtreme/view/HomePage.xaml.cs.orig
deleted file mode 100644
index 1875e68..0000000
--- a/TheGameExtreme/view/HomePage.xaml.cs.orig
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using Xamarin.Forms;
-using TheGameExtreme.IO;
-<<<<<<< HEAD
-=======
-using TheGameExtreme.Resx;
->>>>>>> bluetoothtest
-
-namespace TheGameExtreme.view
-{
-    public partial class HomePage : ContentPage
-    {
-        
-        public HomePage()
-        {
-            InitializeComponent();
-            NavigationPage.SetHasNavigationBar(this, false);            
-            LoadParameterOptionOnHomepage();
-
-        }        
-        private async void OpenGame(object sender, EventArgs args)
-        {
-            await Navigation.PushAsync(new GamePreparationPage());
-        }
-
-        private async void OpenMultiPlayerMode(object sender, EventArgs args)
-        {
-            await DisplayAlert("Mode en cours de développement", null, "Fermer");
-            //await Navigation.PushAsync(new MultiPlayerMode());            
-        }       
-
-        private async void Rules_Clicked(object sender, EventArgs args)
-        {
-            await Navigation.PushAsync(new RulesGame());
-        }
-        
-
-        public void LoadParameterOptionOnHomepage()
-        {
-            bool b = IOOptions.LoadOptionsParameter();
-            if (!b)
-            {
-                Application.Current.Resources["BlackColor"] = Color.Black;
-                Application.Current.Resources["WhiteColor"] = Color.White;
-                imageButton.Source = "SoleilThemes.png";
-            }
-            else
-            {
-                Application.Current.Resources["BlackColor"] = Color.White;
-                Application.Current.Resources["WhiteColor"] = Color.Black;
-                imageButton.Source = "LuneSombreTheme.png";
-            }
-        }
-
-        private void Theme_Clicked(object sender, EventArgs e)
-        {
-            bool b;
-            ButtonGrid.Children.Remove(imageButton);
-            
-            if(homepageT.BackgroundColor == Color.Black)
-            {
-                b = true;
-                Application.Current.Resources["BlackColor"] = Color.White;
-                Application.Current.Resources["WhiteColor"] = Color.Black;
-                imageButton = new ImageButton()
-                {
-                    BackgroundColor = Color.Transparent,
-                    BorderColor = (Color)Application.Current.Resources["SkyBlueColor"]
-                };
-                imageButton.Source = "LuneSombreTheme.png";
-            }
-            else
-            {
-                b = false;
-                Application.Current.Resources["BlackColor"] = Color.Black;
-                Application.Current.Resources["WhiteColor"] = Color.White;
-                imageButton = new ImageButton()
-                {
-                    BackgroundColor = Color.Transparent,
-                    BorderColor = (Color)Application.Current.Resources["SkyBlueColor"]
-                };
-                imageButton.Source = "SoleilThemes.png";
-            }
-            ButtonGrid.Children.Add(imageButton, 1, 1);
-            imageButton.Clicked += Theme_Clicked;
-            imageButton.HorizontalOptions = LayoutOptions.Center;
-            imageButton.VerticalOptions = LayoutOptions.End;
-            IOOptions.SaveOptionParameter(b);
-            
-            
-        }
-
-        private async void ImageButton_Clicked(object sender, EventArgs e)
-        {
-            await DisplayAlert(AppResources.StrInfo,AppResources.StrAbout, AppResources.StrCloseWind );
-        }
-    }
-}
diff --git a/TheGameExtreme/view/HomePage.xaml.orig b/TheGameExtreme/view/HomePage.xaml.orig
index 064e1ab..82da23b 100644
--- a/TheGameExtreme/view/HomePage.xaml.orig
+++ b/TheGameExtreme/view/HomePage.xaml.orig
@@ -8,39 +8,31 @@
     x:Class="TheGameExtreme.view.HomePage"
     x:Name="homepageT">
 
-<<<<<<< HEAD
-    <StackLayout BackgroundColor="Transparent">
+    <Grid x:Name="MainGrid">
 
-        <Grid x:Name="MainGrid">
-            
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="70*"/>
-                <ColumnDefinition Width="15*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="19*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-            </Grid.RowDefinitions>
-=======
-    <Grid
-        Margin="5,5,5,5">
-            
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="15*"/>
             <ColumnDefinition Width="70*"/>
             <ColumnDefinition Width="15*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="31*"/>
-            <RowDefinition Height="23*"/>
-            <RowDefinition Height="23*"/>
-            <RowDefinition Height="23*"/>
+            <RowDefinition Height="19*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
         </Grid.RowDefinitions>
->>>>>>> 3badad823975148fed6467984295274bc7006685
+
+        <ImageButton
+            Source="PointI.png"
+            Grid.Column="0"
+            Grid.Row="0"
+            Clicked="ImageButton_Clicked"
+            BackgroundColor="Transparent"
+            WidthRequest="40"
+            HeightRequest="40"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"/>
 
         <Label
             Text="{x:Static resources:AppResources.StrTitle}"
@@ -49,39 +41,57 @@
             Grid.Column="1" 
             HorizontalTextAlignment="Center"  
             FontSize="45"
-            VerticalTextAlignment="Start"
+            VerticalTextAlignment="Center"
             FontFamily=""/>
 
-<<<<<<< HEAD
-            
-            
-            <Button
-                Text="{x:Static resources:AppResources.StrLocalGame}"
-                FontSize="18"
-                Grid.Row="2"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
-                WidthRequest="230" 
-                HeightRequest="57" 
-                VerticalOptions="Center"
-                Clicked="OpenGame"
-                CornerRadius="10"                
-                BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
 
-            <Button
-                Text="{x:Static resources:AppResources.StrMultiplayer}"
+        <Button
+            Text="{x:Static resources:AppResources.StrLocalGame}"
+            FontSize="18"
+            Grid.Row="2"
+            Grid.Column="1" 
+            HorizontalOptions="Center" 
+            WidthRequest="230" 
+            HeightRequest="57" 
+            VerticalOptions="Center"
+            Clicked="OpenGame"
+            CornerRadius="10"                
+            BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+
+        <Button
+            Text="{x:Static resources:AppResources.StrMultiplayer}"
+            FontSize="18"
+            Grid.Row="3"
+            Grid.Column="1" 
+            HorizontalOptions="Center" 
+            VerticalOptions="Center"
+            HeightRequest="57" 
+            WidthRequest="230"
+            Clicked="OpenMultiPlayerMode"
+            CornerRadius="10"                                    
+            BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+        <Button Text="{x:Static resources:AppResources.StrTitleRules}"
                 FontSize="18"
-                Grid.Row="3"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
+                Grid.Row="4"
+                Grid.Column="1"
+                HorizontalOptions="Center"
                 VerticalOptions="Center"
-                HeightRequest="57" 
+                HeightRequest="57"
                 WidthRequest="230"
-                Clicked="OpenMultiPlayerMode"
-                CornerRadius="10"                                    
+                Clicked="Rules_Clicked"
+                CornerRadius="10"                    
                 BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
+        <Image
+            Source="TrierImageB.png"
+            Grid.Column="1"
+            Grid.Row="1"/>
+
+
+<<<<<<< HEAD
             <Button Text="{x:Static resources:AppResources.StrTitleRules}"
                     FontSize="18"
                     Grid.Row="4"
@@ -108,67 +118,38 @@
                     <ColumnDefinition Width="2*" />
                     <ColumnDefinition Width="6*" />
                 </Grid.ColumnDefinitions>
-            
+
                 <ImageButton
                     x:Name="imageButton"                                
                     Grid.Column="1"
                     Grid.Row="1"                
                     VerticalOptions="End"
                     HorizontalOptions="Center"                
-                    Clicked="Theme_Clicked"
-                    BorderColor="{DynamicResource SkyBlueColor}"
-                    BackgroundColor="Transparent"/>
+                    Clicked="Theme_Clicked"                    
+                    BackgroundColor="Black"/>
             </Grid>
 =======
-        <ImageButton
-            Source="EngrenageV1.png"
-            Grid.Row="0"
-            Grid.Column="2" 
-            VerticalOptions="StartAndExpand" 
-            HorizontalOptions="End" 
-            HeightRequest="60" 
-            WidthRequest="68"                         
-            Clicked="OpenSetting"
-            BackgroundColor="{DynamicResource BlackColor}"/>
-            
-        <Button
-            Text="{x:Static resources:AppResources.StrLocalGame}"
-            FontSize="18"
-            Grid.Row="1"
-            Grid.Column="1" 
-            HorizontalOptions="Center" 
-            WidthRequest="230" 
-            HeightRequest="57" 
-            VerticalOptions="Center"
-            Clicked="OpenGame"
-            CornerRadius="10"
-            BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-
-        <Button
-            Text="{x:Static resources:AppResources.StrMultiplayer}"
-            FontSize="18"
-            Grid.Row="2"
-            Grid.Column="1" 
-            HorizontalOptions="Center" 
-            VerticalOptions="Center"
-            HeightRequest="57" 
-            WidthRequest="230"
-            Clicked="OpenMultiPlayerMode"
-            CornerRadius="10"
-            BackgroundColor="{DynamicResource SkyBlueColor}"/>
->>>>>>> 3badad823975148fed6467984295274bc7006685
+        <Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="6*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="6*" />
+            </Grid.ColumnDefinitions>
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
 
-        <ImageButton
-            Source="imagesRules.png"
-            Grid.Column="0"
-            Grid.Row="0"
-            HeightRequest="50"
-            WidthRequest="35"
-            VerticalOptions="StartAndExpand"
-            HorizontalOptions="Start"
-            Clicked="Rules_Clicked"
-            BackgroundColor="{DynamicResource BlackColor}"/>
+            <ImageButton
+                x:Name="imageButton"                                
+                Grid.Column="1"
+                Grid.Row="1"                
+                VerticalOptions="Center"
+                HorizontalOptions="Center"                
+                Clicked="Theme_Clicked"
+                BorderColor="{DynamicResource SkyBlueColor}"
+                BackgroundColor="Transparent"/>
+        </Grid>
 
     </Grid>
 
diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml
index 95bbe6a..6bdff1d 100644
--- a/TheGameExtreme/view/MainPage.xaml
+++ b/TheGameExtreme/view/MainPage.xaml
@@ -15,28 +15,16 @@
         x:Name="Display"
         Margin="10,10,10,10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="10*"/>
-            <RowDefinition Height="90*"/>
+            <RowDefinition Height="9*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="3*"/>
+            <RowDefinition Height="85*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="20*"/>
             <ColumnDefinition Width="60*"/>
             <ColumnDefinition Width="20*"/>
         </Grid.ColumnDefinitions>
-
-
-          <StackLayout
-            Grid.Row="0"
-            Grid.Column="1"
-            VerticalOptions="CenterAndExpand">
-              <Label
-                x:Name="pseudo"
-                Text="Pseudo"
-                HorizontalTextAlignment="Center"
-                VerticalTextAlignment="Center"
-                TextColor="{DynamicResource Gold}"
-                FontSize="28"/>
-          </StackLayout>                             
         
 
         <StackLayout
@@ -53,6 +41,19 @@
                 Clicked="PlayToHome"/>
         </StackLayout>
 
+          <StackLayout
+            Grid.Row="0"
+            Grid.Column="1"
+            VerticalOptions="CenterAndExpand">
+              <Label
+                x:Name="pseudo"
+                Text="Pseudo"
+                HorizontalTextAlignment="Center"
+                VerticalTextAlignment="Center"
+                TextColor="{DynamicResource Gold}"
+                FontSize="28"/>
+          </StackLayout>
+
         
         
         <StackLayout
@@ -67,13 +68,20 @@
                 VerticalOptions="Center"
                 BackgroundColor="{DynamicResource Gold}"
                 HeightRequest="35"
+                Padding="10"
                 CornerRadius="10"
                 Clicked="EndTurn"/>
         </StackLayout>
 
+        <ProgressBar
+            Progress="1"
+            Grid.Row="2"
+            Grid.ColumnSpan="3"
+            x:Name="progressBar"
+            ProgressColor="{DynamicResource Gold}"/>
 
         <Grid
-            Grid.Row="1"
+            Grid.Row="3"
             Grid.Column="0"
             Grid.ColumnSpan="3">
             <Grid.Effects>
diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs
index 2d3d754..65fe552 100644
--- a/TheGameExtreme/view/MainPage.xaml.cs
+++ b/TheGameExtreme/view/MainPage.xaml.cs
@@ -20,7 +20,7 @@ namespace TheGameExtreme.view
     public partial class MainPage : ContentPage
     {
         private Main viewmodel;
-        private List<string> playersNames;
+        private List<string> playersNames = new List<string>();
         private int nbPile;
         private int nbCard;
         private int indexMode;
@@ -37,17 +37,32 @@ namespace TheGameExtreme.view
          */
         public MainPage(List<string> playersNames, int nbPile, int indexMode, int nbCard)
         {
-            this.playersNames = playersNames;
             this.nbPile = nbPile;
             this.nbCard = nbCard;
             this.indexMode = indexMode;
 
+            Random random = new Random();
+            int r = random.Next(0, playersNames.Count);
+            int size = playersNames.Count;
+            for (int i = 0; i < size; i++)
+            {
+                this.playersNames.Add(playersNames[r]);
+                playersNames.RemoveAt(r);
+                r = random.Next(0, playersNames.Count);
+            }
+
             InitializeComponent();
+
             NavigationPage.SetHasNavigationBar(this, false);
 
-            EndTurnButton.Text = AppResources.StrEndTurn;   // Trouver le moyen d'avoir du binding
+            if (Device.RuntimePlatform == Device.Android)
+            {
+                
+            }
 
-            viewmodel = new Main(playersNames, nbPile, nbCard, indexMode);
+            EndTurnButton.Text = AppResources.StrEndTurn;
+
+            viewmodel = new Main(this.playersNames, nbPile, nbCard, indexMode);
 
             viewmodel.EndGame += OnEndGame;
 
@@ -89,17 +104,17 @@ namespace TheGameExtreme.view
             {
                 if (i < (stackCollection.Count * 0.5))
                 {
-                    stackCollection[i].Paint(canvas, new SKColor(33, 255, 40));
+                    stackCollection[i].Paint(canvas);
                 }
                 else
                 {
-                    stackCollection[i].Paint(canvas, SKColors.Red);
+                    stackCollection[i].Paint(canvas);
                 }
             }
 
             foreach (TouchManipulationCard textPaint in textCollection)
             {
-                textPaint.Paint(canvas, SKColors.SkyBlue);
+                textPaint.Paint(canvas);
             }
         }
 
@@ -142,9 +157,24 @@ namespace TheGameExtreme.view
                 case TouchActionType.Moved:
                     if (textDictionary.ContainsKey(args.Id))
                     {
+                        bool isStackable = false;
+
                         TouchManipulationCard card = textDictionary[args.Id];
                         point.Y -= 120;
                         point.X -= 50;
+                        foreach (TouchManipulationCard stack in stackCollection)
+                        {
+                            SKPoint pointVisuCard = new SKPoint(point.X, point.Y - 120);
+                            if (stack.HitTest(point) || stack.HitTest(pointVisuCard))
+                            {
+                                card.Color = stack.Color;
+                                isStackable = true;
+                            }
+                        }
+                        if (!isStackable)
+                        {
+                            card.Color = SKColors.SkyBlue;
+                        }
                         card.ProcessTouchEvent(args.Id, args.Type, point);
                         canvasView.InvalidateSurface();
                     }
@@ -168,6 +198,7 @@ namespace TheGameExtreme.view
                                 {
                                     card.ProcessTouchEvent(args.Id, TouchActionType.Moved, stack.InitialPoint);
                                     card.InitialPoint = stackCollection[stackCollection.IndexOf(stack)].InitialPoint;
+                                    card.Color = stack.Color;
                                     stackCollection[stackCollection.IndexOf(stack)] = card;
                                     textCollection.RemoveAt(textCollection.Count - 1);
                                     find = true;
@@ -178,6 +209,7 @@ namespace TheGameExtreme.view
                         if (!find)
                         {
                             card.ProcessTouchEvent(args.Id, TouchActionType.Moved, card.InitialPoint);
+                            card.Color = SKColors.SkyBlue;
                         }
                         card.ProcessTouchEvent(args.Id, args.Type, point);
                         textDictionary.Remove(args.Id);
@@ -199,7 +231,7 @@ namespace TheGameExtreme.view
 
             float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20);
 
-            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / (viewmodel.getListOrderedStacks().Count * 2)) + 10f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.1) + (DeviceDisplay.MainDisplayInfo.Height * 0.9) * 0.01 + 2 * (0.05f * (float)DeviceDisplay.MainDisplayInfo.Width * textPaint.TextSize / textPaint.MeasureText("001"))));
+            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / (viewmodel.getListOrderedStacks().Count * 2)) + 10f + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.1) + (DeviceDisplay.MainDisplayInfo.Height * 0.85) * 0.01 + 2 * (0.05f * (float)DeviceDisplay.MainDisplayInfo.Width * textPaint.TextSize / textPaint.MeasureText("001"))));
 
             position.X -= inflateWidth;
 
@@ -220,14 +252,25 @@ namespace TheGameExtreme.view
                 textPaint.TextSize = 0.03f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("00");
                 position.X -= textWidth * 0.5f;
 
+                SKColor color;
+                if (i < (viewmodel.getListOrderedStacks().Count * 0.5))
+                {
+                    color = new SKColor(33, 255, 40);
+                }
+                else
+                {
+                    color = SKColors.Red;
+                }
+
                 stackCollection.Add(new TouchManipulationCard(textPaint, viewmodel.getListOrderedStacks()[i].Peek(), inflateWidth)
                 {
                     Matrix = SKMatrix.MakeTranslation(position.X, position.Y),
                     InitialMatrix = SKMatrix.MakeTranslation(position.X, position.Y),
-                    InitialPoint = position
+                    InitialPoint = position,
+                    Color = color
                 });
 
-                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / viewmodel.getListOrderedStacks().Count) + textWidth * 0.5f;
+                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / viewmodel.getListOrderedStacks().Count) + textWidth * 0.5f;
             }
         }
 
@@ -241,7 +284,7 @@ namespace TheGameExtreme.view
 
             float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20);
 
-            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / (viewmodel.CurrentHand.Count * 2)) + 10f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.9) - (DeviceDisplay.MainDisplayInfo.Height * 0.9) * 0.1 - 2 * (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001"))));
+            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / (viewmodel.CurrentHand.Count * 2)) + 10f + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.85) - (DeviceDisplay.MainDisplayInfo.Height * 0.85) * 0.1 - 2 * (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001"))));
 
             position.X -= inflateWidth;
 
@@ -266,10 +309,11 @@ namespace TheGameExtreme.view
                 {
                     Matrix = SKMatrix.MakeTranslation(position.X, position.Y),
                     InitialMatrix = SKMatrix.MakeTranslation(position.X, position.Y),
-                    InitialPoint = position
+                    InitialPoint = position,
+                    Color = SKColors.SkyBlue
                 });
 
-                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / viewmodel.CurrentHand.Count) + textWidth * 0.5f;
+                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / viewmodel.CurrentHand.Count) + textWidth * 0.5f;
             }
         }
 
@@ -302,6 +346,7 @@ namespace TheGameExtreme.view
             {
                 return false;
             }
+            progressBar.Progress -= ((100f / nbCard) / 100f);
             return true;
         }
 
@@ -327,6 +372,8 @@ namespace TheGameExtreme.view
             InflateStack();
             InflateHand();
 
+            progressBar.Progress = 1f;
+
             gameOption.Children.Clear();
             Button button = new Button();
             button.Text = AppResources.StrEndTurn;
diff --git a/TheGameExtreme/view/MultiPlayerMode.xaml.cs.orig b/TheGameExtreme/view/MultiPlayerMode.xaml.cs.orig
new file mode 100644
index 0000000..dc7bef7
--- /dev/null
+++ b/TheGameExtreme/view/MultiPlayerMode.xaml.cs.orig
@@ -0,0 +1,27 @@
+<<<<<<< HEAD
+//using Microsoft.AspNetCore.SignalR.Client;
+=======
+using Plugin.BLE;
+using Plugin.BLE.Abstractions.Contracts;
+>>>>>>> 6006856012a9420076ac40947eee0560f1e65e3e
+using System;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace TheGameExtreme.view
+{
+    public partial class MultiPlayerMode : ContentPage
+    {
+        
+        public MultiPlayerMode()
+        {
+            InitializeComponent();
+            NavigationPage.SetHasNavigationBar(this, false);
+        }
+
+        private void Button_ClickedCo(object sender, EventArgs args)
+        {
+            //await Navigation.PushAsync(new Testconnectivité());
+        }
+    }
+}
diff --git a/TheGameExtreme/view/TouchManipulationCard.cs b/TheGameExtreme/view/TouchManipulationCard.cs
index 3777b78..8852975 100644
--- a/TheGameExtreme/view/TouchManipulationCard.cs
+++ b/TheGameExtreme/view/TouchManipulationCard.cs
@@ -22,6 +22,7 @@ namespace TheGameExtreme.view
         public string display;
         private float width;
         private float height;
+        public SKColor Color;
 
 
         /**
@@ -75,14 +76,14 @@ namespace TheGameExtreme.view
          * <param name="canvas">Canvas où l'on souhaite dessiner l'objet contenu dans l'instance</param>
          * <param name="color">Couleur qui sera prise par l'objet</param>
          */
-        public void Paint(SKCanvas canvas, SKColor color)
+        public void Paint(SKCanvas canvas)
         {
             canvas.Save();
 
             SKMatrix matrix = Matrix;
             canvas.Concat(ref matrix);
 
-            textPaint.Color = color;
+            textPaint.Color = Color;
             textPaint.StrokeWidth = 5;
             textPaint.Style = SKPaintStyle.Stroke;
 
@@ -91,10 +92,10 @@ namespace TheGameExtreme.view
             if (Value.View.GetType() == typeof(FractionCard))
             {
                 card = new SKRect(-width, -height - textPaint.TextSize, width + textPaint.MeasureText(Math.Pow(10, ((FractionCard)(Value.View)).Fraction.SizeMax-1).ToString()), height);
-                textPaint1.Color = color;
+                textPaint1.Color = Color;
                 textPaint1.StrokeWidth = 5;
                 textPaint1.Style = SKPaintStyle.Stroke;
-                textPaint2.Color = color;
+                textPaint2.Color = Color;
                 textPaint2.StrokeWidth = 5;
                 textPaint2.Style = SKPaintStyle.Stroke;
             }
@@ -105,9 +106,9 @@ namespace TheGameExtreme.view
 
             if (Value.View.GetType() == typeof(FractionCard))
             {
-                float xNum = 0;
-                float xDen = 0;
                 int sizeMax = ((FractionCard)(Value.View)).Fraction.SizeMax;
+                float xNum = textPaint.MeasureText(Math.Pow(10, sizeMax-2).ToString());
+                float xDen = textPaint.MeasureText(Math.Pow(10, sizeMax-2).ToString());
                 int tailleNum = Math.Abs(((FractionCard)(Value.View)).Fraction.Numerateur);
                 int tailleDen = Math.Abs(((FractionCard)(Value.View)).Fraction.Denominateur);
 
@@ -120,24 +121,32 @@ namespace TheGameExtreme.view
                     tailleDen += 1;
                 }
 
-                string fractionBarre = "__";
+                string fractionBarre = "___";
                 for (int i = 2; i < sizeMax; i++){
                     fractionBarre += "_";
                 }
-                while (tailleNum < Math.Pow(10, (int)(sizeMax * 0.5)))
+                while (tailleNum > 9)
+                {
+                    xNum -= textPaint.MeasureText("0");
+                    tailleNum /= 10;
+                }
+                while (tailleDen > 9)
+                {
+                    xDen -= textPaint2.MeasureText("0");
+                    tailleDen /= 10;
+                }
+                if (((FractionCard)(Value.View)).Fraction.Numerateur < 0)
                 {
-                    xNum += textPaint.MeasureText("0");
-                    tailleNum *= 10;
+                    xNum -= textPaint.MeasureText("-");
                 }
-                while (tailleDen < Math.Pow(10, (int)(sizeMax * 0.5)))
+                if (((FractionCard)(Value.View)).Fraction.Denominateur < 0)
                 {
-                    xDen += textPaint2.MeasureText("0");
-                    tailleDen *= 10;
+                    xDen -= textPaint2.MeasureText("-");
                 }
 
                 canvas.DrawRect(card, textPaint1);
                 canvas.DrawText(((FractionCard)Value.View).Fraction.Numerateur.ToString(), xNum, -height * 0.5f, textPaint);
-                canvas.DrawText(fractionBarre, 0, -textPaint1.TextSize * 0.5f, textPaint1);
+                canvas.DrawText(fractionBarre, -textPaint1.MeasureText("_") * 0.5f, -textPaint1.TextSize * 0.5f, textPaint1);
                 canvas.DrawText(((FractionCard)Value.View).Fraction.Denominateur.ToString(), xDen, height * 0.5f, textPaint2);
             }
             else
diff --git a/com.uca.thegameextreme-Signed.apk b/com.uca.thegameextreme-Signed.apk
index 1df964a..66f1735 100644
Binary files a/com.uca.thegameextreme-Signed.apk and b/com.uca.thegameextreme-Signed.apk differ
diff --git a/com.uca.thegameextreme.apk b/com.uca.thegameextreme.apk
index c857266..0cb6df4 100644
Binary files a/com.uca.thegameextreme.apk and b/com.uca.thegameextreme.apk differ