diff --git a/hyprpm.toml b/hyprpm.toml
index b2f9812..f9da5e1 100644
--- a/hyprpm.toml
+++ b/hyprpm.toml
@@ -5,7 +5,9 @@ commit_pins = [
 	["e93fbd7c4f991cb8ef03e433ccc4d43587923e15", "3226c48a18a88790711c9bf04af3c08ae989f370"],
 	["cba1ade848feac44b2eda677503900639581c3f4", "b96fc643b4b262b76515e8a40cdf35b07adc8686"],
   ["0c7a7e2d569eeed9d6025f3eef4ea0690d90845d", "abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"],
-  ["4520b30d498daca8079365bdb909a8dea38e8d55","abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"]
+  ["4520b30d498daca8079365bdb909a8dea38e8d55", "abb0a02a256041b0cd1b1d68de8c8d6de70a5b51"],
+  ["a425fbebe4cf4238e48a42f724ef2208959d66cf", "3388351d2af672f89b907404668c6076336270e9"],
+  ["500d2a3580388afc8b620b0a3624147faa34f98b", "3388351d2af672f89b907404668c6076336270e9"]
 ]
 [hyprEasymotion]
 description = "Easymotion"
diff --git a/main.cpp b/main.cpp
index 4f13f3e..03ffa1b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -85,7 +85,7 @@ static bool parseBorderGradient(std::string VALUE, CGradientValueData *DATA) {
         }
 
         try {
-            DATA->m_vColors.push_back(CColor(configStringToInt(var)));
+            DATA->m_vColors.push_back(CColor(configStringToInt(var).value_or(0)));
         } catch (std::exception& e) {
             Debug::log(WARN, "Error parsing gradient {}", V);
         }
@@ -137,20 +137,20 @@ void easymotionDispatch(std::string args)
 		if (kv[0] == "action") {
 			actionDesc.commandString = kv[1];
 		} else if (kv[0] == "textsize") {
-			actionDesc.textSize = configStringToInt(kv[1]);
+			actionDesc.textSize = configStringToInt(kv[1]).value_or(15);
 		} else if (kv[0] == "textcolor") {
-			actionDesc.textColor = CColor(configStringToInt(kv[1]));
+			actionDesc.textColor = CColor(configStringToInt(kv[1]).value_or(0xffffffff));
 		} else if (kv[0] == "bgcolor") {
-			actionDesc.backgroundColor = CColor(configStringToInt(kv[1]));
+			actionDesc.backgroundColor = CColor(configStringToInt(kv[1]).value_or(0));
 		} else if (kv[0] == "textfont") {
 			actionDesc.textFont = kv[1];
 		} else if (kv[0] == "textpadding") {
 			CVarList padVars = CVarList(kv[1], 0, 's');
 			actionDesc.boxPadding.parseGapData(padVars);
 		} else if (kv[0] == "rounding") {
-			actionDesc.rounding = configStringToInt(kv[1]);
+			actionDesc.rounding = configStringToInt(kv[1]).value_or(0);
 		} else if (kv[0] == "bordersize") {
-			actionDesc.borderSize = configStringToInt(kv[1]);
+			actionDesc.borderSize = configStringToInt(kv[1]).value_or(0);
 		} else if (kv[0] == "bordercolor") {
 			CVarList varlist(kv[1], 0, 's');
 			actionDesc.borderColor.m_vColors.clear();
@@ -172,7 +172,8 @@ void easymotionDispatch(std::string args)
 					if (w->isHidden() || !w->m_bIsMapped || w->m_bFadingOut)
 						continue;
                     if (w->m_pWorkspace->m_bHasFullscreenWindow && 
-                        g_pCompositor->getFullscreenWindowOnWorkspace(w->workspaceID()) != w) {
+
+                        w->m_pWorkspace->getFullscreenWindow() != w) {
                         continue;
                     }
 					std::string lstr = actionDesc.motionKeys.substr(key_idx++, 1);
@@ -221,8 +222,8 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 
 		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textsize", Hyprlang::INT{15});
 
-		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textcolor", Hyprlang::INT{configStringToInt("rgba(ffffffff)")});
-		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:bgcolor", Hyprlang::INT{configStringToInt("rgba(000000ff)")});
+		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textcolor", Hyprlang::INT{configStringToInt("rgba(ffffffff)").value_or(0xffffffff)});
+		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:bgcolor", Hyprlang::INT{configStringToInt("rgba(000000ff)").value_or(0xff)});
 		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textfont", Hyprlang::STRING{"Sans"});
 		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:textpadding", Hyprlang::STRING{"0"});
 		HyprlandAPI::addConfigValue(PHANDLE, "plugin:easymotion:bordersize", Hyprlang::INT{0});