diff --git a/.config/linux/system/module/common/Environment.nix b/.config/linux/system/module/common/Environment.nix
index 4f46472..ef56996 100644
--- a/.config/linux/system/module/common/Environment.nix
+++ b/.config/linux/system/module/common/Environment.nix
@@ -1,6 +1,6 @@
 { environment, ... }: {
 	security.loginDefs.settings.UMASK = "077";
-	environment.values = {
+	environment.variables = {
 		EDITOR   = "nvim";
 		MANPAGER = "nvim +Man!";
 	};
diff --git a/.config/linux/system/module/common/Firefox.nix b/.config/linux/system/module/common/Firefox.nix
index 1938f8e..f622a42 100644
--- a/.config/linux/system/module/common/Firefox.nix
+++ b/.config/linux/system/module/common/Firefox.nix
@@ -37,57 +37,39 @@
 			lockPref("signon.rememberSignons", false);
 		'';
 		policies = {
-			Bookmarks = [
+			ManagedBookmarks = [
 				{
-					Url       = "https://home.voronind.com";
-					Favicon   = "https://home.voronind.com/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					toplevel_name = "Pin";
 				} {
-					Url       = "https://music.yandex.ru";
-					Favicon   = "https://music.yandex.ru/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://home.voronind.com";
+					name = "Dashboard";
 				} {
-					Url       = "https://web.telegram.org";
-					Favicon   = "https://web.telegram.org/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://music.yandex.ru";
+					name = "Music";
 				} {
-					Url       = "https://discord.com";
-					Favicon   = "https://discord.com/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://web.telegram.org";
+					name = "Telegram";
 				} {
-					Url       = "https://mail.fsight.ru";
-					Favicon   = "https://mail.fsight.ru/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://discord.com";
+					name = "Discord";
 				} {
-					Url       = "https://git.voronind.com";
-					Favicon   = "https://git.voronind.com/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://mail.fsight.ru";
+					name = "Work Mail";
 				} {
-					Url       = "https://git.fmp.fsight.world";
-					Favicon   = "https://git.fmp.fsight.world/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://git.voronind.com";
+					name = "Git";
 				} {
-					Url       = "https://support.fsight.ru";
-					Favicon   = "https://support.fsight.ru/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://git.fmp.fsight.world";
+					name = "Work Git";
 				} {
-					Url       = "https://iot.voronind.com";
-					Favicon   = "https://iot.voronind.com/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://support.fsight.ru";
+					name = "Work Board";
 				} {
-					Url       = "https://cloud.voronind.com";
-					Favicon   = "https://cloud.voronind.com/favicon.ico";
-					Placement = "toolbar";
-					Title     = "";
+					url  = "https://iot.voronind.com";
+					name = "Hass";
+				} {
+					url  = "https://cloud.voronind.com";
+					name = "Cloud";
 				}
 			];
 			ExtensionUpdate = true;