diff --git a/.gitignore b/.gitignore
index 3f6474c3c..446e0ee36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,7 @@ keys.json
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 59cdec5c9..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "dart.previewLsp": true,
-    "editor.codeActionsOnSave": {
-        "source.fixAll": "explicit",
-        "source.organizeImports": "explicit",
-        "source.sortMembers": "never"
-    },
-    "editor.formatOnSave": true
-}
\ No newline at end of file
diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index 526e10214..c714f759a 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -107,7 +107,10 @@ abstract class AppConfig {
   static bool hideRedactedEvents = false;
   static bool hideUnknownEvents = true;
   static bool hideUnimportantStateEvents = true;
-  static bool separateChatTypes = false;
+  // #Pangea
+  // static bool separateChatTypes = false;
+  static bool separateChatTypes = true;
+  // Pangea#
   static bool autoplayImages = true;
   static bool sendTypingNotifications = true;
   static bool sendPublicReadReceipts = true;
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 8beb411d9..3834bfa93 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -43,7 +43,6 @@ import '../../widgets/matrix.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
-
 enum PopupMenuAction {
   settings,
   invite,
diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index d645f73ef..bdc282486 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -168,15 +168,8 @@ class ChatListViewBody extends StatelessWidget {
                         ),
                       ),
                     ),
-                    // #Pangea
-                    if (!controller.isSearchMode)
-
-                      // if (client.rooms.isNotEmpty && !controller.isSearchMode)
-                      // let's simplify this UI while the user has less chat than
-                      // can fill this view
-                      if (client.rooms.length <= 7 || controller.isSearchMode)
-                        const SizedBox(height: 8),
-                    if (client.rooms.length > 7 && !controller.isSearchMode)
+                    if (client.rooms.isNotEmpty && !controller.isSearchMode)
+                      // #Pangea
                       // SizedBox(
                       //   height: 64,
                       //   child: ListView(