diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java
index 0b2a34a8720..12b3dbc7aa2 100644
--- a/forge-core/src/main/java/forge/deck/DeckFormat.java
+++ b/forge-core/src/main/java/forge/deck/DeckFormat.java
@@ -68,28 +68,7 @@ public enum DeckFormat {
             return true;
         }
     }),
-    Pauper      ( Range.is(60),                         Range.between(0, 10), 1, new Predicate<CardRules>() {
-        private final Set<String> bannedCards = new HashSet<String>(Arrays.asList(
-                "Adriana's Valor", "Advantageous Proclamation", "Amulet of Quoz", "Ancestral Recall", "Assemble the Rank and Vile",
-                "Backup Plan", "Balance", "Biorhythm", "Black Lotus", "Brago's Favor", "Braids, Cabal Minion", "Bronze Tablet",
-                "Channel", "Chaos Orb", "Coalition Victory", "Contract from Below", "Darkpact", "Demonic Attorney", "Double Stroke",
-                "Echoing Boon", "Emissary's Ploy", "Emrakul, the Aeons Torn", "Erayo, Soratami Ascendant", "Falling Star",
-                "Fastbond", "Gifts Ungiven", "Griselbrand", "Hired Heist", "Hold the Perimeter", "Hymn of the Wilds", "Immediate Action",
-                "Incendiary Dissent", "Iterative Analysis", "Jeweled Bird", "Karakas", "Leovold, Emissary of Trest", "Library of Alexandria",
-                "Limited Resources", "Mox Emerald", "Mox Jet", "Mox Pearl", "Mox Ruby", "Mox Sapphire", "Muzzio's Preparations",
-                "Natural Unity", "Painter's Servant", "Panoptic Mirror", "Power Play", "Primeval Titan", "Prophet of Kruphix",
-                "Rebirth", "Recurring Nightmare", "Rofellos, Llanowar Emissary", "Secret Summoning", "Secrets of Paradise",
-                "Sentinel Dispatch", "Shahrazad", "Sovereign's Realm", "Summoner's Bond", "Sundering Titan", "Sway of the Stars",
-                "Sylvan Primordial", "Tempest Efreet", "Time Vault", "Time Walk", "Timmerian Fiends", "Tinker", "Tolarian Academy",
-                "Trade Secrets", "Unexpected Potential", "Upheaval", "Weight Advantage", "Worldfire", "Worldknit", "Yawgmoth's Bargain"));
-        @Override
-        public boolean apply(CardRules rules) {
-            if (bannedCards.contains(rules.getName())) {
-                return false;
-            }
-            return true;
-        }
-    }),
+    Pauper      ( Range.is(60),                         Range.between(0, 10), 1),
     Brawl      ( Range.is(59), Range.between(0, 15), 1, new Predicate<CardRules>() {
         @Override
         public boolean apply(CardRules rules) {
@@ -421,6 +400,9 @@ public enum DeckFormat {
         if (cardPoolFilter != null && !cardPoolFilter.apply(rules)) {
             return false;
         }
+        if(this.equals(DeckFormat.Brawl)) {
+            return rules.canBeBrawlCommander();
+        }
         return rules.canBeCommander();
     }
 
diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
index d31382f6447..c0bd5ec42b9 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
@@ -1036,8 +1036,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             if (parentScreen.getCommanderPage() != null) {
                 boolean isLegalCommander;
                 if(parentScreen.editorType.equals(EditorType.Brawl)){
-                    CardType cardType = card.getRules().getType();
-                    isLegalCommander = cardType.isPlaneswalker() || (cardType.isCreature() && cardType.isLegendary());
+                    isLegalCommander = card.getRules().canBeBrawlCommander();
                 }else{
                     isLegalCommander = DeckFormat.Commander.isLegalCommander(card.getRules());
                 }
diff --git a/forge-gui/src/main/java/forge/match/input/InputPassPriority.java b/forge-gui/src/main/java/forge/match/input/InputPassPriority.java
index 8b5dff87428..cab74400821 100644
--- a/forge-gui/src/main/java/forge/match/input/InputPassPriority.java
+++ b/forge-gui/src/main/java/forge/match/input/InputPassPriority.java
@@ -64,7 +64,7 @@ public class InputPassPriority extends InputSyncronizedBase {
         }
 
         getController().getGui().alertUser();
-        SoundSystem.instance.play(SoundEffectType.WinDuel, false);
+
     }
 
     /** {@inheritDoc} */
diff --git a/forge-gui/src/main/java/forge/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/properties/ForgeConstants.java
index 716e30804ef..effecd1e325 100644
--- a/forge-gui/src/main/java/forge/properties/ForgeConstants.java
+++ b/forge-gui/src/main/java/forge/properties/ForgeConstants.java
@@ -219,7 +219,7 @@ public final class ForgeConstants {
     public static final String QUEST_SAVE_DIR       = USER_QUEST_DIR + "saves" + PATH_SEPARATOR;
     public static final String CONQUEST_SAVE_DIR    = USER_CONQUEST_DIR + "saves" + PATH_SEPARATOR;
     public static final String DECK_TINY_LEADERS_DIR= DECK_BASE_DIR + "tiny_leaders" + PATH_SEPARATOR;
-    public static final String DECK_BRAWL_DIR= DECK_BASE_DIR + "brawl" + PATH_SEPARATOR;
+    public static final String DECK_BRAWL_DIR       = DECK_BASE_DIR + "brawl" + PATH_SEPARATOR;
     public static final String MAIN_PREFS_FILE      = USER_PREFS_DIR + "forge.preferences";
     public static final String CARD_PREFS_FILE      = USER_PREFS_DIR + "card.preferences";
     public static final String DECK_PREFS_FILE      = USER_PREFS_DIR + "deck.preferences";