diff --git a/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h b/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h
index d902716..6ae0c4e 100644
--- a/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h
+++ b/logic/include/viewModel/ColorMode/display/colormodedisplayviewmodel.h
@@ -14,7 +14,6 @@ class ColorModeDisplayViewModel : public BaseViewModel
 
     US_PROPERTY_VIEW_ONLY(bool, colorModeEnable, true)
 
-
 };
 
 #endif // COLORMODEDISPLAYVIEWMODEL_H
diff --git a/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h b/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h
index 0eb8262..946d5b9 100644
--- a/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h
+++ b/logic/include/viewModel/ColorMode/setting/colormodesettingviewmodel.h
@@ -53,6 +53,14 @@ class ColorModeSettingViewModel : public BaseViewModel
 
 
 
+    US_SPIN_BOX(reject, "Reject", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(depth, "Depth", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(dynamicContrast, "Dy.Cnt.", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(enhance, "Enhance", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(infoMax, "Max", (QList<QString>({""})), "", "", true, true, 0)
+    US_SPIN_BOX(infoMin, "Min", (QList<QString>({""})), "", "", true, true, 0)
+    US_PROPERTY(QString, displayInfoColorMap, "")
+
 };
 
 #endif // COLORMODESETTINGVIEWMODEL_H
diff --git a/logic/include/viewModel/MainViewModel.h b/logic/include/viewModel/MainViewModel.h
index a9abae5..4eebe66 100644
--- a/logic/include/viewModel/MainViewModel.h
+++ b/logic/include/viewModel/MainViewModel.h
@@ -15,8 +15,8 @@
 #include "viewModel/mMode/display/MModeDisplayViewModel.h"
 #include "viewModel/mMode/setting/MModeSettingViewModel.h"
 
-#include "viewModel/ColorMode/display/colormodedisplayviewmodel.h"
-#include "viewModel/ColorMode/setting/colormodesettingviewmodel.h"
+#include "viewModel/ColorMode/display/ColorModeDisplayViewModel.h"
+#include "viewModel/ColorMode/setting/ColorModeSettingViewModel.h"
 
 #include "viewModel/cine/display/CineDisplayViewModel.h"
 #include "viewModel/cine/setting/CineSettingViewModel.h"
diff --git a/logic/include/viewModel/image/ImageViewModel.h b/logic/include/viewModel/image/ImageViewModel.h
index 66d60dc..f1b7d21 100644
--- a/logic/include/viewModel/image/ImageViewModel.h
+++ b/logic/include/viewModel/image/ImageViewModel.h
@@ -73,7 +73,8 @@ private:
 	US_SWITCH_BUTTON_CUSTOM_SETTER_INTERNAL(quad, "Quad", "", true, true, false)
 
     US_PROPERTY_VIEW_ONLY(bool, mModeEnable, true)
-    US_PROPERTY_VIEW_ONLY(bool, mModeLineSelected, false)
+    US_PROPERTY_VIEW_ONLY(bool, mModeLineSelected, true)
+    US_PROPERTY_VIEW_ONLY(bool, cModeEnable, true)
 
 public:
     ColorImageProvider* imageProviderB;
diff --git a/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h b/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h
index 43de9a4..933dadb 100644
--- a/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h
+++ b/logic/include/viewModel/mMode/setting/MModeSettingViewModel.h
@@ -34,7 +34,6 @@ private:
 
     US_INFO_BOX(gain, "Gain", (QList<QString>({""})), "", "dB", true, true, 0)
 
-
     US_SWITCH_BUTTON(maxAngle, "Max Angle", "", true, true, false)
     US_JOYSTICK_NUMBER(angle, "Angle", "", "°", true, true, 0)
     US_SWITCH_BUTTON(virtualConvex, "Virtual Convex", "", true, true, false)
diff --git a/logic/include/viewModel/user/UserViewModel.h b/logic/include/viewModel/user/UserViewModel.h
index 09f7afa..c05bdcb 100644
--- a/logic/include/viewModel/user/UserViewModel.h
+++ b/logic/include/viewModel/user/UserViewModel.h
@@ -20,6 +20,8 @@ private:
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementCalculation, false)
 
     US_PROPERTY_VIEW_ONLY(bool, viewMeasurementTopBar, false)
+
+    US_PROPERTY_VIEW_ONLY(bool, dialogPowerOffSystem, true)
 };
 
 #endif //USERVIEWMODEL_H
diff --git a/logic/src/viewModel/MainViewModel.cpp b/logic/src/viewModel/MainViewModel.cpp
index e2fba2d..122bf89 100644
--- a/logic/src/viewModel/MainViewModel.cpp
+++ b/logic/src/viewModel/MainViewModel.cpp
@@ -27,6 +27,9 @@ MainViewModel::MainViewModel(QObject* parent) :
 	_vms.push_back(_mModeDisplayViewModel);
 	_vms.push_back(_mModeSettingViewModel);
 
+    _vms.push_back(_colorModeDisplayViewModel);
+    _vms.push_back(_colorModeSettingViewModel);
+
 	_vms.push_back(_cineDisplayViewModel);
 	_vms.push_back(_cineSettingViewModel);
 
diff --git a/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp b/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp
index f570efa..42575b1 100644
--- a/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp
+++ b/logic/src/viewModel/colorMode/colormodesettingviewmodel.cpp
@@ -1,4 +1,4 @@
-#include "viewModel/ColorMode/setting/colormodesettingviewmodel.h"
+#include "viewModel/ColorMode/setting/ColorModeSettingViewModel.h"
 
 SINGLETON_DEF(ColorModeSettingViewModel)
 
diff --git a/ui b/ui
index 8f04d99..0f4a4eb 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit 8f04d999366ec1d722742feb9a1ce1a7e8826456
+Subproject commit 0f4a4ebaccd468937eb9fe15cad1e97087807a95