diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6e88767c..020e5df0 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />    
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
diff --git a/lib/domain/connections_service.dart b/lib/domain/connections_service.dart
index 05e55b68..f077a512 100644
--- a/lib/domain/connections_service.dart
+++ b/lib/domain/connections_service.dart
@@ -10,6 +10,7 @@ import 'package:cybearjinni/infrastructure/core/logger.dart';
 import 'package:cybearjinni/infrastructure/network_utilities_flutter.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:grpc/grpc.dart';
 import 'package:location/location.dart';
 import 'package:network_info_plus/network_info_plus.dart';
diff --git a/lib/infrastructure/network_utilities_flutter.dart b/lib/infrastructure/network_utilities_flutter.dart
index 22304b14..a83079c0 100644
--- a/lib/infrastructure/network_utilities_flutter.dart
+++ b/lib/infrastructure/network_utilities_flutter.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:cbj_integrations_controller/integrations_controller.dart';
 import 'package:network_tools_flutter/network_tools_flutter.dart'
     as network_flutter;
+import 'package:network_tools_flutter/network_tools_flutter.dart';
 
 class NetworkUtilitiesFlutter extends NetworkUtilities {
   @override
@@ -13,7 +14,8 @@ class NetworkUtilitiesFlutter extends NetworkUtilities {
   }) =>
       network_flutter.HostScannerFlutter.getAllPingableDevices(
         subnet,
-        firstHostId: 127,
+        firstHostId: firstHostId ?? HostScanner.defaultFirstHostId,
+        lastHostId: lastHostId ?? HostScanner.defaultLastHostId,
       );
 
   @override
diff --git a/lib/presentation/molecules/devices/rgb_light_molecule.dart b/lib/presentation/molecules/devices/rgb_light_molecule.dart
index c8539aa4..ae78e220 100644
--- a/lib/presentation/molecules/devices/rgb_light_molecule.dart
+++ b/lib/presentation/molecules/devices/rgb_light_molecule.dart
@@ -161,7 +161,6 @@ class _LightColorMods extends State<LightColorMods> {
   late HSVColor hsvColor;
   late double brightness;
   late ColorMode colorMode;
-  late Widget colorModeWidget;
 
   @override
   void initState() {
@@ -170,7 +169,6 @@ class _LightColorMods extends State<LightColorMods> {
     hsvColor = widget.hsvColor ?? HSVColor.fromColor(Colors.white);
     colorTemperature = widget.colorTemperature;
     brightness = widget.brightness;
-    colorModeWidget = getColorModeWidget(colorMode);
 
     _initialized();
   }
@@ -283,22 +281,9 @@ class _LightColorMods extends State<LightColorMods> {
     );
   }
 
-  Widget getColorModeWidget(ColorMode colorMode) {
-    switch (colorMode) {
-      case ColorMode.undefined:
-        return const SizedBox();
-      case ColorMode.rgb:
-        return getHsvColorModeWidget();
-      case ColorMode.white:
-        return getWhiteModeWidget();
-    }
-  }
-
   void setColorModeState(ColorMode colorMode) {
-    final Widget colorModeWidget = getColorModeWidget(colorMode);
     setState(() {
       this.colorMode = colorMode;
-      this.colorModeWidget = colorModeWidget;
     });
   }
 
@@ -309,7 +294,10 @@ class _LightColorMods extends State<LightColorMods> {
 
     return Column(
       children: [
-        colorModeWidget,
+        if (colorMode == ColorMode.white)
+          getHsvColorModeWidget()
+        else if (colorMode == ColorMode.rgb)
+          getWhiteModeWidget(),
         const SeparatorAtom(variant: SeparatorVariant.reletedElements),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,
diff --git a/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart b/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart
index 6131c0e5..1b4237ce 100644
--- a/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart
+++ b/lib/presentation/pages/add_new_devices_process/computer_connection_check/widgets/computer_connection_check_widget.dart
@@ -122,7 +122,7 @@ class _ComputerConnectionCheckWidgetState
                 '$deviceNameFieldKey/${deviceE.uniqueId.getOrCrash()}']!
             .text;
         deviceEntityList.add(
-          deviceE..cbjEntityName = CbjEntityName(deviceName),
+          deviceE..cbjEntityName = CbjEntityName(value: deviceName),
         );
       } catch (e) {
         logger.w("Can't add unsupported device");
diff --git a/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart b/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart
index d22b8324..59efb79f 100644
--- a/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart
+++ b/lib/presentation/pages/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart
@@ -110,7 +110,7 @@ class _ConfigureNewCbjCompWidgetsState
                 '$deviceNameFieldKey/${deviceE.uniqueId.getOrCrash()}']!
             .text;
         deviceEntityList.add(
-          deviceE..cbjEntityName = CbjEntityName(deviceName),
+          deviceE..cbjEntityName = CbjEntityName(value: deviceName),
         );
       } catch (e) {
         logger.w("Can't add unsupported device");