diff --git a/ChaosMod/Components/EffectDispatcher.cpp b/ChaosMod/Components/EffectDispatcher.cpp
index 6fadb285e..e4d6db97c 100644
--- a/ChaosMod/Components/EffectDispatcher.cpp
+++ b/ChaosMod/Components/EffectDispatcher.cpp
@@ -71,7 +71,7 @@ static void _DispatchEffect(EffectDispatcher *effectDispatcher, const EffectDisp
 
 		if (activeEffect.Identifier == entry.Identifier)
 		{
-			if (effectData.TimedType != EffectTimedType::Default && effectData.TimedType != EffectTimedType::NotTimed)
+			if (effectData.TimedType != EffectTimedType::NotTimed)
 			{
 				alreadyExists      = true;
 				activeEffect.Timer = activeEffect.MaxTime;
@@ -444,9 +444,8 @@ void EffectDispatcher::UpdateEffects(int deltaTime)
 		if (g_EnabledEffects.contains(effect.Identifier))
 		{
 			auto &effectData = g_EnabledEffects.at(effect.Identifier);
-			isTimed =
-			    effectData.TimedType != EffectTimedType::NotTimed && effectData.TimedType != EffectTimedType::Default;
-			isMeta = effectData.IsMeta();
+			isTimed          = effectData.TimedType != EffectTimedType::NotTimed;
+			isMeta           = effectData.IsMeta();
 		}
 
 		if (effect.MaxTime > 0)
diff --git a/ChaosMod/Components/EffectDispatcher.h b/ChaosMod/Components/EffectDispatcher.h
index a130701b1..70bc478ab 100644
--- a/ChaosMod/Components/EffectDispatcher.h
+++ b/ChaosMod/Components/EffectDispatcher.h
@@ -54,17 +54,15 @@ class EffectDispatcher : public Component
 		ActiveEffect(const EffectIdentifier &effectIdentifier, RegisteredEffect *registeredEffect,
 		             const std::string &name, const EffectData &effectData, float effectDuration)
 		{
-			Identifier      = effectIdentifier;
-			Name            = name;
-			FakeName        = effectData.FakeName;
-			Timer           = effectDuration;
-			MaxTime         = effectDuration;
-			HideEffectName  = effectData.ShouldHideRealNameOnStart();
-
-			auto eTimedType = g_EnabledEffects.at(effectIdentifier).TimedType;
-
-			ThreadId        = EffectThreads::CreateThread(registeredEffect, eTimedType != EffectTimedType::Default
-			                                                                    && eTimedType != EffectTimedType::NotTimed);
+			Identifier     = effectIdentifier;
+			Name           = name;
+			FakeName       = effectData.FakeName;
+			Timer          = effectDuration;
+			MaxTime        = effectDuration;
+			HideEffectName = effectData.ShouldHideRealNameOnStart();
+
+			auto timedType = g_EnabledEffects.at(effectIdentifier).TimedType;
+			ThreadId       = EffectThreads::CreateThread(registeredEffect, timedType != EffectTimedType::NotTimed);
 		}
 	};
 	struct
diff --git a/ChaosMod/Components/LuaScripts.cpp b/ChaosMod/Components/LuaScripts.cpp
index 55cd38271..9eb290bdc 100644
--- a/ChaosMod/Components/LuaScripts.cpp
+++ b/ChaosMod/Components/LuaScripts.cpp
@@ -7,6 +7,7 @@
 #include "Components/EffectDispatcher.h"
 #include "Components/KeyStates.h"
 #include "Components/MetaModifiers.h"
+#include "Components/Workshop.h"
 
 #include "Effects/Effect.h"
 #include "Effects/EffectData.h"
@@ -34,7 +35,6 @@
 #include "Util/Types.h"
 #include "Util/Vehicle.h"
 #include "Util/Weapon.h"
-#include "Util/Workshop.h"
 
 #define LUA_NATIVESDEF "chaosmod\\natives_def.lua"
 
@@ -333,9 +333,25 @@ LuaScripts::LuaScripts()
 			LUA_LOG("Running script " << scriptName);
 		}
 
-		auto currentThread = std::this_thread::get_id();
-		if (ParseScriptRaw(fileName, buffer.str(),
-		                   currentThread == mainThread ? ParseScriptFlag_None : ParseScriptFlag_IsAlienThread)
+		auto currentThread   = std::this_thread::get_id();
+		int parseScriptFlags = ParseScriptFlag_None;
+		if (currentThread != mainThread)
+		{
+			parseScriptFlags |= ParseScriptFlag_IsAlienThread;
+		}
+
+		std::unordered_map<std::string, nlohmann::json> userEffectSettings;
+		if (pathStr.starts_with("chaosmod\\workshop") && ComponentExists<Workshop>())
+		{
+			// Read user script settings
+			auto tmp           = pathStr.substr(strlen("chaosmod\\workshop\\"));
+			userEffectSettings = GetComponent<Workshop>()->GetSubmissionScriptSettings(
+			    pathStr.substr(0, pathStr.find('\\', pathStr.find_first_not_of("chaosmod\\workshop\\"))),
+			    tmp.substr(tmp.find("\\") + 1));
+		}
+
+		if (ParseScriptRaw(fileName, buffer.str(), static_cast<LuaScripts::ParseScriptFlags>(parseScriptFlags),
+		                   userEffectSettings)
 		    == ParseScriptReturnReason::Error_ThreadUnsafe)
 		{
 			std::lock_guard lock(threadUnsafeEntryQueueMutex);
@@ -408,10 +424,10 @@ LuaScripts::LuaScripts()
 		{
 			for (const auto &entry : std::filesystem::directory_iterator(dir))
 			{
-				if (entry.is_directory())
+				if (entry.is_directory() && ComponentExists<Workshop>())
 				{
-					for (const auto &entry :
-					     GetWorkshopSubmissionFiles(entry.path().string(), WorkshopFileType::Script))
+					for (const auto &entry : GetComponent<Workshop>()->GetSubmissionFiles(entry.path().string(),
+					                                                                      Workshop::FileType::Script))
 					{
 						parseScriptThreaded(entry);
 					}
@@ -475,8 +491,9 @@ LuaScripts::~LuaScripts()
 	}
 }
 
-LuaScripts::ParseScriptReturnReason LuaScripts::ParseScriptRaw(std::string scriptName, std::string_view script,
-                                                               ParseScriptFlags flags)
+LuaScripts::ParseScriptReturnReason
+LuaScripts::ParseScriptRaw(std::string scriptName, std::string_view script, ParseScriptFlags flags,
+                           std::unordered_map<std::string, nlohmann::json> settingOverrides)
 {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
@@ -903,6 +920,24 @@ LuaScripts::ParseScriptReturnReason LuaScripts::ParseScriptRaw(std::string scrip
 			                                                           << effectName << "\"!");
 		}
 	}
+	try
+	{
+		effectData.TimedType = static_cast<EffectTimedType>(settingOverrides["TimedType"]);
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
+	try
+	{
+		effectData.CustomTime = settingOverrides["CustomTime"];
+		if (effectData.CustomTime > 0)
+		{
+			effectData.TimedType = EffectTimedType::Custom;
+		}
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
 
 	const sol::optional<int> &weightMultOpt = effectInfo["WeightMultiplier"];
 	if (weightMultOpt)
@@ -910,6 +945,13 @@ LuaScripts::ParseScriptReturnReason LuaScripts::ParseScriptRaw(std::string scrip
 		effectData.WeightMult = (std::max)(1, *weightMultOpt);
 		effectData.Weight     = effectData.WeightMult;
 	}
+	try
+	{
+		effectData.WeightMult = settingOverrides["WeightMult"];
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
 
 	const sol::optional<bool> &isMetaOpt = effectInfo["IsMeta"];
 	if (isMetaOpt)
@@ -922,6 +964,13 @@ LuaScripts::ParseScriptReturnReason LuaScripts::ParseScriptRaw(std::string scrip
 	{
 		effectData.SetAttribute(EffectAttributes::ExcludedFromVoting, *excludeFromVotingOpt);
 	}
+	try
+	{
+		effectData.SetAttribute(EffectAttributes::ExcludedFromVoting, settingOverrides["ExcludedFromVoting"]);
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
 
 	const sol::optional<bool> &isUtilityOpt = effectInfo["IsUtility"];
 	if (isUtilityOpt)
@@ -988,6 +1037,25 @@ LuaScripts::ParseScriptReturnReason LuaScripts::ParseScriptRaw(std::string scrip
 			effectData.ShortcutKeycode = shortcutKeycode;
 		}
 	}
+	try
+	{
+		effectData.ShortcutKeycode = settingOverrides["ShortcutKeycode"];
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
+
+	try
+	{
+		std::string name = StringTrim(settingOverrides["CustomName"]);
+		if (!name.empty())
+		{
+			effectData.CustomName = name;
+		}
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
 
 	// Exclude temporary effects from choices pool
 	effectData.SetAttribute(EffectAttributes::IsTemporary, flags & ParseScriptFlag_IsTemporary);
diff --git a/ChaosMod/Components/LuaScripts.h b/ChaosMod/Components/LuaScripts.h
index 01a9b69a9..861f042bc 100644
--- a/ChaosMod/Components/LuaScripts.h
+++ b/ChaosMod/Components/LuaScripts.h
@@ -8,6 +8,8 @@
 #define SOL_SAFE_NUMERICS 1
 #include <sol3/sol.hpp>
 
+#include <json.hpp>
+
 #include <string>
 
 class LuaScripts : public Component
@@ -98,7 +100,8 @@ class LuaScripts : public Component
 		Error_ThreadUnsafe
 	};
 	ParseScriptReturnReason ParseScriptRaw(std::string scriptName, std::string_view script,
-	                                       ParseScriptFlags flags = ParseScriptFlag_None);
+	                                       ParseScriptFlags flags = ParseScriptFlag_None,
+	                                       std::unordered_map<std::string, nlohmann::json> settingOverrides = {});
 	void RemoveScriptEntry(const std::string &effectId);
 
   public:
diff --git a/ChaosMod/Components/Mp3Manager.cpp b/ChaosMod/Components/Mp3Manager.cpp
index 378253912..6b8de64c2 100644
--- a/ChaosMod/Components/Mp3Manager.cpp
+++ b/ChaosMod/Components/Mp3Manager.cpp
@@ -2,7 +2,7 @@
 
 #include "Mp3Manager.h"
 
-#include "Util/Workshop.h"
+#include "Components/Workshop.h"
 
 #define CHAOS_SOUNDFILES_USER_DIR "chaosmod"
 #define CHAOS_SOUNDFILES_WORKSHOP_DIR "chaosmod\\workshop"
@@ -30,13 +30,13 @@ void Mp3Manager::HandleDirectory(const std::string &dir, const std::string &soun
 		return;
 	}
 
-	auto soundDirPath     = soundRootDirName + soundName;
-	auto soundFilePath    = soundDirPath + ".mp3";
+	auto soundDirPath  = soundRootDirName + soundName;
+	auto soundFilePath = soundDirPath + ".mp3";
 
 	std::vector<std::string> blacklistedFiles;
-	if (dir.starts_with(CHAOS_SOUNDFILES_WORKSHOP_DIR))
+	if (dir.starts_with(CHAOS_SOUNDFILES_WORKSHOP_DIR) && ComponentExists<Workshop>())
 	{
-		blacklistedFiles = GetWorkshopSubmissionBlacklistedFiles(dir);
+		blacklistedFiles = GetComponent<Workshop>()->GetSubmissionBlacklistedFiles(dir);
 	}
 
 	auto &soundFiles    = m_EffectSoundFilesCache[soundName];
diff --git a/ChaosMod/Components/Workshop.cpp b/ChaosMod/Components/Workshop.cpp
new file mode 100644
index 000000000..8fe5c9e43
--- /dev/null
+++ b/ChaosMod/Components/Workshop.cpp
@@ -0,0 +1,98 @@
+#include <stdafx.h>
+
+#include "Workshop.h"
+
+void Workshop::OnModPauseCleanup()
+{
+	m_CachedSubmissionSettings.clear();
+}
+
+nlohmann::json Workshop::GetSubmissionSettingJson(const std::string &submissionPath)
+{
+	if (m_CachedSubmissionSettings.contains(submissionPath))
+	{
+		return m_CachedSubmissionSettings.at(submissionPath);
+	}
+
+	auto submissionSettingsFile = submissionPath + ".json";
+	if (!DoesFileExist(submissionSettingsFile))
+	{
+		return {};
+	}
+
+	std::ifstream file(submissionSettingsFile);
+	std::stringstream buffer;
+	buffer << file.rdbuf();
+
+	try
+	{
+		m_CachedSubmissionSettings[submissionPath] = nlohmann::json::parse(buffer.str());
+	}
+	catch (nlohmann::json::exception)
+	{
+		m_CachedSubmissionSettings[submissionPath] = {};
+	}
+
+	return m_CachedSubmissionSettings.at(submissionPath);
+}
+
+std::vector<std::string> Workshop::GetSubmissionBlacklistedFiles(const std::string &submissionPath)
+{
+	std::vector<std::string> blacklistedFiles;
+
+	auto json = GetSubmissionSettingJson(submissionPath);
+	try
+	{
+		for (const std::string &file : json["disabled_files"])
+		{
+			blacklistedFiles.push_back(file);
+		}
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
+
+	return blacklistedFiles;
+}
+
+std::vector<std::filesystem::directory_entry> Workshop::GetSubmissionFiles(const std::string &submissionPath,
+                                                                           FileType fileType, std::string subPath)
+{
+	const auto &blacklistedFiles = GetSubmissionBlacklistedFiles(submissionPath);
+
+	std::vector<std::filesystem::directory_entry> entries;
+	switch (fileType)
+	{
+	case FileType::Script:
+		entries = GetFiles(submissionPath + "\\" + subPath, ".lua", true, blacklistedFiles);
+		break;
+	case FileType::Audio:
+		entries = GetFiles(submissionPath + "\\" + subPath, ".mp3", true, blacklistedFiles);
+		break;
+	default:
+		return {};
+	}
+
+	return entries;
+}
+
+std::unordered_map<std::string, nlohmann::json> Workshop::GetSubmissionScriptSettings(const std::string &submissionPath,
+                                                                                      const std::string &scriptPath)
+{
+	std::unordered_map<std::string, nlohmann::json> scriptSettings;
+
+	auto json = GetSubmissionSettingJson(submissionPath);
+	try
+	{
+		for (const auto &[key, value] : json["effect_settings"][scriptPath].items())
+		{
+			LOG(key << " " << value);
+			scriptSettings[key] = value;
+		}
+	}
+	catch (nlohmann::json::exception)
+	{
+	}
+
+	return scriptSettings;
+}
\ No newline at end of file
diff --git a/ChaosMod/Components/Workshop.h b/ChaosMod/Components/Workshop.h
new file mode 100644
index 000000000..01039092c
--- /dev/null
+++ b/ChaosMod/Components/Workshop.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "Util/File.h"
+
+#include <filesystem>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <json.hpp>
+
+class Workshop : public Component
+{
+  private:
+	std::unordered_map<std::string, nlohmann::json> m_CachedSubmissionSettings;
+
+  private:
+	nlohmann::json GetSubmissionSettingJson(const std::string &submissionPath);
+
+  public:
+	void OnModPauseCleanup() override;
+
+	std::vector<std::string> GetSubmissionBlacklistedFiles(const std::string &submissionPath);
+	enum class FileType
+	{
+		Script,
+		Audio
+	};
+	std::vector<std::filesystem::directory_entry> GetSubmissionFiles(const std::string &submissionPath,
+	                                                                 FileType fileType, std::string subPath = "");
+
+	std::unordered_map<std::string, nlohmann::json> GetSubmissionScriptSettings(const std::string &submissionPath,
+	                                                                            const std::string &scriptPath);
+
+	template <class T>
+	requires std::is_base_of_v<Component, T>
+	friend struct ComponentHolder;
+};
\ No newline at end of file
diff --git a/ChaosMod/Effects/EffectConfig.h b/ChaosMod/Effects/EffectConfig.h
index f133dccf8..11cbd55fa 100644
--- a/ChaosMod/Effects/EffectConfig.h
+++ b/ChaosMod/Effects/EffectConfig.h
@@ -43,10 +43,24 @@ namespace EffectConfig
 
 		for (auto &[effectId, effectInfo] : g_EffectsMap)
 		{
-			// Default EffectData values
-			// Enabled, TimedType, CustomTime (-1 = Disabled), Weight, Permanent, ExcludedFromVoting, "Dummy for
-			// name-override", Shortcut
-			std::vector<int> values = { true, static_cast<int>(EffectTimedType::Default), -1, 5, false, false, 0, 0 };
+			struct
+			{
+				union
+				{
+					std::array<int, 8> Values;
+					struct
+					{
+						bool Enabled;
+						EffectTimedType TimedType;
+						int CustomTime;
+						int WeightMult;
+						bool Permanent;
+						bool ExcludedFromVoting;
+						char Placeholder;
+						int ShortcutKeycode;
+					};
+				};
+			} configValues;
 			// HACK: Store EffectCustomName seperately
 			std::string valueEffectName;
 
@@ -75,7 +89,7 @@ namespace EffectConfig
 					{
 						const auto &split = value.substr(0, splitIndex);
 
-						Util::TryParse<int>(split, values[j]);
+						Util::TryParse<int>(split, configValues.Values[j]);
 					}
 
 					if (splitIndex == value.npos)
@@ -88,7 +102,7 @@ namespace EffectConfig
 				}
 			}
 
-			if (!values[0]) // enabled == false
+			if (!configValues.Enabled)
 			{
 				continue;
 			}
@@ -98,32 +112,37 @@ namespace EffectConfig
 			{
 				effectData.TimedType = EffectTimedType::NotTimed;
 			}
-			else if (values[4])
+			else if (configValues.Permanent)
 			{
 				effectData.TimedType = EffectTimedType::Permanent;
 			}
-			else if (values[2] > -1)
+			else if (configValues.CustomTime > 0)
 			{
 				effectData.TimedType  = EffectTimedType::Custom;
-				effectData.CustomTime = values[2];
+				effectData.CustomTime = configValues.CustomTime;
 			}
 			else
 			{
-				effectData.TimedType = static_cast<EffectTimedType>(
-				    static_cast<EffectTimedType>(values[1]) == EffectTimedType::Default ? effectInfo.IsShortDuration
-				                                                                        : values[1]);
+				effectData.TimedType =
+				    configValues.TimedType == EffectTimedType::NotTimed
+				        ? (effectInfo.IsShortDuration ? EffectTimedType::Short : EffectTimedType::Normal)
+				        : configValues.TimedType;
 			}
 
-			effectData.WeightMult = values[3];
-			effectData.Weight     = effectData.WeightMult; // Set initial effect weight to WeightMult
-			effectData.SetAttribute(EffectAttributes::ExcludedFromVoting, values[5]);
+			if (configValues.WeightMult)
+			{
+				effectData.WeightMult = configValues.WeightMult;
+			}
+			effectData.Weight = effectData.WeightMult; // Set initial effect weight to WeightMult
+			effectData.SetAttribute(EffectAttributes::ExcludedFromVoting, configValues.ExcludedFromVoting);
 			effectData.SetAttribute(EffectAttributes::IsMeta, effectInfo.ExecutionType == EffectExecutionType::Meta);
 			effectData.Name = effectInfo.Name;
 			effectData.SetAttribute(EffectAttributes::HideRealNameOnStart, effectInfo.HideRealNameOnStart);
 #ifdef _DEBUG
-			effectData.ShortcutKeycode = effectInfo.DebugShortcutKeycode ? effectInfo.DebugShortcutKeycode : values[7];
+			effectData.ShortcutKeycode =
+			    effectInfo.DebugShortcutKeycode ? effectInfo.DebugShortcutKeycode : configValues.ShortcutKeycode;
 #else
-			effectData.ShortcutKeycode = values[7];
+			effectData.ShortcutKeycode = configValues.ShortcutKeycode;
 #endif
 			if (!valueEffectName.empty())
 			{
diff --git a/ChaosMod/Effects/EffectData.h b/ChaosMod/Effects/EffectData.h
index 7106b2f6c..2c6b19a7c 100644
--- a/ChaosMod/Effects/EffectData.h
+++ b/ChaosMod/Effects/EffectData.h
@@ -22,7 +22,7 @@ struct EffectData
 	int CustomTime                = -1;
 	int WeightMult                = 5;
 	int ShortcutKeycode           = 0;
-	EffectTimedType TimedType     = EffectTimedType::Default;
+	EffectTimedType TimedType     = EffectTimedType::NotTimed;
 	EffectCategory EffectCategory = EffectCategory::None;
 
   private:
diff --git a/ChaosMod/Effects/EffectTimedType.h b/ChaosMod/Effects/EffectTimedType.h
index f78f0de1d..78f28f6a3 100644
--- a/ChaosMod/Effects/EffectTimedType.h
+++ b/ChaosMod/Effects/EffectTimedType.h
@@ -2,10 +2,9 @@
 
 enum class EffectTimedType
 {
-	NotTimed = -4,
-	Permanent,
+	Permanent = -3,
 	Custom,
-	Default,
+	NotTimed,
 	Normal,
 	Short
 };
\ No newline at end of file
diff --git a/ChaosMod/Main.cpp b/ChaosMod/Main.cpp
index b1cc94c37..dba39f0ef 100644
--- a/ChaosMod/Main.cpp
+++ b/ChaosMod/Main.cpp
@@ -21,6 +21,7 @@
 #include "Components/Mp3Manager.h"
 #include "Components/SplashTexts.h"
 #include "Components/Voting.h"
+#include "Components/Workshop.h"
 
 #include "Util/File.h"
 #include "Util/OptionsManager.h"
@@ -192,6 +193,8 @@ static void Init()
 
 	INIT_COMPONENT("SplashTexts", "mod splash texts handler", SplashTexts);
 
+	INIT_COMPONENT("Workshop", "workshop", Workshop);
+
 	INIT_COMPONENT("Mp3Manager", "effect sound system", Mp3Manager);
 
 	INIT_COMPONENT("MetaModifiers", "meta modifier states", MetaModifiers);
diff --git a/ChaosMod/Util/Peds.h b/ChaosMod/Util/Peds.h
index 426b49489..1e8d47119 100644
--- a/ChaosMod/Util/Peds.h
+++ b/ChaosMod/Util/Peds.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../Util/Natives.h"
+#include "Util/Natives.h"
 
 #include "PoolSpawner.h"
 
diff --git a/ChaosMod/Util/Workshop.h b/ChaosMod/Util/Workshop.h
deleted file mode 100644
index e0a093fa0..000000000
--- a/ChaosMod/Util/Workshop.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include "Util/File.h"
-
-#include <filesystem>
-#include <string>
-#include <vector>
-
-#include <json.hpp>
-
-enum class WorkshopFileType
-{
-	Script,
-	Audio
-};
-
-inline std::vector<std::string> GetWorkshopSubmissionBlacklistedFiles(const std::string &submissionPath)
-{
-	auto submissionSettingsFile = submissionPath + ".json";
-	std::vector<std::string> blacklistedFiles;
-	if (DoesFileExist(submissionSettingsFile))
-	{
-		try
-		{
-			std::ifstream fileStream(submissionSettingsFile);
-			std::stringstream buffer;
-			buffer << fileStream.rdbuf();
-
-			auto submissionSettingsJson = nlohmann::json::parse(buffer);
-			for (const std::string &file : submissionSettingsJson["disabled_files"])
-			{
-				blacklistedFiles.push_back(file);
-			}
-		}
-		catch (nlohmann::json::exception)
-		{
-		}
-	}
-
-	return blacklistedFiles;
-}
-
-inline std::vector<std::filesystem::directory_entry>
-GetWorkshopSubmissionFiles(const std::string &submissionPath, WorkshopFileType fileType, std::string subPath = "")
-{
-	const auto &blacklistedFiles = GetWorkshopSubmissionBlacklistedFiles(submissionPath);
-
-	std::vector<std::filesystem::directory_entry> entries;
-	switch (fileType)
-	{
-	case WorkshopFileType::Script:
-		entries = GetFiles(submissionPath + "\\" + subPath, ".lua", true, blacklistedFiles);
-		break;
-	case WorkshopFileType::Audio:
-		entries = GetFiles(submissionPath + "\\" + subPath, ".mp3", true, blacklistedFiles);
-		break;
-	default:
-		return {};
-	}
-
-	return entries;
-}
\ No newline at end of file
diff --git a/ChaosMod/stdafx.h b/ChaosMod/stdafx.h
index a448f5aa3..ce1a324c5 100644
--- a/ChaosMod/stdafx.h
+++ b/ChaosMod/stdafx.h
@@ -13,14 +13,18 @@
 #include "Util/TryParse.h"
 
 #include <Patterns/Patterns.h>
+#include <json.hpp>
 #include <minhook/include/MinHook.h>
 #include <scripthookv/inc/main.h>
 #include <scripthookv/inc/natives.h>
+
 #define SOL_ALL_SAFETIES_ON 1
 #define SOL_SAFE_NUMERICS 1
 #include <sol3/sol.hpp>
 
 #define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
 #include <d3d11.h>
 #include <d3dcompiler.h>
 #include <dbghelp.h>
@@ -28,7 +32,6 @@
 #include <mmsystem.h>
 #include <psapi.h>
 #include <tlhelp32.h>
-#include <windows.h>
 #include <winuser.h>
 
 #include <array>
diff --git a/ConfigApp/EffectConfig.xaml b/ConfigApp/EffectConfig.xaml
index 4262730ba..d2b889b3c 100644
--- a/ConfigApp/EffectConfig.xaml
+++ b/ConfigApp/EffectConfig.xaml
@@ -47,30 +47,25 @@
                  IsEnabled="False"
                  MaxLength="6" PreviewTextInput="OnlyNumbersPreviewTextInput"
                  CommandManager.PreviewExecuted="NoCopyPastePreviewExecuted" ContextMenu="{x:Null}" />
-        <Label Content="Make Permanent (Might not work well with every effect)" Grid.Row="3" Grid.Column="0"
-               HorizontalAlignment="Right" VerticalAlignment="Center" />
-        <CheckBox x:Name="effectconf_timer_permanent_enable" Grid.Row="3" Grid.Column="2"
-                  HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center"
-                  Click="OnClicked" />
         <Label x:Name="effectconf_effect_weight_mult_title" Content="Set Effect Weight Multiplier (Affects chances of this effect occuring)&#xD;&#xA;lowest: 1, highest: 10, default: 5"
-               Grid.Row="4" Grid.Column="0"
+               Grid.Row="3" Grid.Column="0"
                HorizontalAlignment="Right" VerticalAlignment="Center" />
-        <ComboBox x:Name="effectconf_effect_weight_mult" Height="25" Width="45" Grid.Row="4" Grid.Column="2"
+        <ComboBox x:Name="effectconf_effect_weight_mult" Height="25" Width="100" Grid.Row="3" Grid.Column="2"
                   HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <Label x:Name="effectconf_exclude_voting_enable_title" Content="Exclude Effect from Voting (Twitch)" Grid.Row="5" Grid.Column="0"
+        <Label x:Name="effectconf_exclude_voting_enable_title" Content="Exclude Effect from Voting" Grid.Row="4" Grid.Column="0"
                HorizontalAlignment="Right" VerticalAlignment="Center" />
-        <CheckBox x:Name="effectconf_exclude_voting_enable" Grid.Row="5" Grid.Column="2"
+        <CheckBox x:Name="effectconf_exclude_voting_enable" Grid.Row="4" Grid.Column="2"
                   HorizontalAlignment="Left" VerticalAlignment="Center"
                   Click="OnClicked"/>
+        <Label x:Name="effectconf_effect_shortcut_key_title" Content="Shortcut (ESC to reset)"
+                  Grid.Row="5" Grid.Column="0" Margin="0,5.667,0,10.333" HorizontalAlignment="Right" Width="360" HorizontalContentAlignment="Right" />
+        <TextBox x:Name="effectconf_effect_shortcut_input" Grid.Row="5" Grid.Column="2" Margin="0,10,0,10" AllowDrop="False" Height="20" 
+                 IsUndoEnabled="False" IsReadOnly="True" PreviewKeyDown="EffectShortcutTextFieldPreviewKeyDown" HorizontalContentAlignment="Center" 
+                 HorizontalAlignment="Left" Text="None" SelectionBrush="{x:Null}" MinWidth="120"/>
         <TextBlock x:Name="effectconf_mp3_label" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" FontSize="10"
                    HorizontalAlignment="Center" VerticalAlignment="Center" />
         <Button Content="Save" Height="40" Width="75" Margin="0,0,5,0" Grid.Row="8" Grid.Column="2"
                 HorizontalAlignment="Right" VerticalAlignment="Center" 
                 Click="OnSave"/>
-        <Label x:Name="effectconf_effect_shortcut_key_title" Content="Shortcut (ESC to reset)"
-            Grid.Row="6" Grid.Column="0" Margin="0,5.667,0,10.333" HorizontalAlignment="Right" Width="360" HorizontalContentAlignment="Right" />
-        <TextBox x:Name="effectconf_effect_shortcut_input" Grid.Row="6" Grid.Column="2" Margin="0,10,0,10" AllowDrop="False" Height="20" 
-                 IsUndoEnabled="False" IsReadOnly="True" PreviewKeyDown="EffectShortcutTextFieldPreviewKeyDown" HorizontalContentAlignment="Center" 
-                 HorizontalAlignment="Left" Text="None" SelectionBrush="{x:Null}" MinWidth="120"/>
     </Grid>
 </Window>
diff --git a/ConfigApp/EffectConfig.xaml.cs b/ConfigApp/EffectConfig.xaml.cs
index f619bda38..3512f39ea 100644
--- a/ConfigApp/EffectConfig.xaml.cs
+++ b/ConfigApp/EffectConfig.xaml.cs
@@ -1,4 +1,6 @@
-using System.Windows;
+using System;
+using System.Collections.Generic;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
@@ -8,9 +10,11 @@ namespace ConfigApp
 {
     public partial class EffectConfig : Window
     {
-        private bool m_isTimedEffect;
+        private EffectData m_EffectData;
+        private bool m_IsTimedEffect = false;
         private bool m_IsSaved = false;
-        private int m_EffectShortcut; // Win32Key + 2^10 (if CTRL) + 2^9 (if Shift) + 2^8 (if Alt)
+        private int? m_EffectShortcut; // Win32Key + 2^10 (if CTRL) + 2^9 (if Shift) + 2^8 (if Alt)
+
         public bool IsSaved
         {
             get
@@ -19,50 +23,70 @@ public bool IsSaved
             }
         }
 
-        public EffectConfig(string effectId, EffectData effectData, EffectInfo effectInfo)
+        public EffectConfig(string effectId, EffectData? effectData, EffectInfo effectInfo)
         {
             InitializeComponent();
 
+            if (effectData == null)
+            {
+                effectData = new EffectData();
+            }
+
             Title = effectInfo.Name;
 
-            m_isTimedEffect = effectInfo.IsTimed;
+            m_EffectData = effectData;
+            m_IsTimedEffect = effectInfo.IsTimed;
 
-            if (m_isTimedEffect)
+            if (m_IsTimedEffect)
             {
-                effectconf_timer_type_enable.IsChecked = effectData.TimedType != (effectInfo.IsShort ? EffectTimedType.TimedShort : EffectTimedType.TimedNormal);
+                effectconf_timer_type_enable.IsChecked = m_EffectData.TimedType != null;
                 effectconf_timer_type.ItemsSource = new string[]
                 {
                     "Normal",
-                    "Short"
+                    "Short",
+                    "Permanent"
                 };
-                effectconf_timer_type.SelectedIndex = effectData.TimedType == EffectTimedType.TimedShort ? 1 : 0;
+                switch (m_EffectData.TimedType.GetValueOrDefault(EffectTimedType.Normal))
+                {
+                    case EffectTimedType.Normal:
+                        effectconf_timer_type.SelectedIndex = 0;
+                        break;
+                    case EffectTimedType.Short:
+                        effectconf_timer_type.SelectedIndex = 1;
+                        break;
+                    case EffectTimedType.Permanent:
+                        effectconf_timer_type.SelectedIndex = 2;
+                        break;
+                    default:
+                        effectconf_timer_type.SelectedIndex = 0;
+                        break;
+                }
 
-                if (effectData.CustomTime >= 0)
+                if (m_EffectData.CustomTime >= 0)
                 {
                     effectconf_timer_time_enable.IsChecked = true;
-                    effectconf_timer_time.Text = $"{effectData.CustomTime}";
+                    effectconf_timer_time.Text = $"{m_EffectData.CustomTime}";
                 }
             }
 
-            effectconf_timer_permanent_enable.IsChecked = effectData.Permanent;
-
-            int[] weightItems = new int[10];
-            for (int i = 0; i < 10; i++)
+            effectconf_effect_weight_mult.ItemsSource = new List<string>()
             {
-                weightItems[i] = i + 1;
-            }
-            effectconf_effect_weight_mult.ItemsSource = weightItems;
-            effectconf_effect_weight_mult.SelectedIndex = effectData.WeightMult - 1;
+                "Default", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"
+            };
+            effectconf_effect_weight_mult.SelectedIndex = m_EffectData.WeightMult.GetValueOrDefault(0);
 
-            effectconf_exclude_voting_enable.IsChecked = effectData.ExcludedFromVoting;
+            effectconf_exclude_voting_enable.IsChecked = m_EffectData.ExcludedFromVoting.GetValueOrDefault(false);
 
-            effectconf_effect_custom_name.Text = effectData.CustomName;
+            effectconf_effect_custom_name.Text = m_EffectData.CustomName;
             effectconf_effect_custom_name.TextChanged += CustomEffectNameTextFieldTextChanged;
 
-            effectconf_mp3_label.Text = $@"
-                Sound to play when this effect gets activated: chaosmod/sounds/{effectId}.mp3
-                Or create the following folder and drop mp3 files in there to play a random one: chaosmod/sounds/{effectId}
+            if (!string.IsNullOrWhiteSpace(effectId))
+            {
+                effectconf_mp3_label.Text = $@"
+                    Sound to play when this effect gets activated: chaosmod/sounds/{effectId}.mp3
+                    Or create the following folder and drop mp3 files in there to play a random one: chaosmod/sounds/{effectId}
                 ";
+            }
 
             // Meta Effect Handling
 
@@ -74,7 +98,7 @@ public EffectConfig(string effectId, EffectData effectData, EffectInfo effectInf
             }
 
             // Shortcut
-            if (int.TryParse(effectData.Shortcut.ToString(), out int savedWin32Key))
+            if (int.TryParse(m_EffectData.ShortcutKeycode.ToString(), out int savedWin32Key))
             {
                 if (savedWin32Key > 0)
                 {
@@ -120,7 +144,7 @@ private void EffectShortcutTextFieldPreviewKeyDown(object sender, KeyEventArgs e
             if (key == Key.Escape || key == Key.Back)
             {
                 effectconf_effect_shortcut_input.Text = "None";
-                m_EffectShortcut = 0;
+                m_EffectShortcut = null;
                 return;
             }
 
@@ -170,11 +194,10 @@ private void SetEffectShortcut(Key key, ModifierKeys modifiers)
 
         private void CheckEnableConfigurables()
         {
-            if (!m_isTimedEffect)
+            if (!m_IsTimedEffect)
             {
                 effectconf_timer_type_enable.IsEnabled = false;
                 effectconf_timer_time_enable.IsEnabled = false;
-                effectconf_timer_permanent_enable.IsEnabled = false;
             }
 
             effectconf_timer_type.IsEnabled = effectconf_timer_type_enable.IsChecked.Value;
@@ -188,17 +211,10 @@ private void OnClicked(object sender, RoutedEventArgs e)
                 if (sender == effectconf_timer_type_enable)
                 {
                     effectconf_timer_time_enable.IsChecked = false;
-                    effectconf_timer_permanent_enable.IsChecked = false;
                 }
                 else if (sender == effectconf_timer_time_enable)
                 {
                     effectconf_timer_type_enable.IsChecked = false;
-                    effectconf_timer_permanent_enable.IsChecked = false;
-                }
-                else if (sender == effectconf_timer_permanent_enable)
-                {
-                    effectconf_timer_type_enable.IsChecked = false;
-                    effectconf_timer_time_enable.IsChecked = false;
                 }
             }
 
@@ -220,17 +236,40 @@ private void NoCopyPastePreviewExecuted(object sender, ExecutedRoutedEventArgs e
             Utils.HandleNoCopyPastePreviewExecuted(sender, e);
         }
 
-        public void GetData(ref EffectData effectData)
+        public EffectData GetNewData()
         {
-            effectData.TimedType = effectconf_timer_type_enable.IsChecked.Value ? (EffectTimedType)effectconf_timer_type.SelectedIndex
-                : EffectTimedType.TimedDefault;
-            effectData.CustomTime = effectconf_timer_time_enable.IsChecked.Value
-                ? effectconf_timer_time.Text.Length > 0 ? int.Parse(effectconf_timer_time.Text) : -1 : -1;
-            effectData.Permanent = effectconf_timer_permanent_enable.IsChecked.Value;
-            effectData.WeightMult = effectconf_effect_weight_mult.SelectedIndex + 1;
-            effectData.ExcludedFromVoting = effectconf_exclude_voting_enable.IsChecked.Value;
-            effectData.CustomName = effectconf_effect_custom_name.Text.Trim();
-            effectData.Shortcut = m_EffectShortcut;
+            if (effectconf_timer_type_enable.IsChecked.HasValue && effectconf_timer_type_enable.IsChecked.Value)
+            {
+                switch (effectconf_timer_type.SelectedIndex)
+                {
+                    case 0:
+                        m_EffectData.TimedType = EffectTimedType.Normal;
+                        break;
+                    case 1:
+                        m_EffectData.TimedType = EffectTimedType.Short;
+                        break;
+                    case 2:
+                        m_EffectData.TimedType = EffectTimedType.Permanent;
+                        break;
+                    default:
+                        m_EffectData.TimedType = null;
+                        break;
+                }
+            }
+            else
+            {
+                m_EffectData.TimedType = null;
+            }
+
+            m_EffectData.CustomTime = effectconf_timer_time_enable.IsChecked.HasValue && effectconf_timer_time_enable.IsChecked.Value
+                ? effectconf_timer_time.Text.Length > 0 ? int.Parse(effectconf_timer_time.Text) : null : null;
+            m_EffectData.WeightMult = effectconf_effect_weight_mult.SelectedIndex > 0 ? effectconf_effect_weight_mult.SelectedIndex : null;
+            m_EffectData.ExcludedFromVoting = effectconf_exclude_voting_enable.IsChecked.HasValue && effectconf_exclude_voting_enable.IsChecked.Value
+                ? true : null; // Currently the assumption is that every effect is voteable in the mod anyways so don't waste space where unneeded storing this is false
+            m_EffectData.CustomName = effectconf_effect_custom_name.Text.Trim().Length > 0 ? effectconf_effect_custom_name.Text.Trim() : null;
+            m_EffectData.ShortcutKeycode = m_EffectShortcut;
+
+            return m_EffectData;
         }
 
         private void OnSave(object sender, RoutedEventArgs e)
diff --git a/ConfigApp/EffectData.cs b/ConfigApp/EffectData.cs
index a73c44810..bb4196b42 100644
--- a/ConfigApp/EffectData.cs
+++ b/ConfigApp/EffectData.cs
@@ -1,26 +1,55 @@
-using static ConfigApp.Effects;
+using Newtonsoft.Json;
+using System;
+using static ConfigApp.Effects;
 
 namespace ConfigApp
 {
+    [JsonObject(ItemNullValueHandling = NullValueHandling.Ignore)]
     public class EffectData
     {
-        public EffectTimedType TimedType;
-        public int CustomTime;
-        public int WeightMult;
-        public bool Permanent;
-        public bool ExcludedFromVoting;
-        public string CustomName;
-        public int Shortcut;
-
-        public EffectData(EffectTimedType timedType, int customTime, int weightMult, bool permanent, bool excludedFromVoting, string customName, int shortcut)
+        private class Converter<T> : JsonConverter
         {
-            TimedType = timedType;
-            CustomTime = customTime;
-            WeightMult = weightMult;
-            Permanent = permanent;
-            ExcludedFromVoting = excludedFromVoting;
-            CustomName = customName;
-            Shortcut = shortcut;
+            public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+            {
+                if (value is bool)
+                {
+                    writer.WriteValue(((bool)value) ? 1 : 0);
+                }
+                else
+                {
+                    writer.WriteValue((int)value);
+                }
+            }
+
+            public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+            {
+                if (typeof(T) == typeof(bool))
+                {
+                    return $"{reader.Value}" != "0";
+                }
+                else if (typeof(T) == typeof(EffectTimedType))
+                {
+                    return Enum.ToObject(typeof(EffectTimedType), reader.Value);
+                }
+
+                return null;
+            }
+
+            public override bool CanConvert(Type objectType)
+            {
+                return objectType == typeof(T);
+            }
         }
+
+        [JsonConverter(typeof(Converter<bool>))]
+        public bool? Enabled;
+        [JsonConverter(typeof(Converter<EffectTimedType>))]
+        public EffectTimedType? TimedType;
+        public int? CustomTime;
+        public int? WeightMult;
+        [JsonConverter(typeof(Converter<bool>))]
+        public bool? ExcludedFromVoting;
+        public string? CustomName;
+        public int? ShortcutKeycode;
     }
 }
diff --git a/ConfigApp/Effects.cs b/ConfigApp/Effects.cs
index afa2959ae..104f799cd 100644
--- a/ConfigApp/Effects.cs
+++ b/ConfigApp/Effects.cs
@@ -6,6 +6,16 @@ public static class Effects
     {
         public struct EffectInfo
         {
+            public string Name { get; set; } = null;
+            public EffectCategory EffectCategory { get; set; } = EffectCategory.Unknown;
+            public bool IsTimed { get; set; } = false;
+            public bool IsShort { get; set; } = false;
+
+            public EffectInfo()
+            {
+
+            }
+
             public EffectInfo(string name, EffectCategory effectCategory, bool isTimed = false, bool isShort = false)
             {
                 Name = name;
@@ -13,15 +23,11 @@ public EffectInfo(string name, EffectCategory effectCategory, bool isTimed = fal
                 IsTimed = isTimed;
                 IsShort = isShort;
             }
-
-            public readonly string Name;
-            public readonly EffectCategory EffectCategory;
-            public readonly bool IsTimed;
-            public readonly bool IsShort;
         }
 
         public enum EffectCategory
         {
+            Unknown = -1,
             Player,
             Vehicle,
             Peds,
@@ -34,9 +40,11 @@ public enum EffectCategory
 
         public enum EffectTimedType
         {
-            TimedDefault = -1,
-            TimedNormal,
-            TimedShort
+            Permanent = -3,
+            Custom, // Not used here, CustomTime is set to something other than 0 instead
+            NotTimed,
+            Normal,
+            Short,
         }
 
         public static readonly Dictionary<string, EffectInfo> EffectsMap = new Dictionary<string, EffectInfo>()
diff --git a/ConfigApp/EffectsTreeMenuItem.cs b/ConfigApp/EffectsTreeMenuItem.cs
index 727deb34c..ed49ff333 100644
--- a/ConfigApp/EffectsTreeMenuItem.cs
+++ b/ConfigApp/EffectsTreeMenuItem.cs
@@ -1,11 +1,40 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows;
+using System.Windows.Input;
 
 namespace ConfigApp
 {
     public class TreeMenuItem : INotifyPropertyChanged
     {
+        private class TreeMenuItemAction : ICommand
+        {
+            public event EventHandler CanExecuteChanged;
+
+            private Action m_Action;
+
+            public TreeMenuItemAction(Action action)
+            {
+                m_Action = action;
+            }
+
+            public bool CanExecute(object parameter)
+            {
+                return true;
+            }
+
+            public void Execute(object parameter)
+            {
+                if (m_Action == null)
+                {
+                    return;
+                }
+
+                m_Action();
+            }
+        }
+
         public string Text { get; private set; }
         public string BaseText { get; private set; }
         public TreeMenuItem Parent;
@@ -35,11 +64,19 @@ public bool IsChecked
                 Parent?.UpdateCheckedAccordingToChildrenStatus();
             }
         }
+        private bool m_ForceConfigHidden = false;
         public string IsConfigVisible
         {
             get
             {
-                return Children.Count == 0 ? "Visible" : "Hidden";
+                return Children.Count == 0 && !m_ForceConfigHidden ? "Visible" : "Hidden";
+            }
+        }
+        public bool ForceConfigHidden
+        {
+            set
+            {
+                m_ForceConfigHidden = value;
             }
         }
         public bool IsConfigEnabled
@@ -49,6 +86,14 @@ public bool IsConfigEnabled
                 return IsChecked;
             }
         }
+        public Action OnConfigureClick { get; set; }
+        public ICommand OnConfigureCommand
+        {
+            get
+            {
+                return new TreeMenuItemAction(OnConfigureClick);
+            }
+        }
 
         public TreeMenuItem(string text, TreeMenuItem parent = null)
         {
diff --git a/ConfigApp/MainWindow.xaml b/ConfigApp/MainWindow.xaml
index c21eab33f..7f6ffe1b5 100644
--- a/ConfigApp/MainWindow.xaml
+++ b/ConfigApp/MainWindow.xaml
@@ -19,7 +19,8 @@
                                     <StackPanel Orientation="Horizontal" Height="20">
                                         <CheckBox Focusable="False" IsChecked="{Binding IsChecked}" VerticalAlignment="Center" />
                                         <TextBlock Text="{Binding Text}" Margin="5,0" VerticalAlignment="Center" />
-                                        <Button Content="..." Visibility="{Binding IsConfigVisible}" IsEnabled="{Binding IsConfigEnabled}" Width="18" Height="18" Margin="8,0" VerticalAlignment="Center" Click="effect_user_config_Click" />
+                                        <Button Content="..." Visibility="{Binding IsConfigVisible}" IsEnabled="{Binding IsConfigEnabled}" Width="18" Height="18" Margin="8,0"
+                                                VerticalAlignment="Center" Command="{Binding OnConfigureCommand}" />
                                     </StackPanel>
                                 </HierarchicalDataTemplate>
                             </TreeView.Resources>
@@ -95,7 +96,8 @@
                                             <StackPanel Orientation="Horizontal" Height="20">
                                                 <CheckBox Focusable="False" IsChecked="{Binding IsChecked}" VerticalAlignment="Center" />
                                                 <TextBlock Text="{Binding Text}" Margin="5,0" VerticalAlignment="Center" />
-                                                <Button Content="..." Visibility="{Binding IsConfigVisible}" IsEnabled="{Binding IsConfigEnabled}" Width="18" Height="18" Margin="8,0" VerticalAlignment="Center" Click="effect_user_config_Click" />
+                                                <Button Content="..." Visibility="{Binding IsConfigVisible}" IsEnabled="{Binding IsConfigEnabled}" Width="18" Height="18" Margin="8,0"
+                                                        VerticalAlignment="Center" Command="{Binding OnConfigureCommand}" />
                                             </StackPanel>
                                         </HierarchicalDataTemplate>
                                     </TreeView.Resources>
diff --git a/ConfigApp/MainWindow.xaml.cs b/ConfigApp/MainWindow.xaml.cs
index 27f9e89f1..e73a577d3 100644
--- a/ConfigApp/MainWindow.xaml.cs
+++ b/ConfigApp/MainWindow.xaml.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -149,8 +148,7 @@ private EffectData GetEffectData(string effectId)
             // Create EffectData in case effect wasn't saved yet
             if (!m_EffectDataMap.TryGetValue(effectId, out EffectData effectData))
             {
-                effectData = new EffectData(EffectsMap[effectId].IsShort ? EffectTimedType.TimedShort : EffectTimedType.TimedNormal, -1, 5, false, false, null, 0);
-
+                effectData = new EffectData();
                 m_EffectDataMap.Add(effectId, effectData);
             }
 
@@ -177,60 +175,15 @@ private void ParseEffectsFile()
         {
             foreach (string key in OptionsManager.EffectsFile.GetKeys())
             {
-                string value = OptionsManager.EffectsFile.ReadValue(key);
-
-                // Split by comma, ignoring commas in between quotation marks
-                string[] values = Regex.Split(value, ",(?=(?:[^\"]*\"[^\"]*\")*(?![^\"]*\"))");
-
-                if (!EffectsMap.TryGetValue(key, out EffectInfo effectInfo))
-                {
-                    continue;
-                }
+                var value = OptionsManager.EffectsFile.ReadValue(key);
+                var effectData = Utils.ValueStringToEffectData(value);
 
-                var effectTimedType = effectInfo.IsShort ? EffectTimedType.TimedShort : EffectTimedType.TimedNormal;
-                int effectTimedTime = -1;
-                int effectWeight = 5;
-                bool effectPermanent = false;
-                bool effectExcludedFromVoting = false;
-                string effectCustomName = null;
-                int effectShortcut = 0;
+                m_EffectDataMap.Add(key, effectData);
 
-                // Compatibility checks, previous versions had less options
-                if (values.Length >= 4)
+                if (m_TreeMenuItemsMap.ContainsKey(key))
                 {
-                    Enum.TryParse(values[1], out effectTimedType);
-                    int.TryParse(values[2], out effectTimedTime);
-                    int.TryParse(values[3], out effectWeight);
-
-                    if (values.Length >= 5)
-                    {
-                        int tmp;
-
-                        int.TryParse(values[4], out tmp);
-                        effectPermanent = tmp != 0;
-
-                        if (values.Length >= 6)
-                        {
-                            int.TryParse(values[5], out tmp);
-                            effectExcludedFromVoting = tmp != 0;
-
-                            if (values.Length >= 7)
-                            {
-                                effectCustomName = values[6] == "0" ? null : values[6].Trim('\"');
-                                if (values.Length >= 8)
-                                {
-                                    int.TryParse(values[7], out effectShortcut);
-                                }
-                            }
-                        }
-                    }
+                    m_TreeMenuItemsMap[key].IsChecked = effectData.Enabled.GetValueOrDefault(true);
                 }
-
-                int.TryParse(values[0], out int enabled);
-                m_TreeMenuItemsMap[key].IsChecked = enabled == 0 ? false : true;
-
-                m_EffectDataMap.Add(key, new EffectData(effectTimedType, effectTimedTime, effectWeight, effectPermanent,
-                    effectExcludedFromVoting, effectCustomName, effectShortcut));
             }
         }
 
@@ -238,13 +191,16 @@ private void WriteEffectsFile()
         {
             foreach (var pair in EffectsMap)
             {
-                EffectData effectData = GetEffectData(pair.Key);
+                var effectData = GetEffectData(pair.Key);
 
                 OptionsManager.EffectsFile.WriteValue(pair.Key, $"{(m_TreeMenuItemsMap[pair.Key].IsChecked ? 1 : 0)}"
-                    + $",{((int)effectData.TimedType)}"
-                    + $",{effectData.CustomTime},{effectData.WeightMult},{(effectData.Permanent ? 1 : 0)},{(effectData.ExcludedFromVoting ? 1 : 0)}"
+                    + $",{(int)effectData.TimedType.GetValueOrDefault(EffectTimedType.NotTimed)}"
+                    + $",{effectData.CustomTime.GetValueOrDefault(0)}"
+                    + $",{effectData.WeightMult.GetValueOrDefault(-1)}"
+                    + $",{(effectData.TimedType.GetValueOrDefault(EffectTimedType.NotTimed) == EffectTimedType.Permanent ? 1 : 0)}"
+                    + $",{(effectData.ExcludedFromVoting.GetValueOrDefault(false) ? 1 : 0)}"
                     + $",\"{(string.IsNullOrEmpty(effectData.CustomName) ? "" : effectData.CustomName)}\""
-                    + $",{effectData.Shortcut}");
+                    + $",{effectData.ShortcutKeycode.GetValueOrDefault(0)}");
             }
 
             OptionsManager.EffectsFile.WriteFile();
@@ -264,21 +220,39 @@ private void InitEffectsTreeView()
             var miscParentItem = new TreeMenuItem("Misc");
             var metaParentItem = new TreeMenuItem("Meta");
 
-            var sortedEffects = new SortedDictionary<string, Tuple<string, EffectCategory>>();
+            var sortedEffects = new SortedDictionary<string, (string EffectId, EffectCategory EffectCategory)>();
 
             foreach (var pair in EffectsMap)
             {
-                sortedEffects.Add(pair.Value.Name, new Tuple<string, EffectCategory>(pair.Key, pair.Value.EffectCategory));
+                sortedEffects.Add(pair.Value.Name, (EffectId: pair.Key, EffectCategory: pair.Value.EffectCategory));
             }
 
             foreach (var effect in sortedEffects)
             {
-                var effectTuple = effect.Value;
+                var effectName = effect.Key;
+                var effectMisc = effect.Value;
+
+                var menuItem = new TreeMenuItem(effectName)
+                {
+                    OnConfigureClick = () =>
+                    {
+                        var effectInfo = EffectsMap[effectMisc.EffectId];
+                        var effectData = GetEffectData(effectMisc.EffectId);
+
+                        var effectConfig = new EffectConfig(effectMisc.EffectId, effectData, effectInfo);
+                        effectConfig.ShowDialog();
+
+                        if (!effectConfig.IsSaved)
+                        {
+                            return;
+                        }
 
-                TreeMenuItem menuItem = new TreeMenuItem(effect.Key);
-                m_TreeMenuItemsMap.Add(effectTuple.Item1, menuItem);
+                        m_EffectDataMap[effectMisc.EffectId] = effectConfig.GetNewData();
+                    }
+                };
+                m_TreeMenuItemsMap.Add(effectMisc.EffectId, menuItem);
 
-                switch (effectTuple.Item2)
+                switch (effectMisc.EffectCategory)
                 {
                     case EffectCategory.Player:
                         playerParentItem.AddChild(menuItem);
@@ -398,36 +372,6 @@ private void user_reset_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void effect_user_config_Click(object sender, RoutedEventArgs e)
-        {
-            TreeMenuItem curTreeMenuItem = (TreeMenuItem)((TreeViewItem)((Grid)((Border)((ContentPresenter)((StackPanel)((Button)sender).Parent).TemplatedParent).Parent).Parent).TemplatedParent).DataContext;
-
-            string effectId = null;
-            foreach (var pair in m_TreeMenuItemsMap)
-            {
-                if (pair.Value == curTreeMenuItem)
-                {
-                    effectId = pair.Key;
-
-                    break;
-                }
-            }
-
-            if (effectId != null)
-            {
-                var effectInfo = EffectsMap[effectId];
-                var effectData = GetEffectData(effectId);
-
-                var effectConfig = new EffectConfig(effectId, effectData, effectInfo);
-                effectConfig.ShowDialog();
-
-                if (effectConfig.IsSaved)
-                {
-                    effectConfig.GetData(ref effectData);
-                }
-            }
-        }
-
         public void OpenModPageEvent(object sender, RoutedEventArgs eventArgs)
         {
             System.Diagnostics.Process.Start("https://www.gta5-mods.com/scripts/chaos-mod-v-beta");
diff --git a/ConfigApp/Utils.cs b/ConfigApp/Utils.cs
index 2718d767a..720ee8aee 100644
--- a/ConfigApp/Utils.cs
+++ b/ConfigApp/Utils.cs
@@ -1,4 +1,6 @@
-using System.Windows;
+using System.Text.RegularExpressions;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
@@ -6,6 +8,57 @@ namespace ConfigApp
 {
     public static class Utils
     {
+        public static EffectData ValueStringToEffectData(string value)
+        {
+            // Split by comma, ignoring commas in between quotation marks
+            var values = Regex.Split(value, ",(?=(?:[^\"]*\"[^\"]*\")*(?![^\"]*\"))");
+
+            var effectData = new EffectData();
+
+            /* Has compatibility checks as previous mod versions had less options */
+
+            if (values.Length >= 4)
+            {
+                int.TryParse(values[0], out int enabled);
+                effectData.Enabled = enabled == 0 ? false : true;
+
+                Enum.TryParse(values[1], out Effects.EffectTimedType timedType);
+                effectData.TimedType = timedType;
+                int.TryParse(values[2], out int customTime);
+                effectData.CustomTime = customTime;
+                int.TryParse(values[3], out int weightMult);
+                effectData.WeightMult = weightMult;
+            }
+
+            if (values.Length >= 5)
+            {
+                int.TryParse(values[4], out int tmp);
+                if (tmp != 0)
+                {
+                    effectData.TimedType = Effects.EffectTimedType.Permanent;
+                }
+            }
+
+            if (values.Length >= 6)
+            {
+                int.TryParse(values[5], out int tmp);
+                effectData.ExcludedFromVoting = tmp != 0;
+            }
+
+            if (values.Length >= 7)
+            {
+                effectData.CustomName = values[6] == "0" ? null : values[6].Trim('\"');
+            }
+
+            if (values.Length >= 8)
+            {
+                int.TryParse(values[7], out int shortcut);
+                effectData.ShortcutKeycode = shortcut;
+            }
+
+            return effectData;
+        }
+
         public static void HandleOnlyNumbersPreviewTextInput(object sender, TextCompositionEventArgs eventArgs)
         {
             if (eventArgs.Text.Length == 0 || !char.IsDigit(eventArgs.Text[0]))
diff --git a/ConfigApp/WorkshopEditDialog.xaml b/ConfigApp/WorkshopEditDialog.xaml
index 4cc3ab3b6..f557b7eb7 100644
--- a/ConfigApp/WorkshopEditDialog.xaml
+++ b/ConfigApp/WorkshopEditDialog.xaml
@@ -21,6 +21,8 @@
                     <StackPanel Orientation="Horizontal" Height="20">
                         <CheckBox Focusable="False" Visibility="{Binding CheckBoxVisiblity}" IsChecked="{Binding IsChecked}" VerticalAlignment="Center" />
                         <TextBlock Text="{Binding Text}" Margin="5,0" VerticalAlignment="Center" />
+                        <Button Content="..." Visibility="{Binding IsConfigVisible}" IsEnabled="{Binding IsConfigEnabled}" Width="18" Height="18" Margin="8,0"
+                                VerticalAlignment="Center" Command="{Binding OnConfigureCommand}"  />
                     </StackPanel>
                 </HierarchicalDataTemplate>
             </TreeView.Resources>
diff --git a/ConfigApp/WorkshopEditDialog.xaml.cs b/ConfigApp/WorkshopEditDialog.xaml.cs
index de1d233bb..b4f9b4206 100644
--- a/ConfigApp/WorkshopEditDialog.xaml.cs
+++ b/ConfigApp/WorkshopEditDialog.xaml.cs
@@ -15,11 +15,13 @@ public class WorkshopSubmissionFile : IComparable<WorkshopSubmissionFile>
     {
         public string Name { get; private set; }
         public bool IsEnabled { get; private set; }
+        public EffectData? EffectData { get; private set; }
 
-        public WorkshopSubmissionFile(string name, bool enabled = true)
+        public WorkshopSubmissionFile(string name, bool enabled, EffectData? effectData = null)
         {
             Name = name;
             IsEnabled = enabled;
+            EffectData = effectData;
         }
 
         public int CompareTo(WorkshopSubmissionFile obj)
@@ -32,11 +34,13 @@ public class WorkshopSubmissionFileState
     {
         public TreeMenuItem Item { get; private set; }
         public string FullPath { get; private set; }
+        public EffectData? EffectData { get; set; }
 
-        public WorkshopSubmissionFileState(TreeMenuItem item, string fullPath)
+        public WorkshopSubmissionFileState(TreeMenuItem item, string fullPath, EffectData? effectData = null)
         {
             Item = item;
             FullPath = fullPath;
+            EffectData = effectData;
         }
     }
 
@@ -52,7 +56,7 @@ public WorkshopEditDialog(List<WorkshopSubmissionFile> files, WorkshopEditDialog
 
             m_DialogMode = dialogMode;
 
-            if (dialogMode == WorkshopEditDialogMode.Install)
+            if (m_DialogMode == WorkshopEditDialogMode.Install)
             {
                 Title = "Install Submission";
 
@@ -65,16 +69,16 @@ public WorkshopEditDialog(List<WorkshopSubmissionFile> files, WorkshopEditDialog
             TreeMenuItem generateItem(string text, TreeMenuItem parent = null)
             {
                 var item = new TreeMenuItem(text, parent);
-                if (dialogMode == WorkshopEditDialogMode.Install)
+                if (m_DialogMode == WorkshopEditDialogMode.Install)
                 {
                     item.CheckBoxVisiblity = Visibility.Collapsed;
                 }
                 return item;
             }
 
-            TreeMenuItem luaParentItem = generateItem("Scripts");
-            TreeMenuItem mp3ParentItem = generateItem("Sounds");
-            TreeMenuItem txtParentItem = generateItem("Text Files");
+            var luaParentItem = generateItem("Scripts");
+            var mp3ParentItem = generateItem("Sounds");
+            var txtParentItem = generateItem("Text Files");
 
             var parentFolderItems = new Dictionary<string, TreeMenuItem>();
 
@@ -91,16 +95,18 @@ TreeMenuItem generateItem(string text, TreeMenuItem parent = null)
                 var pathFragments = (pathName.StartsWith("sounds\\") ? pathName.Substring(7) : pathName).Split('\\');
 
                 TreeMenuItem targetItem;
+                bool isConfigurable = false;
                 switch (pathName.Substring(pathName.Length - 4))
                 {
                     case ".lua":
                         targetItem = luaParentItem;
+                        isConfigurable = true;
                         break;
                     case ".mp3":
                         targetItem = mp3ParentItem;
                         break;
                     case ".txt":
-                        if (dialogMode != WorkshopEditDialogMode.Install)
+                        if (m_DialogMode != WorkshopEditDialogMode.Install)
                         {
                             continue;
                         }
@@ -140,8 +146,26 @@ TreeMenuItem generateItem(string text, TreeMenuItem parent = null)
                 }
 
                 var menuItem = generateItem(pathFragments.Last(), targetItem);
+                var fileState = new WorkshopSubmissionFileState(menuItem, pathName, file.EffectData);
+                menuItem.ForceConfigHidden = m_DialogMode != WorkshopEditDialogMode.Edit || !isConfigurable;
+                menuItem.OnConfigureClick = () =>
+                {
+                    var effectConfig = new EffectConfig(null, fileState.EffectData, new Effects.EffectInfo()
+                    {
+                        Name = pathName,
+                        IsTimed = true
+                    });
+                    effectConfig.ShowDialog();
+
+                    if (!effectConfig.IsSaved)
+                    {
+                        return;
+                    }
+
+                    fileState.EffectData = effectConfig.GetNewData();
+                };
                 targetItem.AddChild(menuItem);
-                FileStates.Add(new WorkshopSubmissionFileState(menuItem, pathName));
+                FileStates.Add(fileState);
 
                 menuItem.IsChecked = file.IsEnabled;
             }
@@ -153,7 +177,7 @@ TreeMenuItem generateItem(string text, TreeMenuItem parent = null)
 
             for (int i = files_tree_view.Items.Count - 1; i >= 0; i--)
             {
-                TreeMenuItem child = (TreeMenuItem)files_tree_view.Items.GetItemAt(i);
+                var child = (TreeMenuItem)files_tree_view.Items.GetItemAt(i);
                 if (child.Children.Count == 0)
                 {
                     files_tree_view.Items.RemoveAt(i);
diff --git a/ConfigApp/WorkshopInstallHandler.cs b/ConfigApp/WorkshopInstallHandler.cs
index c81327db5..5ac3a27d3 100644
--- a/ConfigApp/WorkshopInstallHandler.cs
+++ b/ConfigApp/WorkshopInstallHandler.cs
@@ -154,7 +154,7 @@ void fatalCleanup()
                             var trimmedName = (entry.FullName.StartsWith("sounds/") ? entry.FullName : entry.Name).Trim();
                             if (trimmedName.Length > 0)
                             {
-                                files.Add(new WorkshopSubmissionFile(trimmedName));
+                                files.Add(new WorkshopSubmissionFile(trimmedName, true));
                             }
                         }
                         files.Sort();
diff --git a/ConfigApp/WorkshopSettingsHandler.cs b/ConfigApp/WorkshopSettingsHandler.cs
index a04fce278..8632dba03 100644
--- a/ConfigApp/WorkshopSettingsHandler.cs
+++ b/ConfigApp/WorkshopSettingsHandler.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Windows;
 using System.Windows.Input;
 
@@ -35,14 +36,28 @@ public void Execute(object parameter)
 
             var submissionSettingsFile = $"workshop/{id}.json";
             var disabledFiles = new List<string>();
+            var scriptSettings = new Dictionary<string, EffectData>();
             if (File.Exists(submissionSettingsFile))
             {
                 try
                 {
-                    var json = JObject.Parse(File.ReadAllText(submissionSettingsFile));
-                    foreach (var file in json["disabled_files"])
+                    var fileText = File.ReadAllText(submissionSettingsFile);
+                    if (!string.IsNullOrWhiteSpace(fileText))
                     {
-                        disabledFiles.Add(file.Value<string>());
+                        var json = JObject.Parse(fileText);
+
+                        if (json.ContainsKey("disabled_files"))
+                        {
+                            foreach (var file in json["disabled_files"])
+                            {
+                                disabledFiles.Add(file.Value<string>());
+                            }
+                        }
+
+                        if (json.ContainsKey("effect_settings"))
+                        {
+                            scriptSettings = json["effect_settings"].ToObject<Dictionary<string, EffectData>>();
+                        }
                     }
                 }
                 catch (JsonException)
@@ -55,26 +70,50 @@ public void Execute(object parameter)
             foreach (var file in Directory.EnumerateFiles(submissionDir, "*", SearchOption.AllDirectories))
             {
                 var pathName = file.Replace(submissionDir, "");
-                files.Add(new WorkshopSubmissionFile(pathName, !disabledFiles.Contains(pathName)));
+                files.Add(new WorkshopSubmissionFile(pathName, !disabledFiles.Contains(pathName),
+                    scriptSettings.ContainsKey(pathName) ? scriptSettings[pathName] : null));
             }
 
             var editWindow = new WorkshopEditDialog(files, WorkshopEditDialogMode.Edit);
-            if (!(bool)editWindow.ShowDialog())
-            {
-                return;
-            }
+            editWindow.ShowDialog();
 
             var disabledFilesArrayJson = new JArray();
+            var scriptSettingsObjectJson = new JObject();
             foreach (var state in editWindow.FileStates)
             {
                 if (!state.Item.IsChecked)
                 {
                     disabledFilesArrayJson.Add(state.FullPath);
                 }
+
+                if (state.EffectData != null)
+                {
+                    // Don't save settings if everything is set 1:1 as defaults
+                    if (JsonConvert.SerializeObject(state.EffectData) != JsonConvert.SerializeObject(new EffectData()))
+                    {
+                        scriptSettingsObjectJson[state.FullPath] = JToken.FromObject(state.EffectData);
+                    }
+                }
             }
 
-            var disabledFilesJson = new JObject(new JProperty("disabled_files", disabledFilesArrayJson));
-            File.WriteAllText(submissionSettingsFile, disabledFilesJson.ToString());
+            var newJson = new JObject();
+            if (disabledFilesArrayJson.Count > 0)
+            {
+                newJson.Add(new JProperty("disabled_files", disabledFilesArrayJson));
+            }
+            if (scriptSettingsObjectJson.Count > 0)
+            {
+                newJson.Add(new JProperty("effect_settings", scriptSettingsObjectJson));
+            }
+
+            if (newJson.Count == 0)
+            {
+                File.Delete(submissionSettingsFile);
+            }
+            else
+            {
+                File.WriteAllText(submissionSettingsFile, $"{newJson}");
+            }
         }
     }
 }