diff --git a/lib/views/main_view.dart b/lib/views/main_view.dart
index 4408eea..f80ad8f 100644
--- a/lib/views/main_view.dart
+++ b/lib/views/main_view.dart
@@ -600,7 +600,7 @@ class _NavDrawerState extends State<NavDrawer> {
         homePlayerNickname = id;
       }
     } else {
-      homePlayerNickname = "dan63";
+      homePlayerNickname = "dan63047";
     }
     setState(() {});
   }
diff --git a/lib/views/settings_view.dart b/lib/views/settings_view.dart
index 92670d5..87d55f3 100644
--- a/lib/views/settings_view.dart
+++ b/lib/views/settings_view.dart
@@ -48,11 +48,7 @@ class SettingsState extends State<SettingsView> {
 
   Future<void> _getPreferences() async {
     prefs = await SharedPreferences.getInstance();
-    if (prefs.getBool("showPositions") != null) {
-      showPositions = prefs.getBool("showPositions")!;
-    } else {
-      showPositions = false;
-    }
+    showPositions = prefs.getBool("showPositions") ?? false;
     _setDefaultNickname(prefs.getString("player"));
   }
 
@@ -64,7 +60,7 @@ class SettingsState extends State<SettingsView> {
         defaultNickname = n;
       }
     } else {
-      defaultNickname = "6098518e3d5155e6ec429cdc";
+      defaultNickname = "dan63047";
     }
     setState(() {});
   }
diff --git a/lib/widgets/tl_progress_bar.dart b/lib/widgets/tl_progress_bar.dart
index a2f6dbd..9359629 100644
--- a/lib/widgets/tl_progress_bar.dart
+++ b/lib/widgets/tl_progress_bar.dart
@@ -70,7 +70,7 @@ class TLProgress extends StatelessWidget{
                       if (tlData.nextAt > 0 && nextRankTRcutoff != null) const TextSpan(text: "\n"),
                       if (nextRankTRcutoff != null) TextSpan(text: "${f2.format(nextRankTRcutoff)} (${comparef2.format(nextRankTRcutoff!-tlData.rating)}) TR"),
                       if ((tlData.nextAt > 0 || nextRankTRcutoff != null) && nextRankGlickoCutoff != null) const TextSpan(text: "\n"),
-                      if (nextRankGlickoCutoff != null) TextSpan(text: (tlData.standing < tlData.nextAt || (nextRankGlickoCutoff!-tlData.glicko!)/glickoForWin < 0.5) ? t.promotionOnNextWin : t.numOfVictories(wins: f2.format((nextRankGlickoCutoff!-tlData.glicko!)/glickoForWin)), style: TextStyle(color: (tlData.standing < tlData.nextAt || (nextRankGlickoCutoff!-tlData.glicko!)/glickoForWin < 0.5) ? Colors.greenAccent : null))
+                      if (nextRankGlickoCutoff != null) TextSpan(text: (tlData.standing < tlData.nextAt || ((nextRankGlickoCutoff!-tlData.glicko!)/glickoForWin < 0.5 && tlData.percentileRank != "x")) ? t.promotionOnNextWin : t.numOfVictories(wins: f2.format((nextRankGlickoCutoff!-tlData.glicko!)/glickoForWin)), style: TextStyle(color: (tlData.standing < tlData.nextAt || ((nextRankGlickoCutoff!-tlData.glicko!)/glickoForWin < 0.5 && tlData.percentileRank != "x")) ? Colors.greenAccent : null))
                     ]
                   )
                 ),
diff --git a/lib/widgets/user_thingy.dart b/lib/widgets/user_thingy.dart
index e197181..c99a53e 100644
--- a/lib/widgets/user_thingy.dart
+++ b/lib/widgets/user_thingy.dart
@@ -411,7 +411,7 @@ class UserThingy extends StatelessWidget {
                       errorBuilder: (context, error, stackTrace) {
                         developer.log("Error with building $badge", name: "main_view", error: error, stackTrace: stackTrace);
                         return Image.network(
-                          "https://tetr.io/res/badges/${badge.badgeId}.png",
+                          kIsWeb ? "https://ts.dan63.by/oskware_bridge.php?endpoint=TetrioBadge&badge=${badge.badgeId}" : "https://tetr.io/res/badges/${badge.badgeId}.png",
                           height: 32,
                           width: 32,
                           errorBuilder:(context, error, stackTrace) {
diff --git a/res/tetrio_badges/mmc_tabi_superlobby5.png b/res/tetrio_badges/mmc_tabi_superlobby5.png
new file mode 100644
index 0000000..edf07dd
Binary files /dev/null and b/res/tetrio_badges/mmc_tabi_superlobby5.png differ
diff --git a/res/tetrio_badges/pkstarcup_1.png b/res/tetrio_badges/pkstarcup_1.png
new file mode 100644
index 0000000..f91cb97
Binary files /dev/null and b/res/tetrio_badges/pkstarcup_1.png differ
diff --git a/res/tetrio_badges/pkstarcup_2.png b/res/tetrio_badges/pkstarcup_2.png
new file mode 100644
index 0000000..0e932d7
Binary files /dev/null and b/res/tetrio_badges/pkstarcup_2.png differ
diff --git a/res/tetrio_badges/pkstarcup_3.png b/res/tetrio_badges/pkstarcup_3.png
new file mode 100644
index 0000000..4004fea
Binary files /dev/null and b/res/tetrio_badges/pkstarcup_3.png differ
diff --git a/res/tetrio_badges/stride_superlobby.png b/res/tetrio_badges/stride_superlobby.png
new file mode 100644
index 0000000..cd43105
Binary files /dev/null and b/res/tetrio_badges/stride_superlobby.png differ
diff --git a/res/tetrio_badges/taws2_1.png b/res/tetrio_badges/taws2_1.png
new file mode 100644
index 0000000..61ac03c
Binary files /dev/null and b/res/tetrio_badges/taws2_1.png differ
diff --git a/res/tetrio_badges/taws2_2.png b/res/tetrio_badges/taws2_2.png
new file mode 100644
index 0000000..33939d0
Binary files /dev/null and b/res/tetrio_badges/taws2_2.png differ
diff --git a/res/tetrio_badges/taws2_3.png b/res/tetrio_badges/taws2_3.png
new file mode 100644
index 0000000..f80aa0f
Binary files /dev/null and b/res/tetrio_badges/taws2_3.png differ
diff --git a/res/tetrio_badges/ttsd_ou_1.png b/res/tetrio_badges/ttsd_ou_1.png
new file mode 100644
index 0000000..c937225
Binary files /dev/null and b/res/tetrio_badges/ttsd_ou_1.png differ
diff --git a/res/tetrio_badges/ttsd_ou_2.png b/res/tetrio_badges/ttsd_ou_2.png
new file mode 100644
index 0000000..1891b91
Binary files /dev/null and b/res/tetrio_badges/ttsd_ou_2.png differ
diff --git a/res/tetrio_badges/ttsd_ou_3.png b/res/tetrio_badges/ttsd_ou_3.png
new file mode 100644
index 0000000..28ea18a
Binary files /dev/null and b/res/tetrio_badges/ttsd_ou_3.png differ