diff --git a/src/macro-core/macro-action-timer.cpp b/src/macro-core/macro-action-timer.cpp
index 71a164e7..a6970eae 100644
--- a/src/macro-core/macro-action-timer.cpp
+++ b/src/macro-core/macro-action-timer.cpp
@@ -14,7 +14,7 @@ bool MacroActionTimer::_registered = MacroActionFactory::Register(
 	{MacroActionTimer::Create, MacroActionTimerEdit::Create,
 	 "AdvSceneSwitcher.action.timer"});
 
-static std::map<TimerAction, std::string> timerActions = {
+const static std::map<TimerAction, std::string> timerActions = {
 	{TimerAction::PAUSE, "AdvSceneSwitcher.action.timer.type.pause"},
 	{TimerAction::CONTINUE, "AdvSceneSwitcher.action.timer.type.continue"},
 	{TimerAction::RESET, "AdvSceneSwitcher.action.timer.type.reset"},
diff --git a/src/macro-core/macro-action-variable.cpp b/src/macro-core/macro-action-variable.cpp
index 63d22d52..b9584b65 100644
--- a/src/macro-core/macro-action-variable.cpp
+++ b/src/macro-core/macro-action-variable.cpp
@@ -16,7 +16,7 @@ bool MacroActionVariable::_registered = MacroActionFactory::Register(
 	{MacroActionVariable::Create, MacroActionVariableEdit::Create,
 	 "AdvSceneSwitcher.action.variable"});
 
-static std::map<MacroActionVariable::Type, std::string> actionTypes = {
+const static std::map<MacroActionVariable::Type, std::string> actionTypes = {
 	{MacroActionVariable::Type::SET_FIXED_VALUE,
 	 "AdvSceneSwitcher.action.variable.type.set"},
 	{MacroActionVariable::Type::APPEND,
diff --git a/src/macro-core/macro-action-wait.cpp b/src/macro-core/macro-action-wait.cpp
index 38637962..67d125ce 100644
--- a/src/macro-core/macro-action-wait.cpp
+++ b/src/macro-core/macro-action-wait.cpp
@@ -13,7 +13,7 @@ bool MacroActionWait::_registered = MacroActionFactory::Register(
 	{MacroActionWait::Create, MacroActionWaitEdit::Create,
 	 "AdvSceneSwitcher.action.wait"});
 
-static std::map<WaitType, std::string> waitTypes = {
+const static std::map<WaitType, std::string> waitTypes = {
 	{WaitType::FIXED, "AdvSceneSwitcher.action.wait.type.fixed"},
 	{WaitType::RANDOM, "AdvSceneSwitcher.action.wait.type.random"},
 };
diff --git a/src/macro-core/macro-action-websocket.cpp b/src/macro-core/macro-action-websocket.cpp
index ae8364fd..206ce709 100644
--- a/src/macro-core/macro-action-websocket.cpp
+++ b/src/macro-core/macro-action-websocket.cpp
@@ -10,7 +10,7 @@ bool MacroActionWebsocket::_registered = MacroActionFactory::Register(
 	{MacroActionWebsocket::Create, MacroActionWebsocketEdit::Create,
 	 "AdvSceneSwitcher.action.websocket"});
 
-static std::map<MacroActionWebsocket::Type, std::string> actionTypes = {
+const static std::map<MacroActionWebsocket::Type, std::string> actionTypes = {
 	{MacroActionWebsocket::Type::REQUEST,
 	 "AdvSceneSwitcher.action.websocket.type.request"},
 	{MacroActionWebsocket::Type::EVENT,
diff --git a/src/macro-core/macro-condition-audio.cpp b/src/macro-core/macro-condition-audio.cpp
index fa396929..da3016d3 100644
--- a/src/macro-core/macro-condition-audio.cpp
+++ b/src/macro-core/macro-condition-audio.cpp
@@ -12,7 +12,7 @@ bool MacroConditionAudio::_registered = MacroConditionFactory::Register(
 	{MacroConditionAudio::Create, MacroConditionAudioEdit::Create,
 	 "AdvSceneSwitcher.condition.audio"});
 
-static std::map<MacroConditionAudio::Type, std::string> checkTypes = {
+const static std::map<MacroConditionAudio::Type, std::string> checkTypes = {
 	{MacroConditionAudio::Type::OUTPUT_VOLUME,
 	 "AdvSceneSwitcher.condition.audio.type.output"},
 	{MacroConditionAudio::Type::CONFIGURED_VOLUME,
@@ -25,7 +25,7 @@ static std::map<MacroConditionAudio::Type, std::string> checkTypes = {
 	 "AdvSceneSwitcher.condition.audio.type.balance"},
 };
 
-static std::map<MacroConditionAudio::OutputCondition, std::string>
+const static std::map<MacroConditionAudio::OutputCondition, std::string>
 	audioOutputConditionTypes = {
 		{MacroConditionAudio::OutputCondition::ABOVE,
 		 "AdvSceneSwitcher.condition.audio.state.above"},
@@ -33,7 +33,7 @@ static std::map<MacroConditionAudio::OutputCondition, std::string>
 		 "AdvSceneSwitcher.condition.audio.state.below"},
 };
 
-static std::map<MacroConditionAudio::VolumeCondition, std::string>
+const static std::map<MacroConditionAudio::VolumeCondition, std::string>
 	audioVolumeConditionTypes = {
 		{MacroConditionAudio::VolumeCondition::ABOVE,
 		 "AdvSceneSwitcher.condition.audio.state.above"},
diff --git a/src/macro-core/macro-condition-cursor.cpp b/src/macro-core/macro-condition-cursor.cpp
index 345adef1..94cca987 100644
--- a/src/macro-core/macro-condition-cursor.cpp
+++ b/src/macro-core/macro-condition-cursor.cpp
@@ -15,7 +15,7 @@ bool MacroConditionCursor::_registered = MacroConditionFactory::Register(
 	{MacroConditionCursor::Create, MacroConditionCursorEdit::Create,
 	 "AdvSceneSwitcher.condition.cursor"});
 
-static std::map<MacroConditionCursor::Condition, std::string>
+const static std::map<MacroConditionCursor::Condition, std::string>
 	cursorConditionTypes = {
 		{MacroConditionCursor::Condition::REGION,
 		 "AdvSceneSwitcher.condition.cursor.type.region"},
@@ -27,7 +27,7 @@ static std::map<MacroConditionCursor::Condition, std::string>
 #endif
 };
 
-static std::map<MacroConditionCursor::Button, std::string> buttonTypes = {
+const static std::map<MacroConditionCursor::Button, std::string> buttonTypes = {
 	{MacroConditionCursor::Button::LEFT,
 	 "AdvSceneSwitcher.condition.cursor.button.left"},
 	{MacroConditionCursor::Button::MIDDLE,
diff --git a/src/macro-core/macro-condition-date.cpp b/src/macro-core/macro-condition-date.cpp
index d9b96583..8741bb85 100644
--- a/src/macro-core/macro-condition-date.cpp
+++ b/src/macro-core/macro-condition-date.cpp
@@ -14,8 +14,8 @@ bool MacroConditionDate::_registered = MacroConditionFactory::Register(
 	{MacroConditionDate::Create, MacroConditionDateEdit::Create,
 	 "AdvSceneSwitcher.condition.date", false});
 
-static std::map<MacroConditionDate::Condition, std::string> dateConditionTypes =
-	{
+const static std::map<MacroConditionDate::Condition, std::string>
+	dateConditionTypes = {
 		{MacroConditionDate::Condition::AT,
 		 "AdvSceneSwitcher.condition.date.state.at"},
 		{MacroConditionDate::Condition::AFTER,
@@ -28,8 +28,8 @@ static std::map<MacroConditionDate::Condition, std::string> dateConditionTypes =
 		 "AdvSceneSwitcher.condition.date.state.pattern"},
 };
 
-static std::map<MacroConditionDate::Condition, std::string> weekConditionTypes =
-	{
+const static std::map<MacroConditionDate::Condition, std::string>
+	weekConditionTypes = {
 		{MacroConditionDate::Condition::AT,
 		 "AdvSceneSwitcher.condition.date.state.at"},
 		{MacroConditionDate::Condition::AFTER,
@@ -38,7 +38,7 @@ static std::map<MacroConditionDate::Condition, std::string> weekConditionTypes =
 		 "AdvSceneSwitcher.condition.date.state.before"},
 };
 
-static std::map<MacroConditionDate::Day, std::string> dayOfWeekNames = {
+const static std::map<MacroConditionDate::Day, std::string> dayOfWeekNames = {
 	{MacroConditionDate::Day::ANY,
 	 "AdvSceneSwitcher.condition.date.anyDay"},
 	{MacroConditionDate::Day::MONDAY,
diff --git a/src/macro-core/macro-condition-display.cpp b/src/macro-core/macro-condition-display.cpp
index 2104ca92..c3a0153f 100644
--- a/src/macro-core/macro-condition-display.cpp
+++ b/src/macro-core/macro-condition-display.cpp
@@ -12,11 +12,12 @@ bool MacroConditionDisplay::_registered = MacroConditionFactory::Register(
 	{MacroConditionDisplay::Create, MacroConditionDisplayEdit::Create,
 	 "AdvSceneSwitcher.condition.display"});
 
-static std::map<MacroConditionDisplay::Condition, std::string> conditionTypes = {
-	{MacroConditionDisplay::Condition::DISPLAY_NAME,
-	 "AdvSceneSwitcher.condition.display.type.displayName"},
-	{MacroConditionDisplay::Condition::DISPLAY_COUNT,
-	 "AdvSceneSwitcher.condition.display.type.displayCount"},
+const static std::map<MacroConditionDisplay::Condition, std::string>
+	conditionTypes = {
+		{MacroConditionDisplay::Condition::DISPLAY_NAME,
+		 "AdvSceneSwitcher.condition.display.type.displayName"},
+		{MacroConditionDisplay::Condition::DISPLAY_COUNT,
+		 "AdvSceneSwitcher.condition.display.type.displayCount"},
 };
 
 static bool matchDisplayNames(const std::string &name, const RegexConfig &regex)
diff --git a/src/macro-core/macro-condition-filter.cpp b/src/macro-core/macro-condition-filter.cpp
index 9c608e65..a43df0d6 100644
--- a/src/macro-core/macro-condition-filter.cpp
+++ b/src/macro-core/macro-condition-filter.cpp
@@ -12,7 +12,7 @@ bool MacroConditionFilter::_registered = MacroConditionFactory::Register(
 	{MacroConditionFilter::Create, MacroConditionFilterEdit::Create,
 	 "AdvSceneSwitcher.condition.filter"});
 
-static std::map<MacroConditionFilter::Condition, std::string>
+const static std::map<MacroConditionFilter::Condition, std::string>
 	filterConditionTypes = {
 		{MacroConditionFilter::Condition::ENABLED,
 		 "AdvSceneSwitcher.condition.filter.type.active"},
diff --git a/src/macro-core/macro-condition-macro.cpp b/src/macro-core/macro-condition-macro.cpp
index 128b4414..1def1ed7 100644
--- a/src/macro-core/macro-condition-macro.cpp
+++ b/src/macro-core/macro-condition-macro.cpp
@@ -11,16 +11,17 @@ bool MacroConditionMacro::_registered = MacroConditionFactory::Register(
 	{MacroConditionMacro::Create, MacroConditionMacroEdit::Create,
 	 "AdvSceneSwitcher.condition.macro"});
 
-static std::map<MacroConditionMacro::Type, std::string> macroConditionTypes = {
-	{MacroConditionMacro::Type::COUNT,
-	 "AdvSceneSwitcher.condition.macro.type.count"},
-	{MacroConditionMacro::Type::STATE,
-	 "AdvSceneSwitcher.condition.macro.type.state"},
-	{MacroConditionMacro::Type::MULTI_STATE,
-	 "AdvSceneSwitcher.condition.macro.type.multiState"},
+const static std::map<MacroConditionMacro::Type, std::string>
+	macroConditionTypes = {
+		{MacroConditionMacro::Type::COUNT,
+		 "AdvSceneSwitcher.condition.macro.type.count"},
+		{MacroConditionMacro::Type::STATE,
+		 "AdvSceneSwitcher.condition.macro.type.state"},
+		{MacroConditionMacro::Type::MULTI_STATE,
+		 "AdvSceneSwitcher.condition.macro.type.multiState"},
 };
 
-static std::map<MacroConditionMacro::CounterCondition, std::string>
+const static std::map<MacroConditionMacro::CounterCondition, std::string>
 	counterConditionTypes = {
 		{MacroConditionMacro::CounterCondition::BELOW,
 		 "AdvSceneSwitcher.condition.macro.count.type.below"},
@@ -30,7 +31,7 @@ static std::map<MacroConditionMacro::CounterCondition, std::string>
 		 "AdvSceneSwitcher.condition.macro.count.type.equal"},
 };
 
-static std::map<MacroConditionMacro::MultiStateCondition, std::string>
+const static std::map<MacroConditionMacro::MultiStateCondition, std::string>
 	multiStateConditionTypes = {
 		{MacroConditionMacro::MultiStateCondition::BELOW,
 		 "AdvSceneSwitcher.condition.macro.state.type.below"},
diff --git a/src/macro-core/macro-condition-obs-stats.cpp b/src/macro-core/macro-condition-obs-stats.cpp
index c19c7b33..e59ffee4 100644
--- a/src/macro-core/macro-condition-obs-stats.cpp
+++ b/src/macro-core/macro-condition-obs-stats.cpp
@@ -10,7 +10,7 @@ bool MacroConditionStats::_registered = MacroConditionFactory::Register(
 	{MacroConditionStats::Create, MacroConditionStatsEdit::Create,
 	 "AdvSceneSwitcher.condition.stats"});
 
-static std::map<MacroConditionStats::Type, std::string> statsTypes = {
+const static std::map<MacroConditionStats::Type, std::string> statsTypes = {
 	{MacroConditionStats::Type::FPS,
 	 "AdvSceneSwitcher.condition.stats.type.fps"},
 	{MacroConditionStats::Type::CPU_USAGE,
@@ -39,7 +39,7 @@ static std::map<MacroConditionStats::Type, std::string> statsTypes = {
 	 "AdvSceneSwitcher.condition.stats.type.megabytesSent.recording"},
 };
 
-static std::map<MacroConditionStats::Condition, std::string>
+const static std::map<MacroConditionStats::Condition, std::string>
 	statsConditionTypes = {
 		{MacroConditionStats::Condition::ABOVE,
 		 "AdvSceneSwitcher.condition.stats.condition.above"},
diff --git a/src/macro-core/macro-condition-plugin-state.cpp b/src/macro-core/macro-condition-plugin-state.cpp
index c92e790e..5a8e53b0 100644
--- a/src/macro-core/macro-condition-plugin-state.cpp
+++ b/src/macro-core/macro-condition-plugin-state.cpp
@@ -14,7 +14,7 @@ bool MacroConditionPluginState::_registered = MacroConditionFactory::Register(
 	 MacroConditionPluginStateEdit::Create,
 	 "AdvSceneSwitcher.condition.pluginState"});
 
-static std::map<MacroConditionPluginState::Condition, std::string>
+const static std::map<MacroConditionPluginState::Condition, std::string>
 	pluginStateConditionTypes = {
 		{MacroConditionPluginState::Condition::PLUGIN_START,
 		 "AdvSceneSwitcher.condition.pluginState.state.start"},
diff --git a/src/macro-core/macro-condition-recording.cpp b/src/macro-core/macro-condition-recording.cpp
index 8c03a162..6b86d823 100644
--- a/src/macro-core/macro-condition-recording.cpp
+++ b/src/macro-core/macro-condition-recording.cpp
@@ -10,7 +10,7 @@ bool MacroConditionRecord::_registered = MacroConditionFactory::Register(
 	{MacroConditionRecord::Create, MacroConditionRecordEdit::Create,
 	 "AdvSceneSwitcher.condition.record"});
 
-static std::map<RecordState, std::string> recordStates = {
+const static std::map<RecordState, std::string> recordStates = {
 	{RecordState::STOP, "AdvSceneSwitcher.condition.record.state.stop"},
 	{RecordState::PAUSE, "AdvSceneSwitcher.condition.record.state.pause"},
 	{RecordState::START, "AdvSceneSwitcher.condition.record.state.start"},
diff --git a/src/macro-core/macro-condition-replay-buffer.cpp b/src/macro-core/macro-condition-replay-buffer.cpp
index a9731038..75355770 100644
--- a/src/macro-core/macro-condition-replay-buffer.cpp
+++ b/src/macro-core/macro-condition-replay-buffer.cpp
@@ -11,7 +11,7 @@ bool MacroConditionReplayBuffer::_registered = MacroConditionFactory::Register(
 					 MacroConditionReplayBufferEdit::Create,
 					 "AdvSceneSwitcher.condition.replay"});
 
-static std::map<ReplayBufferState, std::string> ReplayBufferStates = {
+const static std::map<ReplayBufferState, std::string> ReplayBufferStates = {
 	{ReplayBufferState::STOP,
 	 "AdvSceneSwitcher.condition.replay.state.stopped"},
 	{ReplayBufferState::START,
diff --git a/src/macro-core/macro-condition-scene-order.cpp b/src/macro-core/macro-condition-scene-order.cpp
index 673b7c8a..1bfaf86a 100644
--- a/src/macro-core/macro-condition-scene-order.cpp
+++ b/src/macro-core/macro-condition-scene-order.cpp
@@ -10,7 +10,7 @@ bool MacroConditionSceneOrder::_registered = MacroConditionFactory::Register(
 	{MacroConditionSceneOrder::Create, MacroConditionSceneOrderEdit::Create,
 	 "AdvSceneSwitcher.condition.sceneOrder"});
 
-static std::map<MacroConditionSceneOrder::Condition, std::string>
+const static std::map<MacroConditionSceneOrder::Condition, std::string>
 	sceneOrderConditionTypes = {
 		{MacroConditionSceneOrder::Condition::ABOVE,
 		 "AdvSceneSwitcher.condition.sceneOrder.type.above"},
diff --git a/src/macro-core/macro-condition-scene-visibility.cpp b/src/macro-core/macro-condition-scene-visibility.cpp
index 0231fa0a..40a733a9 100644
--- a/src/macro-core/macro-condition-scene-visibility.cpp
+++ b/src/macro-core/macro-condition-scene-visibility.cpp
@@ -14,7 +14,7 @@ bool MacroConditionSceneVisibility::_registered =
 		 MacroConditionSceneVisibilityEdit::Create,
 		 "AdvSceneSwitcher.condition.sceneVisibility"});
 
-static std::map<MacroConditionSceneVisibility::Condition, std::string>
+const static std::map<MacroConditionSceneVisibility::Condition, std::string>
 	conditionTypes = {
 		{MacroConditionSceneVisibility::Condition::SHOWN,
 		 "AdvSceneSwitcher.condition.sceneVisibility.type.shown"},
diff --git a/src/macro-core/macro-condition-scene.cpp b/src/macro-core/macro-condition-scene.cpp
index b89c8f43..de0f1f5e 100644
--- a/src/macro-core/macro-condition-scene.cpp
+++ b/src/macro-core/macro-condition-scene.cpp
@@ -11,7 +11,7 @@ bool MacroConditionScene::_registered = MacroConditionFactory::Register(
 	{MacroConditionScene::Create, MacroConditionSceneEdit::Create,
 	 "AdvSceneSwitcher.condition.scene"});
 
-static std::map<MacroConditionScene::Type, std::string> sceneTypes = {
+const static std::map<MacroConditionScene::Type, std::string> sceneTypes = {
 	{MacroConditionScene::Type::CURRENT,
 	 "AdvSceneSwitcher.condition.scene.type.current"},
 	{MacroConditionScene::Type::PREVIOUS,
diff --git a/src/macro-core/macro-condition-source.cpp b/src/macro-core/macro-condition-source.cpp
index afdedb5c..c6857750 100644
--- a/src/macro-core/macro-condition-source.cpp
+++ b/src/macro-core/macro-condition-source.cpp
@@ -10,7 +10,7 @@ bool MacroConditionSource::_registered = MacroConditionFactory::Register(
 	{MacroConditionSource::Create, MacroConditionSourceEdit::Create,
 	 "AdvSceneSwitcher.condition.source"});
 
-static std::map<SourceCondition, std::string> sourceConditionTypes = {
+const static std::map<SourceCondition, std::string> sourceConditionTypes = {
 	{SourceCondition::ACTIVE,
 	 "AdvSceneSwitcher.condition.source.type.active"},
 	{SourceCondition::SHOWING,
diff --git a/src/macro-core/macro-condition-streaming.cpp b/src/macro-core/macro-condition-streaming.cpp
index 60082d08..52894d61 100644
--- a/src/macro-core/macro-condition-streaming.cpp
+++ b/src/macro-core/macro-condition-streaming.cpp
@@ -11,17 +11,18 @@ bool MacroConditionStream::_registered = MacroConditionFactory::Register(
 	{MacroConditionStream::Create, MacroConditionStreamEdit::Create,
 	 "AdvSceneSwitcher.condition.stream"});
 
-static std::map<MacroConditionStream::Condition, std::string> streamStates = {
-	{MacroConditionStream::Condition::STOP,
-	 "AdvSceneSwitcher.condition.stream.state.stop"},
-	{MacroConditionStream::Condition::START,
-	 "AdvSceneSwitcher.condition.stream.state.start"},
-	{MacroConditionStream::Condition::STARTING,
-	 "AdvSceneSwitcher.condition.stream.state.starting"},
-	{MacroConditionStream::Condition::STOPPING,
-	 "AdvSceneSwitcher.condition.stream.state.stopping"},
-	{MacroConditionStream::Condition::KEYFRAME_INTERVAL,
-	 "AdvSceneSwitcher.condition.stream.state.keyFrameInterval"},
+const static std::map<MacroConditionStream::Condition, std::string>
+	streamStates = {
+		{MacroConditionStream::Condition::STOP,
+		 "AdvSceneSwitcher.condition.stream.state.stop"},
+		{MacroConditionStream::Condition::START,
+		 "AdvSceneSwitcher.condition.stream.state.start"},
+		{MacroConditionStream::Condition::STARTING,
+		 "AdvSceneSwitcher.condition.stream.state.starting"},
+		{MacroConditionStream::Condition::STOPPING,
+		 "AdvSceneSwitcher.condition.stream.state.stopping"},
+		{MacroConditionStream::Condition::KEYFRAME_INTERVAL,
+		 "AdvSceneSwitcher.condition.stream.state.keyFrameInterval"},
 };
 
 int MacroConditionStream::GetKeyFrameInterval()
diff --git a/src/macro-core/macro-condition-studio-mode.cpp b/src/macro-core/macro-condition-studio-mode.cpp
index d3489215..051c34e4 100644
--- a/src/macro-core/macro-condition-studio-mode.cpp
+++ b/src/macro-core/macro-condition-studio-mode.cpp
@@ -10,13 +10,14 @@ bool MacroConditionStudioMode::_registered = MacroConditionFactory::Register(
 	{MacroConditionStudioMode::Create, MacroConditionStudioModeEdit::Create,
 	 "AdvSceneSwitcher.condition.studioMode"});
 
-static std::map<StudioModeCondition, std::string> studioModeConditionTypes = {
-	{StudioModeCondition::STUDIO_MODE_ACTIVE,
-	 "AdvSceneSwitcher.condition.studioMode.state.active"},
-	{StudioModeCondition::STUDIO_MODE_NOT_ACTIVE,
-	 "AdvSceneSwitcher.condition.studioMode.state.notActive"},
-	{StudioModeCondition::PREVIEW_SCENE,
-	 "AdvSceneSwitcher.condition.studioMode.state.previewScene"},
+const static std::map<StudioModeCondition, std::string>
+	studioModeConditionTypes = {
+		{StudioModeCondition::STUDIO_MODE_ACTIVE,
+		 "AdvSceneSwitcher.condition.studioMode.state.active"},
+		{StudioModeCondition::STUDIO_MODE_NOT_ACTIVE,
+		 "AdvSceneSwitcher.condition.studioMode.state.notActive"},
+		{StudioModeCondition::PREVIEW_SCENE,
+		 "AdvSceneSwitcher.condition.studioMode.state.previewScene"},
 };
 
 bool MacroConditionStudioMode::CheckCondition()
diff --git a/src/macro-core/macro-condition-timer.cpp b/src/macro-core/macro-condition-timer.cpp
index 8c82ce79..cae07744 100644
--- a/src/macro-core/macro-condition-timer.cpp
+++ b/src/macro-core/macro-condition-timer.cpp
@@ -10,7 +10,7 @@ bool MacroConditionTimer::_registered = MacroConditionFactory::Register(
 	{MacroConditionTimer::Create, MacroConditionTimerEdit::Create,
 	 "AdvSceneSwitcher.condition.timer", false});
 
-static std::map<TimerType, std::string> timerTypes = {
+const static std::map<TimerType, std::string> timerTypes = {
 	{TimerType::FIXED, "AdvSceneSwitcher.condition.timer.type.fixed"},
 	{TimerType::RANDOM, "AdvSceneSwitcher.condition.timer.type.random"},
 };
diff --git a/src/macro-core/macro-condition-transition.cpp b/src/macro-core/macro-condition-transition.cpp
index 661b636d..a2a3bf43 100644
--- a/src/macro-core/macro-condition-transition.cpp
+++ b/src/macro-core/macro-condition-transition.cpp
@@ -11,7 +11,7 @@ bool MacroConditionTransition::_registered = MacroConditionFactory::Register(
 	{MacroConditionTransition::Create, MacroConditionTransitionEdit::Create,
 	 "AdvSceneSwitcher.condition.transition"});
 
-static std::map<TransitionCondition, std::string> filterConditionTypes = {
+const static std::map<TransitionCondition, std::string> filterConditionTypes = {
 	{TransitionCondition::CURRENT,
 	 "AdvSceneSwitcher.condition.transition.type.current"},
 	{TransitionCondition::DURATION,
diff --git a/src/macro-core/macro-condition-virtual-cam.cpp b/src/macro-core/macro-condition-virtual-cam.cpp
index 4d9d8763..b8ca3c40 100644
--- a/src/macro-core/macro-condition-virtual-cam.cpp
+++ b/src/macro-core/macro-condition-virtual-cam.cpp
@@ -10,7 +10,7 @@ bool MacroConditionVCam::_registered = MacroConditionFactory::Register(
 	{MacroConditionVCam::Create, MacroConditionVCamEdit::Create,
 	 "AdvSceneSwitcher.condition.virtualCamera"});
 
-static std::map<VCamState, std::string> VCamStates = {
+const static std::map<VCamState, std::string> VCamStates = {
 	{VCamState::STOP,
 	 "AdvSceneSwitcher.condition.virtualCamera.state.stop"},
 	{VCamState::START,
diff --git a/src/macro-core/macro-condition-websocket.cpp b/src/macro-core/macro-condition-websocket.cpp
index 9cfa2588..a8badafe 100644
--- a/src/macro-core/macro-condition-websocket.cpp
+++ b/src/macro-core/macro-condition-websocket.cpp
@@ -13,11 +13,12 @@ bool MacroConditionWebsocket::_registered = MacroConditionFactory::Register(
 	{MacroConditionWebsocket::Create, MacroConditionWebsocketEdit::Create,
 	 "AdvSceneSwitcher.condition.websocket"});
 
-static std::map<MacroConditionWebsocket::Type, std::string> conditionTypes = {
-	{MacroConditionWebsocket::Type::REQUEST,
-	 "AdvSceneSwitcher.condition.websocket.type.request"},
-	{MacroConditionWebsocket::Type::EVENT,
-	 "AdvSceneSwitcher.condition.websocket.type.event"},
+const static std::map<MacroConditionWebsocket::Type, std::string>
+	conditionTypes = {
+		{MacroConditionWebsocket::Type::REQUEST,
+		 "AdvSceneSwitcher.condition.websocket.type.request"},
+		{MacroConditionWebsocket::Type::EVENT,
+		 "AdvSceneSwitcher.condition.websocket.type.event"},
 };
 
 static bool matchRegex(const RegexConfig &conf, const std::string &msg,