diff --git a/mods/mff/mff_pclasses/admin.lua b/mods/mff/mff_pclasses/admin.lua
index 7b0a7175..1aba1c9e 100755
--- a/mods/mff/mff_pclasses/admin.lua
+++ b/mods/mff/mff_pclasses/admin.lua
@@ -9,7 +9,8 @@
 pclasses.api.register_class("admin", {
 	on_assigned = function(pname)
 		minetest.chat_send_player(pname, "Hello admin.")
-	end
+	end,
+	switch_color = {r = 255, g = 00, b = 224}
 })
 
 pclasses.api.reserve_item("admin", "3d_armor:helmet_admin")
diff --git a/mods/mff/mff_pclasses/hunter.lua b/mods/mff/mff_pclasses/hunter.lua
index b5854559..94153bce 100755
--- a/mods/mff/mff_pclasses/hunter.lua
+++ b/mods/mff/mff_pclasses/hunter.lua
@@ -21,6 +21,7 @@ pclasses.api.register_class("hunter", {
 	on_unassigned = function(pname)
 		sprint.set_default_maxstamina(pname)
 	end,
+	switch_color = {r = 60, g = 75, b = 00}
 })
 
 
diff --git a/mods/mff/mff_pclasses/warrior.lua b/mods/mff/mff_pclasses/warrior.lua
index a8a34e23..8b37bf93 100755
--- a/mods/mff/mff_pclasses/warrior.lua
+++ b/mods/mff/mff_pclasses/warrior.lua
@@ -16,6 +16,7 @@ pclasses.api.register_class("warrior", {
 	on_unassigned = function(pname)
 		sprint.set_default_maxstamina(pname)
 	end,
+	switch_color = {r = 00, g = 00, b = 114}
 })
 
 pclasses.api.reserve_item("warrior", "moreores:sword_mithril")
diff --git a/mods/pclasses/adventurer.lua b/mods/pclasses/adventurer.lua
index 2086f975..04e2267c 100755
--- a/mods/pclasses/adventurer.lua
+++ b/mods/pclasses/adventurer.lua
@@ -3,7 +3,7 @@
 --
 
 pclasses.api.register_class("adventurer", {
-	orb_color = { r = 255, g = 200, b = 200 },
+	switch_color = { r = 142, g = 00, b = 00},
 	on_assigned = function(pname)
 		minetest.chat_send_player(pname, "You are now an adventurer")
 	end
diff --git a/mods/pclasses/api.lua b/mods/pclasses/api.lua
index d9023374..4173a60c 100755
--- a/mods/pclasses/api.lua
+++ b/mods/pclasses/api.lua
@@ -14,7 +14,7 @@ function pclasses.api.register_class(cname, def)
 			cname .. ". Reason : no definition table.")
 		return
 	end
-	pclasses.register_class_switch_orb(cname, def.orb_color)
+	pclasses.register_class_switch(cname, def.switch_color)
 
 	pclasses.classes[cname] = def
 	return true
diff --git a/mods/pclasses/nodes.lua b/mods/pclasses/nodes.lua
index 28e20d84..9609c6c7 100755
--- a/mods/pclasses/nodes.lua
+++ b/mods/pclasses/nodes.lua
@@ -64,7 +64,7 @@ local classes_items = {
 	["adventurer"] = "unified_inventory:bag_large"
 }
 
-function pclasses.register_class_switch_orb(cname, color)
+function pclasses.register_class_switch(cname, color)
 	color = color or { r = 255, g = 255, b = 255 }
 	local txtcolor = string.format("#%02x%02x%02x", color.r, color.g, color.b)
 	local overlay = "pclasses_class_switch_orb_overlay.png"