diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index c14861e7748..ff2b693aa79 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -38,51 +38,28 @@ import mage.Constants;
 import mage.cards.Card;
 import mage.cards.decks.Deck;
 import mage.client.cards.CardsStorage;
+import mage.client.chat.ChatPanel;
 import mage.client.components.MageComponents;
 import mage.client.components.MageJDesktop;
 import mage.client.components.MageRoundPane;
-import mage.client.components.arcane.ManaSymbols;
+import mage.client.components.MageUI;
 import mage.client.constants.Constants.DeckEditorMode;
+import mage.client.deckeditor.DeckEditorPane;
 import mage.client.deckeditor.collection.viewer.CollectionViewerPane;
 import mage.client.dialog.*;
-import mage.client.plugins.impl.Plugins;
-import mage.client.util.EDTExceptionHandler;
-import mage.client.util.gui.ArrowBuilder;
-import mage.components.ImagePanel;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import javax.swing.JToolBar.Separator;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
-import java.beans.PropertyVetoException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.List;
-import java.util.prefs.Preferences;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
-import mage.client.chat.ChatPanel;
-import mage.client.components.MageUI;
-import mage.client.deckeditor.DeckEditorPane;
 import mage.client.draft.DraftPane;
 import mage.client.draft.DraftPanel;
 import mage.client.game.GamePane;
 import mage.client.game.GamePanel;
+import mage.client.plugins.impl.Plugins;
 import mage.client.remote.CallbackClientImpl;
 import mage.client.table.TablesPane;
 import mage.client.tournament.TournamentPane;
 import mage.client.tournament.TournamentPanel;
+import mage.client.util.EDTExceptionHandler;
 import mage.client.util.SettingsManager;
+import mage.client.util.gui.ArrowBuilder;
+import mage.components.ImagePanel;
 import mage.game.match.MatchOptions;
 import mage.interfaces.MageClient;
 import mage.interfaces.callback.CallbackClient;
@@ -90,27 +67,43 @@ import mage.interfaces.callback.ClientCallback;
 import mage.remote.Connection;
 import mage.remote.Connection.ProxyType;
 import mage.remote.Session;
-import mage.utils.MageVersion;
 import mage.sets.Sets;
+import mage.utils.MageVersion;
 import mage.view.TableView;
 import org.apache.log4j.Logger;
+import org.mage.card.arcane.ManaSymbols;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.JToolBar.Separator;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyVetoException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.List;
+import java.util.prefs.Preferences;
 
 /**
  * @author BetaSteward_at_googlemail.com
  */
 public class MageFrame extends javax.swing.JFrame implements MageClient {
 
-    private final static Logger logger = Logger.getLogger(MageFrame.class);
+	private final static Logger logger = Logger.getLogger(MageFrame.class);
 	private final static String liteModeArg = "-lite";
 	private final static String grayModeArg = "-gray";
 
-    private static Session session;
-    private ConnectDialog connectDialog;
-    private ErrorDialog errorDialog;
+	private static Session session;
+	private ConnectDialog connectDialog;
+	private ErrorDialog errorDialog;
 	private static CallbackClient callbackClient;
-    private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
-    private JLabel title;
-    private Rectangle titleRectangle;
+	private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class);
+	private JLabel title;
+	private Rectangle titleRectangle;
 	private final static MageVersion version = new MageVersion(0, 8, 0, "");
 	private UUID clientId;
 	private static MagePane activeFrame;
@@ -124,21 +117,21 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 	private static Map<UUID, TournamentPanel> tournaments = new HashMap<UUID, TournamentPanel>();
 	private static MageUI ui = new MageUI();
 
-    /**
-     * @return the session
-     */
-    public static Session getSession() {
-        return session;
-    }
+	/**
+	 * @return the session
+	 */
+	public static Session getSession() {
+		return session;
+	}
 
-    public static JDesktopPane getDesktop() {
-        return desktopPane;
-    }
+	public static JDesktopPane getDesktop() {
+		return desktopPane;
+	}
+
+	public static Preferences getPreferences() {
+		return prefs;
+	}
 
-    public static Preferences getPreferences() {
-        return prefs;
-    }
-	
 	public static boolean isLite() {
 		return liteMode;
 	}
@@ -152,47 +145,48 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		return version;
 	}
 
-    /**
-     * Creates new form MageFrame
-     */
-    public MageFrame() {
+	/**
+	 * Creates new form MageFrame
+	 */
+	public MageFrame() {
 
-        setTitle("Mage, version " + version);
+		setTitle("Mage, version " + version);
 		clientId = UUID.randomUUID();
-		
-        EDTExceptionHandler.registerExceptionHandler();
-        addWindowListener(new WindowAdapter() {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                exitApp();
-            }
-        });
 
-        try {
-            UIManager.put("desktop", new Color(0, 0, 0, 0));
-            UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
-            //MageSynthStyleFactory f = new MageSynthStyleFactory(SynthLookAndFeel.getStyleFactory());
-            //SynthLookAndFeel.setStyleFactory(f);
-        } catch (Exception ex) {
-            logger.fatal(null, ex);
-        }
+		EDTExceptionHandler.registerExceptionHandler();
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				exitApp();
+			}
+		});
+
+		try {
+			UIManager.put("desktop", new Color(0, 0, 0, 0));
+			UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+			//MageSynthStyleFactory f = new MageSynthStyleFactory(SynthLookAndFeel.getStyleFactory());
+			//SynthLookAndFeel.setStyleFactory(f);
+		} catch (Exception ex) {
+			logger.fatal(null, ex);
+		}
 
 		ManaSymbols.loadImages();
-        Plugins.getInstance().loadPlugins();
+		//ManaSymbols.loadImages();
+		Plugins.getInstance().loadPlugins();
 
-        initComponents();
-        setSize(1024, 768);
+		initComponents();
+		setSize(1024, 768);
 		SettingsManager.getInstance().setScreenWidthAndHeight(1024, 768);
 		this.setExtendedState(JFrame.MAXIMIZED_BOTH);
 
-        session = new Session(this);
+		session = new Session(this);
 		callbackClient = new CallbackClientImpl(this);
-        connectDialog = new ConnectDialog();
-        desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);
-        errorDialog = new ErrorDialog();
-        errorDialog.setLocation(100, 100);
-        desktopPane.add(errorDialog, JLayeredPane.POPUP_LAYER);
-        ui.addComponent(MageComponents.DESKTOP_PANE, desktopPane);
+		connectDialog = new ConnectDialog();
+		desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);
+		errorDialog = new ErrorDialog();
+		errorDialog.setLocation(100, 100);
+		desktopPane.add(errorDialog, JLayeredPane.POPUP_LAYER);
+		ui.addComponent(MageComponents.DESKTOP_PANE, desktopPane);
 
 		try {
 			tablesPane = new TablesPane();
@@ -208,173 +202,173 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		}
 
 		addTooltipContainer();
-        setBackground();
-        addMageLabel();
-        setAppIcon();
+		setBackground();
+		addMageLabel();
+		setAppIcon();
 
 		//PlayerPanelNew n = new PlayerPanelNew();
 		//n.setBounds(100,100,100,300);
 		//n.setVisible(true);
 		//backgroundPane.add(n);
 
-        desktopPane.add(ArrowBuilder.getArrowsPanel(), JLayeredPane.DRAG_LAYER);
+		desktopPane.add(ArrowBuilder.getArrowsPanel(), JLayeredPane.DRAG_LAYER);
 
-        desktopPane.addComponentListener(new ComponentAdapter() {
-            @Override
-            public void componentResized(ComponentEvent e) {
-                int width = ((JComponent) e.getSource()).getWidth();
-                int height = ((JComponent) e.getSource()).getHeight();
-                SettingsManager.getInstance().setScreenWidthAndHeight(width, height);
+		desktopPane.addComponentListener(new ComponentAdapter() {
+			@Override
+			public void componentResized(ComponentEvent e) {
+				int width = ((JComponent) e.getSource()).getWidth();
+				int height = ((JComponent) e.getSource()).getHeight();
+				SettingsManager.getInstance().setScreenWidthAndHeight(width, height);
 				if (!liteMode && !grayMode) {
- 					backgroundPane.setSize(width, height);
-                }
-                JPanel arrowsPanel = ArrowBuilder.getArrowsPanelRef();
-                if (arrowsPanel != null) arrowsPanel.setSize(width, height);
-                if (title != null) {
-                    //title.setBorder(BorderFactory.createLineBorder(Color.red));
-                    title.setBounds((int) (width - titleRectangle.getWidth()) / 2, (int) (height - titleRectangle.getHeight()) / 2, titleRectangle.width, titleRectangle.height);
-                }
-            }
-        });
+					backgroundPane.setSize(width, height);
+				}
+				JPanel arrowsPanel = ArrowBuilder.getArrowsPanelRef();
+				if (arrowsPanel != null) arrowsPanel.setSize(width, height);
+				if (title != null) {
+					//title.setBorder(BorderFactory.createLineBorder(Color.red));
+					title.setBounds((int) (width - titleRectangle.getWidth()) / 2, (int) (height - titleRectangle.getHeight()) / 2, titleRectangle.width, titleRectangle.height);
+				}
+			}
+		});
 
 		mageToolbar.add(new javax.swing.JToolBar.Separator());
 		mageToolbar.add(createWindowsButton());
-		
-        //TODO: move to plugin impl
-        if (Plugins.getInstance().isCardPluginLoaded()) {
-            Separator separator = new javax.swing.JToolBar.Separator();
-            mageToolbar.add(separator);
 
-            JButton btnDownloadSymbols = new JButton("Symbols");
-            btnDownloadSymbols.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-            btnDownloadSymbols.setFocusable(false);
-            btnDownloadSymbols.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-            btnDownloadSymbols.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-            btnDownloadSymbols.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(java.awt.event.ActionEvent evt) {
-                    btnSymbolsActionPerformed(evt);
-                }
-            });
-            mageToolbar.add(btnDownloadSymbols);
+		//TODO: move to plugin impl
+		if (Plugins.getInstance().isCardPluginLoaded()) {
+			Separator separator = new javax.swing.JToolBar.Separator();
+			mageToolbar.add(separator);
 
-            separator = new javax.swing.JToolBar.Separator();
-            mageToolbar.add(separator);
+			JButton btnDownloadSymbols = new JButton("Symbols");
+			btnDownloadSymbols.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+			btnDownloadSymbols.setFocusable(false);
+			btnDownloadSymbols.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+			btnDownloadSymbols.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+			btnDownloadSymbols.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent evt) {
+					btnSymbolsActionPerformed(evt);
+				}
+			});
+			mageToolbar.add(btnDownloadSymbols);
 
-            JButton btnDownload = new JButton("Images");
-            btnDownload.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-            btnDownload.setFocusable(false);
-            btnDownload.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-            btnDownload.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-            btnDownload.addActionListener(new java.awt.event.ActionListener() {
-                public void actionPerformed(java.awt.event.ActionEvent evt) {
-                    btnImagesActionPerformed(evt);
-                }
-            });
-            mageToolbar.add(btnDownload);
-        }
+			separator = new javax.swing.JToolBar.Separator();
+			mageToolbar.add(separator);
 
-        if (Plugins.getInstance().isCounterPluginLoaded()) {
-            int i = Plugins.getInstance().getGamesPlayed();
-            JLabel label = new JLabel("  Games played: " + String.valueOf(i));
-            desktopPane.add(label, JLayeredPane.DEFAULT_LAYER + 1);
-            label.setVisible(true);
-            label.setForeground(Color.white);
-            label.setBounds(0, 0, 180, 30);
-        }
+			JButton btnDownload = new JButton("Images");
+			btnDownload.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+			btnDownload.setFocusable(false);
+			btnDownload.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+			btnDownload.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+			btnDownload.addActionListener(new java.awt.event.ActionListener() {
+				public void actionPerformed(java.awt.event.ActionEvent evt) {
+					btnImagesActionPerformed(evt);
+				}
+			});
+			mageToolbar.add(btnDownload);
+		}
 
-        ui.addButton(MageComponents.TABLES_MENU_BUTTON, btnGames);
+		if (Plugins.getInstance().isCounterPluginLoaded()) {
+			int i = Plugins.getInstance().getGamesPlayed();
+			JLabel label = new JLabel("  Games played: " + String.valueOf(i));
+			desktopPane.add(label, JLayeredPane.DEFAULT_LAYER + 1);
+			label.setVisible(true);
+			label.setForeground(Color.white);
+			label.setBounds(0, 0, 180, 30);
+		}
 
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-	            disableButtons();
-                if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_CHECK, "true").equals("true"))
-                    checkForNewImages();
-                if (autoConnect())
-                    enableButtons();
-                else {
+		ui.addButton(MageComponents.TABLES_MENU_BUTTON, btnGames);
+
+		SwingUtilities.invokeLater(new Runnable() {
+			public void run() {
+				disableButtons();
+				if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_CARD_IMAGES_CHECK, "true").equals("true"))
+					checkForNewImages();
+				if (autoConnect())
+					enableButtons();
+				else {
 					connectDialog.showDialog();
 				}
-            }
-        });
-    }
+			}
+		});
+	}
 
-    private void addTooltipContainer() {
-        final JEditorPane cardInfoPane = (JEditorPane) Plugins.getInstance().getCardInfoPane();
+	private void addTooltipContainer() {
+		final JEditorPane cardInfoPane = (JEditorPane) Plugins.getInstance().getCardInfoPane();
 		if (cardInfoPane == null) {
 			return;
 		}
-        cardInfoPane.setSize(320, 201);
-        cardInfoPane.setLocation(40, 40);
-        cardInfoPane.setBackground(new Color(0, 0, 0, 0));
+		cardInfoPane.setSize(320, 201);
+		cardInfoPane.setLocation(40, 40);
+		cardInfoPane.setBackground(new Color(0, 0, 0, 0));
 
-        MageRoundPane popupContainer = new MageRoundPane();
-        popupContainer.setLayout(null);
+		MageRoundPane popupContainer = new MageRoundPane();
+		popupContainer.setLayout(null);
 
-        popupContainer.add(cardInfoPane);
-        popupContainer.setVisible(false);
-        popupContainer.setBounds(0, 0, 320 + 80, 201 + 80);
+		popupContainer.add(cardInfoPane);
+		popupContainer.setVisible(false);
+		popupContainer.setBounds(0, 0, 320 + 80, 201 + 80);
 
-        desktopPane.add(popupContainer, JLayeredPane.POPUP_LAYER);
+		desktopPane.add(popupContainer, JLayeredPane.POPUP_LAYER);
 
-        ui.addComponent(MageComponents.CARD_INFO_PANE, cardInfoPane);
-        ui.addComponent(MageComponents.POPUP_CONTAINER, popupContainer);
-    }
+		ui.addComponent(MageComponents.CARD_INFO_PANE, cardInfoPane);
+		ui.addComponent(MageComponents.POPUP_CONTAINER, popupContainer);
+	}
 
-    private void setBackground() {
+	private void setBackground() {
 		if (liteMode || grayMode)
 			return;
-        String filename = "/background.jpg";
-        try {
-            if (Plugins.getInstance().isThemePluginLoaded()) {
-                Map<String, JComponent> ui = new HashMap<String, JComponent>();
-                backgroundPane = (ImagePanel) Plugins.getInstance().updateTablePanel(ui);
-            } else {
-                InputStream is = this.getClass().getResourceAsStream(filename);
-                BufferedImage background = ImageIO.read(is);
-                backgroundPane = new ImagePanel(background, ImagePanel.SCALED);
-            }
-            backgroundPane.setSize(1024, 768);
-            desktopPane.add(backgroundPane, JLayeredPane.DEFAULT_LAYER);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+		String filename = "/background.jpg";
+		try {
+			if (Plugins.getInstance().isThemePluginLoaded()) {
+				Map<String, JComponent> ui = new HashMap<String, JComponent>();
+				backgroundPane = (ImagePanel) Plugins.getInstance().updateTablePanel(ui);
+			} else {
+				InputStream is = this.getClass().getResourceAsStream(filename);
+				BufferedImage background = ImageIO.read(is);
+				backgroundPane = new ImagePanel(background, ImagePanel.SCALED);
+			}
+			backgroundPane.setSize(1024, 768);
+			desktopPane.add(backgroundPane, JLayeredPane.DEFAULT_LAYER);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
 
-    private void addMageLabel() {
+	private void addMageLabel() {
 		if (liteMode || grayMode)
 			return;
-        String filename = "/label-mage.png";
-        try {
-            InputStream is = this.getClass().getResourceAsStream(filename);
+		String filename = "/label-mage.png";
+		try {
+			InputStream is = this.getClass().getResourceAsStream(filename);
 
-            float ratio = 1179.0f / 678.0f;
-            titleRectangle = new Rectangle(640, (int) (640 / ratio));
-            if (is != null) {
-                BufferedImage image = ImageIO.read(is);
-                //ImageIcon resized = new ImageIcon(image.getScaledInstance(titleRectangle.width, titleRectangle.height, java.awt.Image.SCALE_SMOOTH));
-                title = new JLabel();
-                title.setIcon(new ImageIcon(image));
-                backgroundPane.setLayout(null);
-                backgroundPane.add(title);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+			float ratio = 1179.0f / 678.0f;
+			titleRectangle = new Rectangle(640, (int) (640 / ratio));
+			if (is != null) {
+				BufferedImage image = ImageIO.read(is);
+				//ImageIcon resized = new ImageIcon(image.getScaledInstance(titleRectangle.width, titleRectangle.height, java.awt.Image.SCALE_SMOOTH));
+				title = new JLabel();
+				title.setIcon(new ImageIcon(image));
+				backgroundPane.setLayout(null);
+				backgroundPane.add(title);
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
 
-    private void setAppIcon() {
-        String filename = "/icon-mage.png";
-        try {
-            InputStream is = this.getClass().getResourceAsStream(filename);
+	private void setAppIcon() {
+		String filename = "/icon-mage.png";
+		try {
+			InputStream is = this.getClass().getResourceAsStream(filename);
 
-            if (is != null) {
-                BufferedImage image = ImageIO.read(is);
-                setIconImage(image);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+			if (is != null) {
+				BufferedImage image = ImageIO.read(is);
+				setIconImage(image);
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
 
 	private AbstractButton createWindowsButton() {
 		final JToggleButton windowButton = new JToggleButton("Windows");
@@ -413,7 +407,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		}
 
 		menu.addPopupMenuListener(new PopupMenuListener() {
-			public void popupMenuWillBecomeVisible(PopupMenuEvent e) { }
+			public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+			}
 
 			public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
 				windowButton.setSelected(false);
@@ -427,29 +422,29 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		menu.show(component, 0, component.getHeight());
 	}
 
-    private void checkForNewImages() {
-        HashSet<Card> cards = new HashSet<Card>(CardsStorage.getAllCards());
-        List<Card> notImplemented = CardsStorage.getNotImplementedCards();
-        cards.addAll(notImplemented);
-        if (Plugins.getInstance().newImage(cards)) {
-            if (JOptionPane.showConfirmDialog(null, "New cards are available.  Do you want to download the images?", "New images available", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-                Plugins.getInstance().downloadImage(cards);
-            }
-        }
-    }
-    
-    private void btnImagesActionPerformed(java.awt.event.ActionEvent evt) {
-        HashSet<Card> cards = new HashSet<Card>(CardsStorage.getAllCards());
-        List<Card> notImplemented = CardsStorage.getNotImplementedCards();
-        cards.addAll(notImplemented);
-        Plugins.getInstance().downloadImage(cards);
-    }
+	private void checkForNewImages() {
+		HashSet<Card> cards = new HashSet<Card>(CardsStorage.getAllCards());
+		List<Card> notImplemented = CardsStorage.getNotImplementedCards();
+		cards.addAll(notImplemented);
+		if (Plugins.getInstance().newImage(cards)) {
+			if (JOptionPane.showConfirmDialog(null, "New cards are available.  Do you want to download the images?", "New images available", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+				Plugins.getInstance().downloadImage(cards);
+			}
+		}
+	}
 
-    private void btnSymbolsActionPerformed(java.awt.event.ActionEvent evt) {
-        if (JOptionPane.showConfirmDialog(null, "Do you want to download mana symbols?") == JOptionPane.OK_OPTION) {
-            Plugins.getInstance().downloadSymbols();
-        }
-    }
+	private void btnImagesActionPerformed(java.awt.event.ActionEvent evt) {
+		HashSet<Card> cards = new HashSet<Card>(CardsStorage.getAllCards());
+		List<Card> notImplemented = CardsStorage.getNotImplementedCards();
+		cards.addAll(notImplemented);
+		Plugins.getInstance().downloadImage(cards);
+	}
+
+	private void btnSymbolsActionPerformed(java.awt.event.ActionEvent evt) {
+		if (JOptionPane.showConfirmDialog(null, "Do you want to download mana symbols?") == JOptionPane.OK_OPTION) {
+			Plugins.getInstance().downloadSymbols();
+		}
+	}
 
 	public static void setActive(MagePane frame) {
 		if (frame == null)
@@ -461,10 +456,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		activeFrame.toFront();
 		try {
 			activeFrame.setSelected(true);
-		} catch (PropertyVetoException ex) {}
+		} catch (PropertyVetoException ex) {
+		}
 		activeFrame.activated();
 	}
-	
+
 	public static void deactivate(MagePane frame) {
 		frame.setVisible(false);
 		MagePane topmost = getTopMost(frame);
@@ -472,11 +468,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			frame.deactivated();
 		setActive(topmost);
 	}
-	
+
 	private static MagePane getTopMost(MagePane exclude) {
 		MagePane topmost = null;
 		int best = Integer.MAX_VALUE;
-		for (JInternalFrame frame: desktopPane.getAllFramesInLayer(JLayeredPane.DEFAULT_LAYER)) {
+		for (JInternalFrame frame : desktopPane.getAllFramesInLayer(JLayeredPane.DEFAULT_LAYER)) {
 			if (frame.isVisible()) {
 				int z = desktopPane.getComponentZOrder(frame);
 				if (z < best) {
@@ -487,8 +483,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		}
 		return topmost;
 	}
-	
-    public void showGame(UUID gameId, UUID playerId) {
+
+	public void showGame(UUID gameId, UUID playerId) {
 		try {
 			GamePane gamePane = new GamePane();
 			desktopPane.add(gamePane, JLayeredPane.DEFAULT_LAYER);
@@ -496,10 +492,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			gamePane.setVisible(true);
 			gamePane.showGame(gameId, playerId);
 			setActive(gamePane);
-		} catch (PropertyVetoException ex) {}
-    }
+		} catch (PropertyVetoException ex) {
+		}
+	}
 
-    public void watchGame(UUID gameId) {
+	public void watchGame(UUID gameId) {
 		try {
 			GamePane gamePane = new GamePane();
 			desktopPane.add(gamePane, JLayeredPane.DEFAULT_LAYER);
@@ -507,10 +504,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			gamePane.setVisible(true);
 			gamePane.watchGame(gameId);
 			setActive(gamePane);
-		} catch (PropertyVetoException ex) {}
-    }
+		} catch (PropertyVetoException ex) {
+		}
+	}
 
-    public void replayGame(UUID gameId) {
+	public void replayGame(UUID gameId) {
 		try {
 			GamePane gamePane = new GamePane();
 			desktopPane.add(gamePane, JLayeredPane.DEFAULT_LAYER);
@@ -518,8 +516,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			gamePane.setVisible(true);
 			gamePane.replayGame(gameId);
 			setActive(gamePane);
-		} catch (PropertyVetoException ex) {}
-    }
+		} catch (PropertyVetoException ex) {
+		}
+	}
 
 	public void showDraft(UUID draftId) {
 		try {
@@ -529,10 +528,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			draftPane.setVisible(true);
 			draftPane.showDraft(draftId);
 			setActive(draftPane);
-		} catch (PropertyVetoException ex) {}
+		} catch (PropertyVetoException ex) {
+		}
 	}
 
- 	public void showTournament(UUID tournamentId) {
+	public void showTournament(UUID tournamentId) {
 		try {
 			TournamentPane tournamentPane = new TournamentPane();
 			desktopPane.add(tournamentPane, JLayeredPane.DEFAULT_LAYER);
@@ -540,7 +540,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			tournamentPane.setVisible(true);
 			tournamentPane.showTournament(tournamentId);
 			setActive(tournamentPane);
-		} catch (PropertyVetoException ex) {}
+		} catch (PropertyVetoException ex) {
+		}
 	}
 
 	public void showTableWaitingDialog(UUID roomId, UUID tableId, boolean isTournament) {
@@ -549,24 +550,24 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		tableWaitingDialog.showDialog(roomId, tableId, isTournament);
 	}
 
-    public static boolean connect(Connection connection) {
-        return session.connect(connection);
-    }
+	public static boolean connect(Connection connection) {
+		return session.connect(connection);
+	}
 
-    public boolean autoConnect() {
-        boolean autoConnect = Boolean.parseBoolean(prefs.get("autoConnect", "false"));
-        if (autoConnect) {
-            String userName = prefs.get("userName", "");
-            String server = prefs.get("serverAddress", "");
-            int port = Integer.parseInt(prefs.get("serverPort", ""));
-            String proxyServer = prefs.get("proxyAddress", "");
-            int proxyPort = Integer.parseInt(prefs.get("proxyPort", ""));
+	public boolean autoConnect() {
+		boolean autoConnect = Boolean.parseBoolean(prefs.get("autoConnect", "false"));
+		if (autoConnect) {
+			String userName = prefs.get("userName", "");
+			String server = prefs.get("serverAddress", "");
+			int port = Integer.parseInt(prefs.get("serverPort", ""));
+			String proxyServer = prefs.get("proxyAddress", "");
+			int proxyPort = Integer.parseInt(prefs.get("proxyPort", ""));
 			ProxyType proxyType = Connection.ProxyType.valueByText(prefs.get("proxyType", "None"));
-	        String proxyUsername = prefs.get("proxyUsername", "");
-	        String proxyPassword = prefs.get("proxyPassword", "");
+			String proxyUsername = prefs.get("proxyUsername", "");
+			String proxyPassword = prefs.get("proxyPassword", "");
 
-            try {
-                setCursor(new Cursor(Cursor.WAIT_CURSOR));
+			try {
+				setCursor(new Cursor(Cursor.WAIT_CURSOR));
 				Connection connection = new Connection();
 				connection.setUsername(userName);
 				connection.setHost(server);
@@ -575,171 +576,171 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 				connection.setProxyHost(proxyServer);
 				connection.setProxyPort(proxyPort);
 				connection.setProxyUsername(proxyUsername);
-	            connection.setProxyPassword(proxyPassword);
+				connection.setProxyPassword(proxyPassword);
 				logger.debug("connecting (auto): " + proxyType + " " + proxyServer + " " + proxyPort + " " + proxyUsername);
-                if (MageFrame.connect(connection)) {
-                    return true;
-                } else {
-                    showMessage("Unable to connect to server");
-                }
-            } finally {
-                setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
-            }
-        }
-        return false;
-    }
+				if (MageFrame.connect(connection)) {
+					return true;
+				} else {
+					showMessage("Unable to connect to server");
+				}
+			} finally {
+				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+			}
+		}
+		return false;
+	}
 
-    /**
-     * This method is called from within the constructor to
-     * initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is
-     * always regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
+	/**
+	 * This method is called from within the constructor to
+	 * initialize the form.
+	 * WARNING: Do NOT modify this code. The content of this method is
+	 * always regenerated by the Form Editor.
+	 */
+	@SuppressWarnings("unchecked")
+	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+	private void initComponents() {
 
-        desktopPane = new MageJDesktop();
-        mageToolbar = new javax.swing.JToolBar();
-        btnConnect = new javax.swing.JButton();
-        jSeparator4 = new javax.swing.JToolBar.Separator();
-        btnGames = new javax.swing.JButton();
-        jSeparator3 = new javax.swing.JToolBar.Separator();
-        btnDeckEditor = new javax.swing.JButton();
-        jSeparator2 = new javax.swing.JToolBar.Separator();
-        btnCollectionViewer = new javax.swing.JButton();
-        jSeparator5 = new javax.swing.JToolBar.Separator();
-        btnPreferences = new javax.swing.JButton();
-        jSeparator6 = new javax.swing.JToolBar.Separator();
-        btnAbout = new javax.swing.JButton();
-        jSeparator1 = new javax.swing.JToolBar.Separator();
-        btnExit = new javax.swing.JButton();
-        lblStatus = new javax.swing.JLabel();
+		desktopPane = new MageJDesktop();
+		mageToolbar = new javax.swing.JToolBar();
+		btnConnect = new javax.swing.JButton();
+		jSeparator4 = new javax.swing.JToolBar.Separator();
+		btnGames = new javax.swing.JButton();
+		jSeparator3 = new javax.swing.JToolBar.Separator();
+		btnDeckEditor = new javax.swing.JButton();
+		jSeparator2 = new javax.swing.JToolBar.Separator();
+		btnCollectionViewer = new javax.swing.JButton();
+		jSeparator5 = new javax.swing.JToolBar.Separator();
+		btnPreferences = new javax.swing.JButton();
+		jSeparator6 = new javax.swing.JToolBar.Separator();
+		btnAbout = new javax.swing.JButton();
+		jSeparator1 = new javax.swing.JToolBar.Separator();
+		btnExit = new javax.swing.JButton();
+		lblStatus = new javax.swing.JLabel();
 
-        setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
-        setMinimumSize(new java.awt.Dimension(1024, 768));
+		setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+		setMinimumSize(new java.awt.Dimension(1024, 768));
 
-        desktopPane.setBackground(new java.awt.Color(204, 204, 204));
+		desktopPane.setBackground(new java.awt.Color(204, 204, 204));
 
-        mageToolbar.setFloatable(false);
-        mageToolbar.setRollover(true);
+		mageToolbar.setFloatable(false);
+		mageToolbar.setRollover(true);
 
-        btnConnect.setText("Connect");
-        btnConnect.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-        btnConnect.setFocusable(false);
-        btnConnect.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnConnect.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnConnect.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnConnectActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnConnect);
-        mageToolbar.add(jSeparator4);
+		btnConnect.setText("Connect");
+		btnConnect.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+		btnConnect.setFocusable(false);
+		btnConnect.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnConnect.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnConnect.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnConnectActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnConnect);
+		mageToolbar.add(jSeparator4);
 
-        btnGames.setText("Games");
-        btnGames.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-        btnGames.setFocusable(false);
-        btnGames.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnGames.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnGames.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnGamesActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnGames);
-        mageToolbar.add(jSeparator3);
+		btnGames.setText("Games");
+		btnGames.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+		btnGames.setFocusable(false);
+		btnGames.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnGames.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnGames.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnGamesActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnGames);
+		mageToolbar.add(jSeparator3);
 
-        btnDeckEditor.setText("Deck Editor");
-        btnDeckEditor.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-        btnDeckEditor.setFocusable(false);
-        btnDeckEditor.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnDeckEditor.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnDeckEditor.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnDeckEditorActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnDeckEditor);
-        mageToolbar.add(jSeparator2);
+		btnDeckEditor.setText("Deck Editor");
+		btnDeckEditor.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+		btnDeckEditor.setFocusable(false);
+		btnDeckEditor.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnDeckEditor.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnDeckEditor.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnDeckEditorActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnDeckEditor);
+		mageToolbar.add(jSeparator2);
 
-        btnCollectionViewer.setText("Collection Viewer");
-        btnCollectionViewer.setFocusable(false);
-        btnCollectionViewer.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnCollectionViewer.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnCollectionViewer.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnCollectionViewerActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnCollectionViewer);
-        mageToolbar.add(jSeparator5);
+		btnCollectionViewer.setText("Collection Viewer");
+		btnCollectionViewer.setFocusable(false);
+		btnCollectionViewer.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnCollectionViewer.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnCollectionViewer.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnCollectionViewerActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnCollectionViewer);
+		mageToolbar.add(jSeparator5);
 
-        btnPreferences.setText("Preferences");
-        btnPreferences.setFocusable(false);
-        btnPreferences.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnPreferences.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnPreferences.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnPreferencesActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnPreferences);
-        mageToolbar.add(jSeparator6);
+		btnPreferences.setText("Preferences");
+		btnPreferences.setFocusable(false);
+		btnPreferences.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnPreferences.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnPreferences.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnPreferencesActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnPreferences);
+		mageToolbar.add(jSeparator6);
 
-        btnAbout.setText("About");
-        btnAbout.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-        btnAbout.setFocusable(false);
-        btnAbout.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnAbout.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnAbout.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnAboutActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnAbout);
-        mageToolbar.add(jSeparator1);
+		btnAbout.setText("About");
+		btnAbout.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+		btnAbout.setFocusable(false);
+		btnAbout.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnAbout.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnAbout.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnAboutActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnAbout);
+		mageToolbar.add(jSeparator1);
 
-        btnExit.setText("Exit");
-        btnExit.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
-        btnExit.setFocusable(false);
-        btnExit.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        btnExit.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        btnExit.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                btnExitActionPerformed(evt);
-            }
-        });
-        mageToolbar.add(btnExit);
+		btnExit.setText("Exit");
+		btnExit.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
+		btnExit.setFocusable(false);
+		btnExit.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+		btnExit.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+		btnExit.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				btnExitActionPerformed(evt);
+			}
+		});
+		mageToolbar.add(btnExit);
 
-        lblStatus.setText("Not connected ");
-        mageToolbar.add(Box.createHorizontalGlue());
-        mageToolbar.add(lblStatus);
+		lblStatus.setText("Not connected ");
+		mageToolbar.add(Box.createHorizontalGlue());
+		mageToolbar.add(lblStatus);
 
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
-        getContentPane().setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(desktopPane, javax.swing.GroupLayout.DEFAULT_SIZE, 1144, Short.MAX_VALUE)
-            .addComponent(mageToolbar, javax.swing.GroupLayout.DEFAULT_SIZE, 1144, Short.MAX_VALUE)
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addComponent(mageToolbar, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 0, 0)
-                .addComponent(desktopPane, javax.swing.GroupLayout.DEFAULT_SIZE, 880, Short.MAX_VALUE))
-        );
+		javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+		getContentPane().setLayout(layout);
+		layout.setHorizontalGroup(
+				layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+						.addComponent(desktopPane, javax.swing.GroupLayout.DEFAULT_SIZE, 1144, Short.MAX_VALUE)
+						.addComponent(mageToolbar, javax.swing.GroupLayout.DEFAULT_SIZE, 1144, Short.MAX_VALUE)
+		);
+		layout.setVerticalGroup(
+				layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+						.addGroup(layout.createSequentialGroup()
+								.addComponent(mageToolbar, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+								.addGap(0, 0, 0)
+								.addComponent(desktopPane, javax.swing.GroupLayout.DEFAULT_SIZE, 880, Short.MAX_VALUE))
+		);
 
-        pack();
-    }// </editor-fold>//GEN-END:initComponents
+		pack();
+	}// </editor-fold>//GEN-END:initComponents
 
-    private void btnDeckEditorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDeckEditorActionPerformed
+	private void btnDeckEditorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnDeckEditorActionPerformed
 		showDeckEditor(DeckEditorMode.Constructed, null, null, 0);
-    }//GEN-LAST:event_btnDeckEditorActionPerformed
+	}//GEN-LAST:event_btnDeckEditorActionPerformed
 
 	private void btnChallengesActionPerformed(java.awt.event.ActionEvent evt) {
-				TableView table;
+		TableView table;
 		try {
 			MatchOptions options = new MatchOptions("1", "Two Player Duel");
 			options.getPlayerTypes().add("Human");
@@ -752,7 +753,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			//TODO: maybe we should have separate room id for quests (so they won't be visible in main tables list)
 			UUID roomId = MageFrame.getSession().getMainRoomId();
 
-			table = session.createTable(roomId,	options);
+			table = session.createTable(roomId, options);
 			session.joinTable(roomId, table.getTableId(), "Human", "Human", 1, Sets.loadDeck("UW Control.dck"));
 			session.joinTable(roomId, table.getTableId(), "Computer", "Computer - default", 1, Sets.loadDeck("UW Control.dck"));
 
@@ -763,32 +764,32 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		}
 	}
 
-    private void btnGamesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGamesActionPerformed
-        this.tablesPane.setVisible(true);
-        this.tablesPane.showTables();
+	private void btnGamesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnGamesActionPerformed
+		this.tablesPane.setVisible(true);
+		this.tablesPane.showTables();
 		setActive(tablesPane);
-    }//GEN-LAST:event_btnGamesActionPerformed
+	}//GEN-LAST:event_btnGamesActionPerformed
 
-    private void btnExitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExitActionPerformed
-        exitApp();
-    }//GEN-LAST:event_btnExitActionPerformed
+	private void btnExitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnExitActionPerformed
+		exitApp();
+	}//GEN-LAST:event_btnExitActionPerformed
 
-    private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnConnectActionPerformed
-        if (session.isConnected()) {
-            if (JOptionPane.showConfirmDialog(this, "Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-                session.disconnect(false);
+	private void btnConnectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnConnectActionPerformed
+		if (session.isConnected()) {
+			if (JOptionPane.showConfirmDialog(this, "Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+				session.disconnect(false);
 				showMessage("You have disconnected");
-            }
-        } else {
-            connectDialog.showDialog();
-        }
-    }//GEN-LAST:event_btnConnectActionPerformed
+			}
+		} else {
+			connectDialog.showDialog();
+		}
+	}//GEN-LAST:event_btnConnectActionPerformed
 
-    private void btnAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAboutActionPerformed
-        AboutDialog aboutDialog = new AboutDialog();
-        desktopPane.add(aboutDialog, JLayeredPane.POPUP_LAYER);
-        aboutDialog.showDialog(version);
-    }//GEN-LAST:event_btnAboutActionPerformed
+	private void btnAboutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnAboutActionPerformed
+		AboutDialog aboutDialog = new AboutDialog();
+		desktopPane.add(aboutDialog, JLayeredPane.POPUP_LAYER);
+		aboutDialog.showDialog(version);
+	}//GEN-LAST:event_btnAboutActionPerformed
 
 	private void btnCollectionViewerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCollectionViewerActionPerformed
 		showCollectionViewer();
@@ -798,31 +799,31 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		PreferencesDialog.main(new String[]{});
 	}//GEN-LAST:event_btnPreferencesActionPerformed
 
-    public void exitApp() {
-        if (session.isConnected()) {
-            if (JOptionPane.showConfirmDialog(this, "You are currently connected.  Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
-                return;
-            }
-            session.disconnect(false);
-        }
-        Plugins.getInstance().shutdown();
-        dispose();
-        System.exit(0);
-    }
+	public void exitApp() {
+		if (session.isConnected()) {
+			if (JOptionPane.showConfirmDialog(this, "You are currently connected.  Are you sure you want to disconnect?", "Confirm disconnect", JOptionPane.YES_NO_OPTION) != JOptionPane.YES_OPTION) {
+				return;
+			}
+			session.disconnect(false);
+		}
+		Plugins.getInstance().shutdown();
+		dispose();
+		System.exit(0);
+	}
 
-    public void enableButtons() {
-        btnConnect.setEnabled(true);
-        btnConnect.setText("Disconnect");
-        btnGames.setEnabled(true);
-        btnDeckEditor.setEnabled(true);
-    }
+	public void enableButtons() {
+		btnConnect.setEnabled(true);
+		btnConnect.setText("Disconnect");
+		btnGames.setEnabled(true);
+		btnDeckEditor.setEnabled(true);
+	}
 
-    public void disableButtons() {
-        btnConnect.setEnabled(true);
-        btnConnect.setText("Connect");
-        btnGames.setEnabled(false);
-        btnDeckEditor.setEnabled(true);
-    }
+	public void disableButtons() {
+		btnConnect.setEnabled(true);
+		btnConnect.setText("Connect");
+		btnGames.setEnabled(false);
+		btnDeckEditor.setEnabled(true);
+	}
 
 	public void hideTables() {
 		this.tablesPane.hideTables();
@@ -830,7 +831,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
 	public void hideGames() {
 		JInternalFrame[] windows = desktopPane.getAllFramesInLayer(JLayeredPane.DEFAULT_LAYER);
-		for (JInternalFrame window: windows) {
+		for (JInternalFrame window : windows) {
 			if (window instanceof GamePane) {
 				GamePane gamePane = (GamePane) window;
 				gamePane.hideGame();
@@ -846,7 +847,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		}
 	}
 
-    public void showDeckEditor(DeckEditorMode mode, Deck deck, UUID tableId, int time) {
+	public void showDeckEditor(DeckEditorMode mode, Deck deck, UUID tableId, int time) {
 		try {
 			DeckEditorPane deckEditorPane = new DeckEditorPane();
 			desktopPane.add(deckEditorPane, JLayeredPane.DEFAULT_LAYER);
@@ -857,13 +858,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 		} catch (PropertyVetoException ex) {
 			logger.fatal(null, ex);
 		}
-    }
+	}
 
-    public void showErrorDialog(final String title, final String message) {
+	public void showErrorDialog(final String title, final String message) {
 		if (SwingUtilities.isEventDispatchThread()) {
 			errorDialog.showDialog(title, message);
-		}
-		else {
+		} else {
 			SwingUtilities.invokeLater(new Runnable() {
 				@Override
 				public void run() {
@@ -871,35 +871,35 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 				}
 			});
 		}
-        
-    }
-    
-    public void showCollectionViewer() {
-        this.collectionViewerPane.setVisible(true);
+
+	}
+
+	public void showCollectionViewer() {
+		this.collectionViewerPane.setVisible(true);
 		setActive(collectionViewerPane);
-    }
+	}
 
-    static void renderSplashFrame(Graphics2D g) {
-        g.setComposite(AlphaComposite.Clear);
-        g.fillRect(120, 140, 200, 40);
-        g.setPaintMode();
-        g.setColor(Color.white);
-        g.drawString("Version 0.6.1", 560, 460);
-    }
+	static void renderSplashFrame(Graphics2D g) {
+		g.setComposite(AlphaComposite.Clear);
+		g.fillRect(120, 140, 200, 40);
+		g.setPaintMode();
+		g.setColor(Color.white);
+		g.drawString("Version 0.6.1", 560, 460);
+	}
 
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(final String args[]) {
+	/**
+	 * @param args the command line arguments
+	 */
+	public static void main(final String args[]) {
 
-        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            public void uncaughtException(Thread t, Throwable e) {
-                logger.fatal(null, e);
-            }
-        });
-        SwingUtilities.invokeLater(new Runnable() {
-            public void run() {
-				for (String arg: args) {
+		Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+			public void uncaughtException(Thread t, Throwable e) {
+				logger.fatal(null, e);
+			}
+		});
+		SwingUtilities.invokeLater(new Runnable() {
+			public void run() {
+				for (String arg : args) {
 					if (arg.startsWith(liteModeArg)) {
 						liteMode = true;
 					}
@@ -917,43 +917,43 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 						splash.update();
 					}
 				}
-                new MageFrame().setVisible(true);
-            }
-        });
-    }
+				new MageFrame().setVisible(true);
+			}
+		});
+	}
 
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JButton btnAbout;
-    private javax.swing.JButton btnCollectionViewer;
-    private javax.swing.JButton btnConnect;
-    private javax.swing.JButton btnDeckEditor;
-    private javax.swing.JButton btnExit;
-    private javax.swing.JButton btnGames;
-    private javax.swing.JButton btnPreferences;
-    private static javax.swing.JDesktopPane desktopPane;
-    private javax.swing.JToolBar.Separator jSeparator1;
-    private javax.swing.JToolBar.Separator jSeparator2;
-    private javax.swing.JToolBar.Separator jSeparator3;
-    private javax.swing.JToolBar.Separator jSeparator4;
-    private javax.swing.JToolBar.Separator jSeparator5;
-    private javax.swing.JToolBar.Separator jSeparator6;
-    private javax.swing.JLabel lblStatus;
-    private javax.swing.JToolBar mageToolbar;
-    // End of variables declaration//GEN-END:variables
+	// Variables declaration - do not modify//GEN-BEGIN:variables
+	private javax.swing.JButton btnAbout;
+	private javax.swing.JButton btnCollectionViewer;
+	private javax.swing.JButton btnConnect;
+	private javax.swing.JButton btnDeckEditor;
+	private javax.swing.JButton btnExit;
+	private javax.swing.JButton btnGames;
+	private javax.swing.JButton btnPreferences;
+	private static javax.swing.JDesktopPane desktopPane;
+	private javax.swing.JToolBar.Separator jSeparator1;
+	private javax.swing.JToolBar.Separator jSeparator2;
+	private javax.swing.JToolBar.Separator jSeparator3;
+	private javax.swing.JToolBar.Separator jSeparator4;
+	private javax.swing.JToolBar.Separator jSeparator5;
+	private javax.swing.JToolBar.Separator jSeparator6;
+	private javax.swing.JLabel lblStatus;
+	private javax.swing.JToolBar mageToolbar;
+	// End of variables declaration//GEN-END:variables
 
-    private static final long serialVersionUID = -9104885239063142218L;
-    private ImagePanel backgroundPane;
+	private static final long serialVersionUID = -9104885239063142218L;
+	private ImagePanel backgroundPane;
 	private TablesPane tablesPane;
 	private CollectionViewerPane collectionViewerPane;
 
-    public void setStatusText(String status) {
-        this.lblStatus.setText(status);
-    }
+	public void setStatusText(String status) {
+		this.lblStatus.setText(status);
+	}
 
 	public static MageUI getUI() {
 		return ui;
 	}
-	
+
 	public static ChatPanel getChat(UUID chatId) {
 		return chats.get(chatId);
 	}
@@ -981,7 +981,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 	public static void addTournament(UUID tournamentId, TournamentPanel tournament) {
 		tournaments.put(tournamentId, tournament);
 	}
-	
+
 	@Override
 	public UUID getId() {
 		return clientId;
@@ -991,9 +991,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 	public void connected(final String message) {
 		if (SwingUtilities.isEventDispatchThread()) {
 			setStatusText(message);
-			enableButtons();			
-		}
-		else {
+			enableButtons();
+		} else {
 			SwingUtilities.invokeLater(new Runnable() {
 				@Override
 				public void run() {
@@ -1011,8 +1010,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			disableButtons();
 			hideGames();
 			hideTables();
-		}
-		else {
+		} else {
 			SwingUtilities.invokeLater(new Runnable() {
 				@Override
 				public void run() {
@@ -1029,8 +1027,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 	public void showMessage(final String message) {
 		if (SwingUtilities.isEventDispatchThread()) {
 			JOptionPane.showMessageDialog(desktopPane, message);
-		}
-		else {
+		} else {
 			SwingUtilities.invokeLater(new Runnable() {
 				@Override
 				public void run() {
@@ -1044,8 +1041,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 	public void showError(final String message) {
 		if (SwingUtilities.isEventDispatchThread()) {
 			JOptionPane.showMessageDialog(desktopPane, message, "Error", JOptionPane.ERROR_MESSAGE);
-		}
-		else {
+		} else {
 			SwingUtilities.invokeLater(new Runnable() {
 				@Override
 				public void run() {
@@ -1054,7 +1050,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 			});
 		}
 	}
-	
+
 	@Override
 	public void processCallback(ClientCallback callback) {
 		callbackClient.processCallback(callback);
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
index e0299eaa07f..3f245ba9bfc 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java
@@ -71,8 +71,8 @@ public class CardPluginImpl implements CardPlugin {
 
     @PluginLoaded
     public void newPlugin(CardPlugin plugin) {
-        ManaSymbols.loadImages();
-        log.info(plugin.toString() + " has been loaded.");
+        //ManaSymbols.loadImages();
+        //log.info(plugin.toString() + " has been loaded.");
     }
 
     @Override