diff --git a/analysis_options.yaml b/analysis_options.yaml
index 80a63bcb..611cf313 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,33 +1,27 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
+include: package:very_good_analysis/analysis_options.yaml
 
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
 analyzer:
   errors:
-    constant_identifier_names: ignore
-    overridden_fields: ignore
-include: package:flutter_lints/flutter.yaml
+    strict_raw_type: warning
+    argument_type_not_assignable: warning
+    invalid_assignment: warning
+    return_of_invalid_type: warning
+    return_of_invalid_type_from_closure: warning
+    list_element_type_not_assignable: warning
+    for_in_of_invalid_type: warning
+    cast_nullable_to_non_nullable: warning
+    non_bool_condition: warning
+    field_initializer_not_assignable: warning
+    non_bool_negation_expression: warning
+    non_bool_operand: warning
 
 linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at https://dart.dev/lints.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
   rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-    prefer_const_constructors: true
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+    prefer_single_quotes: true
+    avoid_print: false
+    public_member_api_docs: false
+    sort_pub_dependencies: false
+    one_member_abstracts: false
+    prefer_int_literals: false
+    sort_constructors_first: false
+    avoid_redundant_argument_values: false
diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index f666c078..a4d6628e 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -491,6 +491,12 @@ class SpaceManagementBloc
           event.communityUuid,
           emit,
         );
+        event.spaces.removeWhere(
+          (space) => space.status == SpaceStatus.deleted,
+        );
+        event.spaces.forEach(
+          (space) => space.status = SpaceStatus.unchanged,
+        );
       }
     } catch (e) {
       // emit(SpaceManagementError('Error saving spaces: $e'));
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
new file mode 100644
index 00000000..585688ef
--- /dev/null
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -0,0 +1,26 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+import firebase_analytics
+import firebase_core
+import firebase_crashlytics
+import firebase_database
+import flutter_secure_storage_macos
+import path_provider_foundation
+import shared_preferences_foundation
+import url_launcher_macos
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FirebaseAnalyticsPlugin"))
+  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
+  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
+  FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin"))
+  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index edd003cf..c4692ac4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -69,12 +69,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^5.0.0
+  very_good_analysis: ^9.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec