diff --git a/mapvote/README.md b/mapvote/README.md
index 09ce08f..69288ce 100644
--- a/mapvote/README.md
+++ b/mapvote/README.md
@@ -10,7 +10,11 @@ This is heavily inspired by [LastDemon99's IW5 mapvote](https://github.com/LastD
 I also re-used some code from [DoktorSAS T6 mapvote](https://github.com/DoktorSAS/PlutoniumT6Mapvote).  
 Huge thanks to both of them.
 
-![mapvote](images/mapvote.png)
+![mapvote1](images/mapvote1.png)
+*Mouse and keyboard input. Settings: default*
+
+![mapvote1](images/mapvote2.png)
+*Controller input. Settings: red colors, blur level: 5, horizontal spacing: 100, accent mode: max*
 
 ## mapvote.gsc
 
@@ -23,6 +27,7 @@ This script can either be installed in the `scripts` folder or in the `scripts\m
 - It has separate map and mode choices
 - It supports custom gamemode names and custom cfg
 - It rotates a completely random map and mode when there are no votes
+- Controllers are fully supported and work out of the box
 - It has a good level of customization
 - It has a debug mode to quickly preview the menu
 
diff --git a/mapvote/images/mapvote.png b/mapvote/images/mapvote.png
deleted file mode 100644
index 004be7f..0000000
Binary files a/mapvote/images/mapvote.png and /dev/null differ
diff --git a/mapvote/images/mapvote1.png b/mapvote/images/mapvote1.png
new file mode 100644
index 0000000..ef750f9
Binary files /dev/null and b/mapvote/images/mapvote1.png differ
diff --git a/mapvote/images/mapvote2.png b/mapvote/images/mapvote2.png
new file mode 100644
index 0000000..f436b39
Binary files /dev/null and b/mapvote/images/mapvote2.png differ
diff --git a/mapvote/mapvote.gsc b/mapvote/mapvote.gsc
index daf0341..d783ae7 100644
Binary files a/mapvote/mapvote.gsc and b/mapvote/mapvote.gsc differ
diff --git a/mapvote/source/mapvote-source.gsc b/mapvote/source/mapvote-source.gsc
index b514808..4c6bddf 100644
--- a/mapvote/source/mapvote-source.gsc
+++ b/mapvote/source/mapvote-source.gsc
@@ -125,8 +125,8 @@ ListenForVoteInputs()
 
     self notifyonplayercommand("down", "+attack");
     self notifyonplayercommand("select", "+gostand");
-    self notifyonplayercommand("select", "+usereload");
-    self notifyonplayercommand("select", "+activate");
+    self notifyonplayercommand("unselect", "+usereload");
+    self notifyonplayercommand("unselect", "+activate");
     self notifyonplayercommand("unselect", "+frag");
     
     if (GetDvarInt("mapvote_debug"))
@@ -270,11 +270,11 @@ CreateVoteMenu()
 
         if (level.mapvote["colors"]["help_accent_mode"] == "standard")
         {
-            buttonsHelpMessage = level.mapvote["colors"]["help_text"] + "Press " + level.mapvote["colors"]["help_accent"] + "[{+attack}] " + level.mapvote["colors"]["help_text"] + "to go down - Press " + level.mapvote["colors"]["help_accent"] + "[{+speed_throw}] " + level.mapvote["colors"]["help_text"] + "to go up - Press " + level.mapvote["colors"]["help_accent"] + "[{+gostand}] OR [{+activate}] " + level.mapvote["colors"]["help_text"] + "to select - Press " + level.mapvote["colors"]["help_accent"] + "[{+frag}] " + level.mapvote["colors"]["help_text"] + "to undo";
+            buttonsHelpMessage = level.mapvote["colors"]["help_text"] + "Press " + level.mapvote["colors"]["help_accent"] + "[{+attack}] " + level.mapvote["colors"]["help_text"] + "to go down - Press " + level.mapvote["colors"]["help_accent"] + "[{+speed_throw}] " + level.mapvote["colors"]["help_text"] + "to go up - Press " + level.mapvote["colors"]["help_accent"] + "[{+gostand}] " + level.mapvote["colors"]["help_text"] + "to select - Press " + level.mapvote["colors"]["help_accent"] + "[{+activate}] " + level.mapvote["colors"]["help_text"] + "to undo";
         }
         else if(level.mapvote["colors"]["help_accent_mode"] == "max")
         {
-            buttonsHelpMessage = level.mapvote["colors"]["help_text"] + "Press " + level.mapvote["colors"]["help_accent"] + "[{+attack}] " + level.mapvote["colors"]["help_text"] + "to go " + level.mapvote["colors"]["help_accent"] + "down " + level.mapvote["colors"]["help_text"] + "- Press " + level.mapvote["colors"]["help_accent"] + "[{+speed_throw}] " + level.mapvote["colors"]["help_text"] + "to go " + level.mapvote["colors"]["help_accent"] + "up " + level.mapvote["colors"]["help_text"] + "- Press " + level.mapvote["colors"]["help_accent"] + "[{+gostand}] " + level.mapvote["colors"]["help_accent"] + "OR " + level.mapvote["colors"]["help_accent"] + "[{+activate}] " + level.mapvote["colors"]["help_text"] + "to " + level.mapvote["colors"]["help_accent"] + "select " + level.mapvote["colors"]["help_text"] + "- Press " + level.mapvote["colors"]["help_accent"] + "[{+frag}] " + level.mapvote["colors"]["help_text"] + "to " + level.mapvote["colors"]["help_accent"] + "undo";
+            buttonsHelpMessage = level.mapvote["colors"]["help_text"] + "Press " + level.mapvote["colors"]["help_accent"] + "[{+attack}] " + level.mapvote["colors"]["help_text"] + "to go " + level.mapvote["colors"]["help_accent"] + "down " + level.mapvote["colors"]["help_text"] + "- Press " + level.mapvote["colors"]["help_accent"] + "[{+speed_throw}] " + level.mapvote["colors"]["help_text"] + "to go " + level.mapvote["colors"]["help_accent"] + "up " + level.mapvote["colors"]["help_text"] + "- Press " + level.mapvote["colors"]["help_accent"] + "[{+gostand}] " + level.mapvote["colors"]["help_text"] + "to " + level.mapvote["colors"]["help_accent"] + "select " + level.mapvote["colors"]["help_text"] + "- Press " + level.mapvote["colors"]["help_accent"] + "[{+activate}] " + level.mapvote["colors"]["help_text"] + "to " + level.mapvote["colors"]["help_accent"] + "undo";
         }
 
         if (GetDvarInt("mapvote_debug"))