diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java
index 6253ceb1c4f..157f36fb194 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java
@@ -34,18 +34,17 @@
 
 package mage.client.deckeditor;
 
-import java.awt.Component;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.swing.JComponent;
 import mage.cards.decks.Deck;
-
 import mage.client.MagePane;
 import mage.client.constants.Constants.DeckEditorMode;
 import mage.client.plugins.impl.Plugins;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  *
  * @author BetaSteward_at_googlemail.com
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index 4c794a9370b..83048cb6eca 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -90,7 +90,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
         deckArea.setOpaque(false);
         jPanel1.setOpaque(false);
         jSplitPane1.setOpaque(false);
-         countdown = new Timer(1000,
+        countdown = new Timer(1000,
             new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPane.java b/Mage.Client/src/main/java/mage/client/draft/DraftPane.java
index efd69df9bc0..7eb51a54f4a 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPane.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPane.java
@@ -34,8 +34,14 @@
 
 package mage.client.draft;
 
-import java.util.UUID;
 import mage.client.MagePane;
+import mage.client.plugins.impl.Plugins;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  *
@@ -45,7 +51,22 @@ public class DraftPane extends MagePane {
 
     /** Creates new form DraftPane */
     public DraftPane() {
-        initComponents();
+        boolean initialized = false;
+        if (Plugins.getInstance().isThemePluginLoaded()) {
+            Map<String, JComponent> ui = new HashMap<String, JComponent>();
+            JComponent container = Plugins.getInstance().updateTablePanel(ui);
+            if (container != null) {
+                draftPanel1 = new mage.client.draft.DraftPanel();
+                initComponents(container);
+                container.add(draftPanel1);
+                container.setOpaque(false);
+                draftPanel1.setOpaque(false);
+                initialized = true;
+            }
+        }
+        if (!initialized) {
+            initComponents();
+        }
     }
 
     public void showDraft(UUID draftId) {
@@ -85,6 +106,21 @@ public class DraftPane extends MagePane {
         pack();
     }// </editor-fold>//GEN-END:initComponents
 
+    private void initComponents(Component container) {
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+                layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addComponent(container, javax.swing.GroupLayout.DEFAULT_SIZE, 885, Short.MAX_VALUE)
+        );
+        layout.setVerticalGroup(
+                layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addComponent(container, javax.swing.GroupLayout.DEFAULT_SIZE, 626, Short.MAX_VALUE)
+        );
+
+        pack();
+    }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     mage.client.draft.DraftPanel draftPanel1;
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
index d4401f09cb8..9172ea186fa 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
@@ -67,6 +67,11 @@ public class DraftPanel extends javax.swing.JPanel {
     /** Creates new form DraftPanel */
     public DraftPanel() {
         initComponents();
+
+        draftBooster.setOpaque(false);
+        draftPicks.setOpaque(false);
+        jPanel1.setOpaque(false);
+
         countdown = new Timer(1000,
             new ActionListener() {
                 @Override