diff --git a/.gitattributes b/.gitattributes
index c346a833ef4..c8415f24485 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11044,6 +11044,7 @@ src/main/java/forge/control/ControlMatchUI.java -text
 src/main/java/forge/control/FControl.java -text
 src/main/java/forge/control/KeyboardShortcuts.java -text
 src/main/java/forge/control/bazaar/ControlStall.java -text
+src/main/java/forge/control/bazaar/package-info.java -text svneol=native#text/plain
 src/main/java/forge/control/home/ControlConstructed.java -text
 src/main/java/forge/control/home/ControlDraft.java -text
 src/main/java/forge/control/home/ControlQuest.java -text
@@ -11218,6 +11219,7 @@ src/main/java/forge/view/Main.java -text
 src/main/java/forge/view/bazaar/BazaarTopLevel.java -text
 src/main/java/forge/view/bazaar/ViewItem.java -text
 src/main/java/forge/view/bazaar/ViewStall.java svneol=native#text/plain
+src/main/java/forge/view/bazaar/package-info.java svneol=native#text/plain
 src/main/java/forge/view/editor/EditorTopLevel.java -text
 src/main/java/forge/view/editor/package-info.java svneol=native#text/plain
 src/main/java/forge/view/home/HomeTopLevel.java -text
diff --git a/pom.xml b/pom.xml
index 8e228b7cafa..ffeb7d0651b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,7 +467,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>2.7</version>
                 </plugin>
 
                 <plugin>
@@ -503,7 +503,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>1.3</version>
+                    <version>1.3.1</version>
                 </plugin>
 
             </plugins>
@@ -627,7 +627,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
                 <configuration>
                     <linkXRef>true</linkXRef>
                     <sourceEncoding>utf-8</sourceEncoding>
@@ -682,7 +682,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>1.3</version>
+                <version>1.3.1</version>
                 <reportSets>
                     <reportSet>
                         <reports>
diff --git a/src/main/java/forge/Constant.java b/src/main/java/forge/Constant.java
index 6f8e3d9d3fe..546a057df68 100644
--- a/src/main/java/forge/Constant.java
+++ b/src/main/java/forge/Constant.java
@@ -50,7 +50,7 @@ public final class Constant {
         public static final Deck[] COMPUTER_DECK = new Deck[1];
 
         /** The skin name. */
-        public static String SKIN_NAME = "default";
+        private static String skinName = "default";
 
         /** The game type. */
         private static GameType gameType = GameType.Constructed;
@@ -104,6 +104,24 @@ public final class Constant {
         public static void setGameType(final GameType gameType0) {
             Runtime.gameType = gameType0;
         }
+
+        /**
+         * Gets the skin name.
+         *
+         * @return the skin name
+         */
+        public static String getSkinName() {
+            return Runtime.skinName;
+        }
+
+        /**
+         * Sets the skin name.
+         *
+         * @param skinName the new skin name
+         */
+        public static void setSkinName(final String skinName) {
+            Runtime.skinName = skinName;
+        }
     }
 
     /**
diff --git a/src/main/java/forge/control/bazaar/package-info.java b/src/main/java/forge/control/bazaar/package-info.java
new file mode 100644
index 00000000000..ddf3248f184
--- /dev/null
+++ b/src/main/java/forge/control/bazaar/package-info.java
@@ -0,0 +1,3 @@
+/** Controller (as in model-view-controller) for Forge. */
+package forge.control.bazaar;
+
diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java
index 3d8a3cfd1b3..6b8caafcabd 100644
--- a/src/main/java/forge/model/FModel.java
+++ b/src/main/java/forge/model/FModel.java
@@ -105,10 +105,10 @@ public class FModel {
         // It's looking like all the settings at the same time, here only.
         // Doublestrike 06-02-12
         Constant.Runtime.DEV_MODE[0] = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
-        Constant.Runtime.SKIN_NAME = preferences.getPref(FPref.UI_SKIN);
+        Constant.Runtime.setSkinName(preferences.getPref(FPref.UI_SKIN));
 
         // Load splash image and preloader swatches for skin
-        FSkin.loadLight(Constant.Runtime.SKIN_NAME);
+        FSkin.loadLight(Constant.Runtime.getSkinName());
 
         // Instantiate AI
         AllZone.setInputControl(new InputControl(FModel.this));
diff --git a/src/main/java/forge/view/bazaar/package-info.java b/src/main/java/forge/view/bazaar/package-info.java
new file mode 100644
index 00000000000..0654bb67d3f
--- /dev/null
+++ b/src/main/java/forge/view/bazaar/package-info.java
@@ -0,0 +1,3 @@
+/** Views (as in model-view-controller) for Forge. */
+package forge.view.bazaar;
+