diff --git a/lib/consts.dart b/lib/consts.dart
index 3f32f8b1c..5dfeea636 100644
--- a/lib/consts.dart
+++ b/lib/consts.dart
@@ -88,7 +88,8 @@ enum HistoryRetentionPeriod {
 enum ItemMenuOption {
   edit("Rename"),
   delete("Delete"),
-  duplicate("Duplicate");
+  duplicate("Duplicate"),
+  editColor("Change Color");
 
   const ItemMenuOption(this.label);
   final String label;
diff --git a/lib/dashbot/providers/dashbot_window_notifier.g.dart b/lib/dashbot/providers/dashbot_window_notifier.g.dart
deleted file mode 100644
index e4a8aed2d..000000000
--- a/lib/dashbot/providers/dashbot_window_notifier.g.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'dashbot_window_notifier.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-String _$dashbotWindowNotifierHash() =>
-    r'239915bec100bc33e5533291ff10233ea197d556';
-
-/// See also [DashbotWindowNotifier].
-@ProviderFor(DashbotWindowNotifier)
-final dashbotWindowNotifierProvider =
-    NotifierProvider<DashbotWindowNotifier, DashbotWindowModel>.internal(
-  DashbotWindowNotifier.new,
-  name: r'dashbotWindowNotifierProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$dashbotWindowNotifierHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
-
-typedef _$DashbotWindowNotifier = Notifier<DashbotWindowModel>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
diff --git a/lib/providers/environment_providers.dart b/lib/providers/environment_providers.dart
index b431930ba..3307e0f5e 100644
--- a/lib/providers/environment_providers.dart
+++ b/lib/providers/environment_providers.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:apidash/consts.dart';
 import 'package:apidash/providers/providers.dart';
 import 'package:apidash/utils/file_utils.dart';
@@ -104,11 +106,12 @@ class EnvironmentsStateNotifier
     }
   }
 
-  void addEnvironment() {
+  void addEnvironment({Color? color}) {
     final id = getNewUuid();
     final newEnvironmentModel = EnvironmentModel(
       id: id,
       values: [],
+      color: color??kGlobalColor
     );
     state = {
       ...state!,
@@ -124,12 +127,13 @@ class EnvironmentsStateNotifier
 
   void updateEnvironment(
     String id, {
-    String? name,
+    String? name, Color? color,
     List<EnvironmentVariableModel>? values,
   }) {
     final environment = state![id]!;
     final updatedEnvironment = environment.copyWith(
       name: name ?? environment.name,
+      color: color ?? environment.color,
       values: values ?? environment.values,
     );
     state = {
diff --git a/lib/screens/common_widgets/environment_dropdown.dart b/lib/screens/common_widgets/environment_dropdown.dart
index 0459b9c78..e9aab2048 100644
--- a/lib/screens/common_widgets/environment_dropdown.dart
+++ b/lib/screens/common_widgets/environment_dropdown.dart
@@ -17,6 +17,7 @@ class EnvironmentDropdown extends ConsumerWidget {
     return EnvironmentPopupMenu(
       value: environments?[activeEnvironment],
       options: environmentsList,
+      color: environments?[activeEnvironment]?.color,
       onChanged: (value) {
         if (value != null) {
           ref.read(activeEnvironmentIdStateProvider.notifier).state = value.id;
diff --git a/lib/screens/envvar/environments_pane.dart b/lib/screens/envvar/environments_pane.dart
index 2c74742ea..9a344adf9 100644
--- a/lib/screens/envvar/environments_pane.dart
+++ b/lib/screens/envvar/environments_pane.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:apidash_core/apidash_core.dart';
 import 'package:apidash_design_system/apidash_design_system.dart';
 import 'package:flutter/material.dart';
@@ -23,9 +25,10 @@ class EnvironmentsPane extends ConsumerWidget {
         children: [
           SidebarHeader(
             onAddNew: () {
+              Color newColor = kEnvColors[Random().nextInt(kEnvColors.length)];
               ref
                   .read(environmentsStateNotifierProvider.notifier)
-                  .addEnvironment();
+                  .addEnvironment(color: newColor);
             },
           ),
           kVSpacer10,
@@ -182,6 +185,7 @@ class EnvironmentItem extends ConsumerWidget {
       isActive: id == activeEnvironmentId,
       isGlobal: id == kGlobalEnvironmentId,
       name: environmentModel.name,
+      color: environmentModel.color,
       selectedId: selectedId,
       editRequestId: editRequestId,
       setActive: (value) {
@@ -225,7 +229,68 @@ class EnvironmentItem extends ConsumerWidget {
               .read(environmentsStateNotifierProvider.notifier)
               .duplicateEnvironment(id);
         }
+        if (item == ItemMenuOption.editColor) {
+          showEnvColorPickerDialog(
+            context,
+            ref.read(environmentsStateNotifierProvider.notifier),
+            id,
+          );
+        }
       },
     );
   }
 }
+
+void showEnvColorPickerDialog(
+  BuildContext context,
+  EnvironmentsStateNotifier notifier,
+  String id,
+) {
+  showDialog(
+    context: context,
+    builder: (context) {
+      Color? hoveredColor;
+
+      return StatefulBuilder(
+        builder: (context, setState) => AlertDialog(
+          title: const Text('Pick a color'),
+          content: SizedBox(
+            width: 250,
+            child: Wrap(
+              spacing: 12,
+              runSpacing: 12,
+              children: kEnvColors.map((color) {
+                final isHovered = color == hoveredColor;
+
+                final displayColor = isHovered
+                    ? Color.alphaBlend(
+                        Colors.black.withValues(alpha: 0.25), color)
+                    : color;
+
+                return MouseRegion(
+                  onEnter: (_) => setState(() => hoveredColor = color),
+                  onExit: (_) => setState(() => hoveredColor = null),
+                  child: GestureDetector(
+                    onTap: () {
+                      notifier.updateEnvironment(id, color: color);
+                      Navigator.of(context).pop();
+                    },
+                    child: AnimatedContainer(
+                      duration: const Duration(milliseconds: 150),
+                      width: 36,
+                      height: 36,
+                      decoration: BoxDecoration(
+                        color: displayColor,
+                        shape: BoxShape.circle,
+                      ),
+                    ),
+                  ),
+                );
+              }).toList(),
+            ),
+          ),
+        ),
+      );
+    },
+  );
+}
diff --git a/lib/widgets/card_sidebar_environment.dart b/lib/widgets/card_sidebar_environment.dart
index f0a5d2ea8..2fb669d97 100644
--- a/lib/widgets/card_sidebar_environment.dart
+++ b/lib/widgets/card_sidebar_environment.dart
@@ -11,6 +11,7 @@ class SidebarEnvironmentCard extends StatelessWidget {
     this.isGlobal = false,
     this.isActive = false,
     this.name,
+    this.color,
     this.selectedId,
     this.editRequestId,
     this.setActive,
@@ -27,6 +28,7 @@ class SidebarEnvironmentCard extends StatelessWidget {
   final bool isGlobal;
   final bool isActive;
   final String? name;
+  final Color? color;
   final String? selectedId;
   final String? editRequestId;
   final void Function(bool?)? setActive;
@@ -41,8 +43,8 @@ class SidebarEnvironmentCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    final Color color =
-        isGlobal ? colorScheme.secondaryContainer : colorScheme.surface;
+    final colorDot =  color;
+    final Color surfaceColor = colorScheme.surface;
     final Color colorVariant = colorScheme.surfaceContainer;
     final Color surfaceTint = colorScheme.primary;
     bool isSelected = selectedId == id;
@@ -61,8 +63,8 @@ class SidebarEnvironmentCard extends StatelessWidget {
         color: isSelected && !isGlobal
             ? colorScheme.brightness == Brightness.dark
                 ? colorVariant
-                : color
-            : color,
+                : surfaceColor
+            : surfaceColor,
         margin: EdgeInsets.zero,
         child: InkWell(
           borderRadius: kBorderRadius8,
@@ -109,11 +111,22 @@ class SidebarEnvironmentCard extends StatelessWidget {
                               border: InputBorder.none,
                             ),
                           )
-                        : Text(
-                            nm,
-                            softWrap: false,
-                            overflow: TextOverflow.fade,
-                          ),
+                        : Row(
+                          children: [
+                            Container(width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  color: colorDot),
+                              margin: kPe8,
+                            ),
+                            Text(
+                                nm,
+                                softWrap: false,
+                                overflow: TextOverflow.fade,
+                              ),
+                          ],
+                        ),
                   ),
                   Visibility(
                     visible: isSelected && !inEditMode && !isGlobal,
diff --git a/lib/widgets/popup_menu_env.dart b/lib/widgets/popup_menu_env.dart
index 320269545..378c8dcbb 100644
--- a/lib/widgets/popup_menu_env.dart
+++ b/lib/widgets/popup_menu_env.dart
@@ -10,11 +10,13 @@ class EnvironmentPopupMenu extends StatelessWidget {
     this.value,
     this.options,
     this.onChanged,
+    this.color
   });
 
   final EnvironmentModel? value;
   final void Function(EnvironmentModel? value)? onChanged;
   final List<EnvironmentModel>? options;
+  final Color? color;
 
   @override
   Widget build(BuildContext context) {
@@ -30,13 +32,15 @@ class EnvironmentPopupMenu extends StatelessWidget {
                 e,
                 (e.id == kGlobalEnvironmentId)
                     ? "Global"
-                    : getEnvironmentTitle(e.name).clip(30)
+                    : getEnvironmentTitle(e.name).clip(30),
               )) ??
           [],
       width: width,
       tooltip: "Select Environment",
       onChanged: onChanged,
       isOutlined: true,
+      borderColor: color,
+      colorResolver: (env) => env?.color,
     );
   }
 }
diff --git a/packages/apidash_core/lib/consts.dart b/packages/apidash_core/lib/consts.dart
index 3d5d19c86..1a8a4da94 100644
--- a/packages/apidash_core/lib/consts.dart
+++ b/packages/apidash_core/lib/consts.dart
@@ -1 +1,5 @@
+import 'package:flutter/material.dart';
+
 enum EnvironmentVariableType { variable, secret }
+
+const kGlobalColor = Colors.blue;
\ No newline at end of file
diff --git a/packages/apidash_core/lib/models/environment_model.dart b/packages/apidash_core/lib/models/environment_model.dart
index 9242d4d59..5cf963192 100644
--- a/packages/apidash_core/lib/models/environment_model.dart
+++ b/packages/apidash_core/lib/models/environment_model.dart
@@ -1,3 +1,5 @@
+import 'dart:ui';
+
 import 'package:freezed_annotation/freezed_annotation.dart';
 import '../consts.dart';
 
@@ -15,6 +17,7 @@ class EnvironmentModel with _$EnvironmentModel {
     required String id,
     @Default("") String name,
     @Default([]) List<EnvironmentVariableModel> values,
+    @ColorConverter() @Default(kGlobalColor) Color color
   }) = _EnvironmentModel;
 
   factory EnvironmentModel.fromJson(Map<String, Object?> json) =>
@@ -39,7 +42,7 @@ class EnvironmentVariableModel with _$EnvironmentVariableModel {
 }
 
 const kEnvironmentVariableEmptyModel =
-    EnvironmentVariableModel(key: "", value: "");
+EnvironmentVariableModel(key: "", value: "");
 const kEnvironmentSecretEmptyModel = EnvironmentVariableModel(
     key: "", value: "", type: EnvironmentVariableType.secret);
 
@@ -80,3 +83,13 @@ class EnvironmentVariableSuggestion {
   int get hashCode =>
       environmentId.hashCode ^ variable.hashCode ^ isUnknown.hashCode;
 }
+
+class ColorConverter implements JsonConverter<Color, int> {
+  const ColorConverter();
+
+  @override
+  Color fromJson(int json) => Color(json);
+
+  @override
+  int toJson(Color object) => object.toARGB32();
+}
\ No newline at end of file
diff --git a/packages/apidash_core/lib/models/environment_model.freezed.dart b/packages/apidash_core/lib/models/environment_model.freezed.dart
index a21c814cc..273ac1bc1 100644
--- a/packages/apidash_core/lib/models/environment_model.freezed.dart
+++ b/packages/apidash_core/lib/models/environment_model.freezed.dart
@@ -24,6 +24,8 @@ mixin _$EnvironmentModel {
   String get name => throw _privateConstructorUsedError;
   List<EnvironmentVariableModel> get values =>
       throw _privateConstructorUsedError;
+  @ColorConverter()
+  Color get color => throw _privateConstructorUsedError;
 
   /// Serializes this EnvironmentModel to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
@@ -41,7 +43,11 @@ abstract class $EnvironmentModelCopyWith<$Res> {
           EnvironmentModel value, $Res Function(EnvironmentModel) then) =
       _$EnvironmentModelCopyWithImpl<$Res, EnvironmentModel>;
   @useResult
-  $Res call({String id, String name, List<EnvironmentVariableModel> values});
+  $Res call(
+      {String id,
+      String name,
+      List<EnvironmentVariableModel> values,
+      @ColorConverter() Color color});
 }
 
 /// @nodoc
@@ -62,6 +68,7 @@ class _$EnvironmentModelCopyWithImpl<$Res, $Val extends EnvironmentModel>
     Object? id = null,
     Object? name = null,
     Object? values = null,
+    Object? color = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -76,6 +83,10 @@ class _$EnvironmentModelCopyWithImpl<$Res, $Val extends EnvironmentModel>
           ? _value.values
           : values // ignore: cast_nullable_to_non_nullable
               as List<EnvironmentVariableModel>,
+      color: null == color
+          ? _value.color
+          : color // ignore: cast_nullable_to_non_nullable
+              as Color,
     ) as $Val);
   }
 }
@@ -88,7 +99,11 @@ abstract class _$$EnvironmentModelImplCopyWith<$Res>
       __$$EnvironmentModelImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({String id, String name, List<EnvironmentVariableModel> values});
+  $Res call(
+      {String id,
+      String name,
+      List<EnvironmentVariableModel> values,
+      @ColorConverter() Color color});
 }
 
 /// @nodoc
@@ -107,6 +122,7 @@ class __$$EnvironmentModelImplCopyWithImpl<$Res>
     Object? id = null,
     Object? name = null,
     Object? values = null,
+    Object? color = null,
   }) {
     return _then(_$EnvironmentModelImpl(
       id: null == id
@@ -121,6 +137,10 @@ class __$$EnvironmentModelImplCopyWithImpl<$Res>
           ? _value._values
           : values // ignore: cast_nullable_to_non_nullable
               as List<EnvironmentVariableModel>,
+      color: null == color
+          ? _value.color
+          : color // ignore: cast_nullable_to_non_nullable
+              as Color,
     ));
   }
 }
@@ -132,7 +152,8 @@ class _$EnvironmentModelImpl implements _EnvironmentModel {
   const _$EnvironmentModelImpl(
       {required this.id,
       this.name = "",
-      final List<EnvironmentVariableModel> values = const []})
+      final List<EnvironmentVariableModel> values = const [],
+      @ColorConverter() this.color = kGlobalColor})
       : _values = values;
 
   factory _$EnvironmentModelImpl.fromJson(Map<String, dynamic> json) =>
@@ -152,9 +173,14 @@ class _$EnvironmentModelImpl implements _EnvironmentModel {
     return EqualUnmodifiableListView(_values);
   }
 
+  @override
+  @JsonKey()
+  @ColorConverter()
+  final Color color;
+
   @override
   String toString() {
-    return 'EnvironmentModel(id: $id, name: $name, values: $values)';
+    return 'EnvironmentModel(id: $id, name: $name, values: $values, color: $color)';
   }
 
   @override
@@ -164,13 +190,14 @@ class _$EnvironmentModelImpl implements _EnvironmentModel {
             other is _$EnvironmentModelImpl &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.name, name) || other.name == name) &&
-            const DeepCollectionEquality().equals(other._values, _values));
+            const DeepCollectionEquality().equals(other._values, _values) &&
+            (identical(other.color, color) || other.color == color));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(
-      runtimeType, id, name, const DeepCollectionEquality().hash(_values));
+  int get hashCode => Object.hash(runtimeType, id, name,
+      const DeepCollectionEquality().hash(_values), color);
 
   /// Create a copy of EnvironmentModel
   /// with the given fields replaced by the non-null parameter values.
@@ -193,7 +220,8 @@ abstract class _EnvironmentModel implements EnvironmentModel {
   const factory _EnvironmentModel(
       {required final String id,
       final String name,
-      final List<EnvironmentVariableModel> values}) = _$EnvironmentModelImpl;
+      final List<EnvironmentVariableModel> values,
+      @ColorConverter() final Color color}) = _$EnvironmentModelImpl;
 
   factory _EnvironmentModel.fromJson(Map<String, dynamic> json) =
       _$EnvironmentModelImpl.fromJson;
@@ -204,6 +232,9 @@ abstract class _EnvironmentModel implements EnvironmentModel {
   String get name;
   @override
   List<EnvironmentVariableModel> get values;
+  @override
+  @ColorConverter()
+  Color get color;
 
   /// Create a copy of EnvironmentModel
   /// with the given fields replaced by the non-null parameter values.
diff --git a/packages/apidash_core/lib/models/environment_model.g.dart b/packages/apidash_core/lib/models/environment_model.g.dart
index dd6b98e91..c4837732a 100644
--- a/packages/apidash_core/lib/models/environment_model.g.dart
+++ b/packages/apidash_core/lib/models/environment_model.g.dart
@@ -15,6 +15,9 @@ _$EnvironmentModelImpl _$$EnvironmentModelImplFromJson(Map json) =>
                   Map<String, Object?>.from(e as Map)))
               .toList() ??
           const [],
+      color: json['color'] == null
+          ? kGlobalColor
+          : const ColorConverter().fromJson((json['color'] as num).toInt()),
     );
 
 Map<String, dynamic> _$$EnvironmentModelImplToJson(
@@ -23,6 +26,7 @@ Map<String, dynamic> _$$EnvironmentModelImplToJson(
       'id': instance.id,
       'name': instance.name,
       'values': instance.values.map((e) => e.toJson()).toList(),
+      'color': const ColorConverter().toJson(instance.color),
     };
 
 _$EnvironmentVariableModelImpl _$$EnvironmentVariableModelImplFromJson(
diff --git a/packages/apidash_core/pubspec.yaml b/packages/apidash_core/pubspec.yaml
index 17b5433d5..1313ed9a7 100644
--- a/packages/apidash_core/pubspec.yaml
+++ b/packages/apidash_core/pubspec.yaml
@@ -13,14 +13,14 @@ dependencies:
     sdk: flutter
   curl_parser:
     path: ../curl_parser
-  freezed_annotation: ^3.0.0
+  freezed_annotation: ^2.0.3
   genai:
     path: ../genai
   har:
     path: ../har
   insomnia_collection:
     path: ../insomnia_collection
-  openapi_spec: ^0.15.0
+  openapi_spec: ^0.7.26
   postman:
     path: ../postman
   xml: ^6.3.0
@@ -30,6 +30,6 @@ dev_dependencies:
     sdk: flutter
   build_runner: ^2.4.12
   flutter_lints: ^6.0.0
-  freezed: ^3.0.6
+  freezed: ^2.5.7
   json_serializable: ^6.7.1
   test: ^1.25.2
diff --git a/packages/apidash_core/pubspec_overrides.yaml b/packages/apidash_core/pubspec_overrides.yaml
index 1df19ae78..e27478f99 100644
--- a/packages/apidash_core/pubspec_overrides.yaml
+++ b/packages/apidash_core/pubspec_overrides.yaml
@@ -1,16 +1,16 @@
-# melos_managed_dependency_overrides: better_networking,curl_parser,har,insomnia_collection,postman,seed,genai
+# melos_managed_dependency_overrides: better_networking,curl_parser,genai,har,insomnia_collection,postman,seed
 dependency_overrides:
   better_networking:
-    path: ../better_networking
+    path: ..\\better_networking
   curl_parser:
-    path: ../curl_parser
+    path: ..\\curl_parser
   genai:
-    path: ../genai
+    path: ..\\genai
   har:
-    path: ../har
+    path: ..\\har
   insomnia_collection:
-    path: ../insomnia_collection
+    path: ..\\insomnia_collection
   postman:
-    path: ../postman
+    path: ..\\postman
   seed:
-    path: ../seed
+    path: ..\\seed
diff --git a/packages/apidash_design_system/lib/tokens/colors.dart b/packages/apidash_design_system/lib/tokens/colors.dart
index 7b2032121..82e6c0262 100644
--- a/packages/apidash_design_system/lib/tokens/colors.dart
+++ b/packages/apidash_design_system/lib/tokens/colors.dart
@@ -27,6 +27,17 @@ final kColorHttpMethodOptions = Colors.deepPurple.shade800;
 
 final kColorGQL = Colors.pink.shade600;
 
+const kEnvColors = [
+    Color(0xFF4CAF50),
+    Color(0xFF2196F3),
+    Color(0xFFFFC107),
+    Color(0xFFF44336),
+    Color(0xFF9C27B0),
+    Color(0xFF00BCD4),
+    Color(0xFF607D8B),
+    Color(0xFFFF9800),
+];
+
 const kHintOpacity = 0.6;
 const kForegroundOpacity = 0.05;
 const kOverlayBackgroundOpacity = 0.5;
diff --git a/packages/apidash_design_system/lib/widgets/popup_menu.dart b/packages/apidash_design_system/lib/widgets/popup_menu.dart
index 76c54eb57..0701ea491 100644
--- a/packages/apidash_design_system/lib/widgets/popup_menu.dart
+++ b/packages/apidash_design_system/lib/widgets/popup_menu.dart
@@ -1,17 +1,18 @@
 import 'package:flutter/material.dart';
 import '../tokens/tokens.dart';
 
+
 class ADPopupMenu<T> extends StatelessWidget {
-  const ADPopupMenu({
-    super.key,
-    this.value,
-    required this.values,
-    this.onChanged,
-    this.tooltip,
-    this.width,
-    this.isOutlined = false,
-    this.borderColor,
-  });
+  const ADPopupMenu(
+      {super.key,
+      this.value,
+      required this.values,
+      this.onChanged,
+      this.tooltip,
+      this.width,
+      this.isOutlined = false,
+      this.borderColor,
+      this.colorResolver});
 
   final String? value;
   final Iterable<(T, String?)> values;
@@ -20,6 +21,7 @@ class ADPopupMenu<T> extends StatelessWidget {
   final double? width;
   final bool isOutlined;
   final Color? borderColor;
+  final Color? Function(T)? colorResolver;
 
   @override
   Widget build(BuildContext context) {
@@ -31,9 +33,21 @@ class ADPopupMenu<T> extends StatelessWidget {
       itemBuilder: (BuildContext context) => values
           .map((item) => PopupMenuItem<T>(
                 value: item.$1,
-                child: Text(
-                  item.$2 ?? "",
-                  style: kTextStylePopupMenuItem,
+                child: Row(
+                  children: [
+                    if (colorResolver != null)
+                      Container(
+                        width: 8,
+                        height: 8,
+                        decoration: BoxDecoration(
+                            shape: BoxShape.circle, color: colorResolver!(item.$1)),
+                        margin: kPe8,
+                      ),
+                    Text(
+                      item.$2 ?? "",
+                      style: kTextStylePopupMenuItem,
+                    ),
+                  ],
                 ),
               ))
           .toList(),
diff --git a/packages/better_networking/example/pubspec_overrides.yaml b/packages/better_networking/example/pubspec_overrides.yaml
index c5546100b..c3cd1bc1a 100644
--- a/packages/better_networking/example/pubspec_overrides.yaml
+++ b/packages/better_networking/example/pubspec_overrides.yaml
@@ -3,4 +3,4 @@ dependency_overrides:
   better_networking:
     path: ..
   seed:
-    path: ../../seed
+    path: ..\\..\\seed
diff --git a/packages/better_networking/pubspec_overrides.yaml b/packages/better_networking/pubspec_overrides.yaml
index 8fa1ad795..5f6c4c0da 100644
--- a/packages/better_networking/pubspec_overrides.yaml
+++ b/packages/better_networking/pubspec_overrides.yaml
@@ -1,4 +1,4 @@
 # melos_managed_dependency_overrides: seed
 dependency_overrides:
   seed:
-    path: ../seed
+    path: ..\\seed
diff --git a/packages/genai/genai_example/pubspec_overrides.yaml b/packages/genai/genai_example/pubspec_overrides.yaml
index 6581ff920..321aff9fd 100644
--- a/packages/genai/genai_example/pubspec_overrides.yaml
+++ b/packages/genai/genai_example/pubspec_overrides.yaml
@@ -1,8 +1,8 @@
 # melos_managed_dependency_overrides: better_networking,genai,seed
 dependency_overrides:
   better_networking:
-    path: ../../better_networking
+    path: ..\\..\\better_networking
   genai:
     path: ..
   seed:
-    path: ../../seed
+    path: ..\\..\\seed
diff --git a/packages/genai/pubspec_overrides.yaml b/packages/genai/pubspec_overrides.yaml
index 02df146a2..5a9b723b2 100644
--- a/packages/genai/pubspec_overrides.yaml
+++ b/packages/genai/pubspec_overrides.yaml
@@ -1,6 +1,6 @@
 # melos_managed_dependency_overrides: better_networking,seed
 dependency_overrides:
   better_networking:
-    path: ../better_networking
+    path: ..\\better_networking
   seed:
-    path: ../seed
+    path: ..\\seed
diff --git a/packages/har/pubspec.yaml b/packages/har/pubspec.yaml
index 4c90623e9..3304e085c 100644
--- a/packages/har/pubspec.yaml
+++ b/packages/har/pubspec.yaml
@@ -14,12 +14,12 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  freezed_annotation: ^3.0.0
+  freezed_annotation: ^2.0.3
   json_annotation: ^4.9.0
 
 dev_dependencies:
   build_runner: ^2.4.12
-  freezed: ^3.1.0
+  freezed: ^2.5.7
   json_serializable: ^6.7.1
   lints: ^4.0.0
   test: ^1.24.0
diff --git a/packages/insomnia_collection/pubspec.yaml b/packages/insomnia_collection/pubspec.yaml
index 38488be8b..541b40bb5 100644
--- a/packages/insomnia_collection/pubspec.yaml
+++ b/packages/insomnia_collection/pubspec.yaml
@@ -14,12 +14,12 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  freezed_annotation: ^3.0.0
+  freezed_annotation: ^2.0.3
   json_annotation: ^4.9.0
 
 dev_dependencies:
   build_runner: ^2.4.12
-  freezed: ^3.0.6
+  freezed: ^2.5.7
   json_serializable: ^6.7.1
   lints: ^4.0.0
   test: ^1.24.0
diff --git a/packages/postman/pubspec.yaml b/packages/postman/pubspec.yaml
index fce944bda..492b22388 100644
--- a/packages/postman/pubspec.yaml
+++ b/packages/postman/pubspec.yaml
@@ -14,11 +14,11 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  freezed_annotation: ^3.0.0
+  freezed_annotation: ^2.0.3
 
 dev_dependencies:
   build_runner: ^2.4.12
-  freezed: ^3.0.6
+  freezed: ^2.5.7
   json_serializable: ^6.7.1
   lints: ^4.0.0
   test: ^1.24.0
diff --git a/packages/seed/pubspec.yaml b/packages/seed/pubspec.yaml
index 885da5d90..066fb8adc 100644
--- a/packages/seed/pubspec.yaml
+++ b/packages/seed/pubspec.yaml
@@ -10,11 +10,11 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  freezed_annotation: ^3.0.0
+  freezed_annotation: ^2.0.3
 
 dev_dependencies:
   build_runner: ^2.4.12
-  freezed: ^3.0.6
+  freezed: ^2.5.7
   json_serializable: ^6.7.1
   lints: ^4.0.0
   test: ^1.24.0
diff --git a/pubspec.lock b/pubspec.lock
index 311796c21..0f3b505b8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1281,10 +1281,10 @@ packages:
     dependency: transitive
     description:
       name: openapi_spec
-      sha256: "0de980914cafaab7e2086f5541cefba1fb6a64510ab136bd3828bdf02e26c09d"
+      sha256: "68d74ac74d9c90807894b4e430f6906e1b6e478ab4596bc6589fe52ad5ef735a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.0"
+    version: "0.7.26"
   package_config:
     dependency: transitive
     description:
diff --git a/test/models/environment_models.dart b/test/models/environment_models.dart
index e23f659bd..69f503d56 100644
--- a/test/models/environment_models.dart
+++ b/test/models/environment_models.dart
@@ -1,5 +1,6 @@
 import 'package:apidash/consts.dart';
 import 'package:apidash_core/apidash_core.dart';
+import 'package:apidash_design_system/apidash_design_system.dart';
 
 /// Global environment model
 const globalEnvironment = EnvironmentModel(
@@ -17,13 +18,14 @@ const globalEnvironment = EnvironmentModel(
       enabled: false,
     ),
   ],
+  color: kGlobalColor
 );
 
 /// Basic Environment model with 2 variables
-const environmentModel1 = EnvironmentModel(
+final environmentModel1 = EnvironmentModel(
   id: 'environmentId',
   name: 'Development',
-  values: [
+  values: const [
     EnvironmentVariableModel(
       key: 'key1',
       value: 'value1',
@@ -37,13 +39,14 @@ const environmentModel1 = EnvironmentModel(
       enabled: false,
     ),
   ],
+  color: kEnvColors[0],
 );
 
 /// Basic Environment model with 2 secrets
-const environmentModel2 = EnvironmentModel(
+final environmentModel2 = EnvironmentModel(
   id: 'environmentId',
   name: 'Development',
-  values: [
+  values: const [
     EnvironmentVariableModel(
       key: 'key1',
       value: 'value1',
@@ -57,6 +60,7 @@ const environmentModel2 = EnvironmentModel(
       enabled: false,
     ),
   ],
+  color: kEnvColors[1]
 );
 
 /// Basic Environment Variable
@@ -88,7 +92,7 @@ const environmentVariableSuggestion2 = EnvironmentVariableSuggestion(
 );
 
 /// JSONs
-const environmentModel1Json = {
+final environmentModel1Json = {
   'id': 'environmentId',
   'name': 'Development',
   'values': [
@@ -105,9 +109,10 @@ const environmentModel1Json = {
       'enabled': false,
     },
   ],
+  'color': kEnvColors[0].toARGB32(),
 };
 
-const environmentModel2Json = {
+final environmentModel2Json = {
   'id': 'environmentId',
   'name': 'Development',
   'values': [
@@ -124,6 +129,7 @@ const environmentModel2Json = {
       'enabled': false,
     },
   ],
+  'color': kEnvColors[1].toARGB32(),
 };
 
 const environmentVariableModel1Json = {