diff --git a/ftpd-pack.xml b/ftpd-pack.xml
index 530b6f7..fffb422 100644
--- a/ftpd-pack.xml
+++ b/ftpd-pack.xml
@@ -2055,9 +2055,7 @@ end</script>
 scripts.inv.weapon2_action_on = "powyjmij bron z &lt;pojemnika&gt;; gzdobadz jej"
 scripts.inv.weapon1_action_off = false
 scripts.inv.weapon2_action_off = false
-scripts.inv.main_weapons_action = {1, 2}
-expandAlias("/minus /db", false)
-expandAlias("/equal /bd", false)</script>
+scripts.inv.main_weapons_action = {1, 2}</script>
 					<command></command>
 					<packageName></packageName>
 					<regex>^/normal$</regex>
@@ -2522,9 +2520,9 @@ end</script>
 				<eventHandlerList />
 			</Script>
 			<Script isActive="yes" isFolder="no">
-				<name>ftpd_objectshandler</name>
+				<name>ftpd_ishidden</name>
 				<packageName></packageName>
-				<script>function ftpd_objectshandler()
+				<script>function ftpd_ishidden()
   for k,v in pairs(gmcp.objects.data) do
     if tonumber(k) == ateam.my_id then
       if v["hidden"] == nil or v["hidden"] == false then
@@ -2534,18 +2532,33 @@ end</script>
         scripts.ui.footer_map:setColor(128,128,128)
         scripts.ui.footer_main:setColor(128,128,128)
       end
-    else
-      if v["avatar_target"] == true then
-        scripts.ui.footer_map:setColor(216,78,78)
-        scripts.ui.footer_main:setColor(216,78,78)
-      end
-    end
+		end
   end
 end</script>
 				<eventHandlerList>
 					<string>gmcp.objects.data</string>
 				</eventHandlerList>
 			</Script>
+			<Script isActive="yes" isFolder="no">
+				<name>ftpd_isfight</name>
+				<packageName></packageName>
+				<script>function ftpd_isfight()
+	for k,v in pairs(gmcp.objects.data) do
+    if v["avatar_target"] == true then
+			scripts.ui.footer_map:setColor(216,78,78)
+			scripts.ui.footer_main:setColor(216,78,78)
+    end
+  end
+	if gmcp.gmcp_msgs.type == "combat.avatar" or gmcp.gmcp_msgs.type == "combat.team" then
+  	scripts.ui.footer_map:setColor(216,78,78)
+		scripts.ui.footer_main:setColor(216,78,78)
+  end
+end</script>
+				<eventHandlerList>
+					<string>gmcp.objects.data</string>
+					<string>gmcp.gmcp_msgs</string>
+				</eventHandlerList>
+			</Script>
 		</ScriptGroup>
 	</ScriptPackage>
 	<KeyPackage>