diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml b/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml
index 527116b3d..66690f4f2 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/WEB-INF/web.xml
@@ -2,4 +2,8 @@
 <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
     <display-name>lotro-web</display-name>
+    <servlet-mapping>
+        <servlet-name>jsp</servlet-name>
+        <url-pattern>*.html</url-pattern>
+    </servlet-mapping>
 </web-app>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/deckBuild.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/deckBuild.css
new file mode 100644
index 000000000..3eff1aec8
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/deckBuild.css
@@ -0,0 +1,75 @@
+body {
+    font-size: 12px;
+}
+
+.borderOverlay {
+    border: 0px solid #000000;
+}
+
+.foilOverlay {
+    opacity: 0.2;
+}
+
+.selectableCard > .borderOverlay {
+    border: 2px solid #00ff00;
+    cursor: pointer;
+}
+
+.selectedCard > .borderOverlay {
+    border: 2px solid #00cccc;
+}
+
+.cardCount {
+    width: 20px;
+    height: 18px;
+    background-color: #000000;
+    color: #ffffff;
+    font-size: 120%;
+    font-weight: bolder;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    opacity: 0.7;
+}
+
+.ui-layout-east {
+    width: 350px;
+}
+
+#manageDecks {
+    color: #ffffff;
+    font-size: 180%;
+}
+
+#editingDeck {
+    vertical-align: top;
+    padding-left: 3px;
+}
+
+#deckStats {
+    color: #ffffff;
+}
+
+.ui-button-text-only .ui-button-text {
+    font-size: 70%;
+}
+
+#set {
+    width: 120px;
+}
+
+#cardType {
+    width: 100px;
+}
+
+#fullFiltering select {
+    font-size: 80%;
+}
+
+#fullFiltering input {
+    font-size: 80%;
+}
+
+#filtering select {
+    font-size: 80%;
+}
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/game.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/game.css
new file mode 100644
index 000000000..e1f663830
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/game.css
@@ -0,0 +1,299 @@
+body {
+    font-size: 12px;
+}
+
+.deckSize {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 42px;
+    height: 42px;
+    background-image: url('images/deck-42.png');
+}
+
+.handSize {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 42px;
+    height: 42px;
+    background-image: url('images/hand-42.png');
+}
+
+.threatsSize {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 42px;
+    height: 42px;
+    background-image: url('images/threats-42.png');
+}
+
+.discardSize {
+    display: none;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 42px;
+    height: 42px;
+    background-image: url('images/discard-42.png');
+}
+
+.deadPileSize {
+    display: none;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 42px;
+    height: 42px;
+    background-image: url('images/deadPile-42.png');
+}
+
+.adventureDeckSize {
+    display: none;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 42px;
+    height: 42px;
+    background-image: url('images/adventureDeck-42.png');
+}
+
+.showStats {
+    display: table-cell;
+}
+
+.borderOverlay {
+    border: solid #000000;
+}
+
+.highlightBorderOverlay {
+    border: solid #ffffff;
+}
+
+.foilOverlay {
+    opacity: 0.2;
+}
+
+.cardHint {
+    display: inline;
+    color: #6f6fff;
+    cursor: pointer;
+}
+
+.cardStrength {
+    text-align: center;
+    font-weight: bolder;
+    color: #ffffff;
+}
+
+.cardVitality {
+    text-align: center;
+    font-weight: bolder;
+    color: #ffffff;
+}
+
+.cardSiteNumber {
+    text-align: center;
+    font-weight: bolder;
+    color: #ffffff;
+}
+
+.cardResistance {
+    text-align: center;
+    font-weight: bolder;
+    color: #ffffff;
+}
+
+.selectableCard > .borderOverlay {
+    border-color: #7faf7f;
+    cursor: pointer;
+}
+
+.actionableCard > .borderOverlay {
+    border-color: #7f7fff;
+    cursor: pointer;
+}
+
+.selectedCard > .borderOverlay {
+    border-color: #009f9f;
+}
+
+.stats {
+    text-align: center;
+    padding: 2px;
+}
+
+.fpArchery {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    background-image: url('images/fpArchery.png');
+    background-repeat: no-repeat;
+    color: #007777;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 30px;
+    height: 30px;
+}
+
+.shadowArchery {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    background-image: url('images/shadowArchery.png');
+    background-repeat: no-repeat;
+    color: #007777;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 30px;
+    height: 30px;
+}
+
+.move {
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    background-image: url('images/move.png');
+    background-repeat: no-repeat;
+    color: #007777;
+    font-size: 200%;
+    font-weight: bolder;
+    width: 30px;
+    height: 30px;
+}
+
+.player {
+    color: #ffffff;
+    position: relative;
+    z-index: 50;
+}
+
+.player.current {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+.playerStats {
+    color: #ffffff;
+}
+
+.playerStats .clickable {
+    color: #9f9fff;
+    cursor: pointer;
+}
+
+.phase {
+    color: #ffffff;
+    font-size: 120%;
+}
+
+.twilightPool {
+    float: right;
+    font-size: 30px;
+    width: 40px;
+    border-radius: 7px;
+    border: 1px solid #ffffff;
+    background-color: #000000;
+    color: #ffffff;
+    padding: 2px;
+    text-align: right;
+}
+
+.skirmish {
+}
+
+.fpDamageBonus, .shadowDamageBonus {
+    border-radius: 6px;
+    text-align: center;
+    vertical-align: middle;
+    background-color: #cccccc;
+    opacity: 0.7;
+    color: #000000;
+    font-size: 180%;
+}
+
+.fpStrength, .shadowStrength {
+    border-radius: 6px;
+    text-align: center;
+    vertical-align: middle;
+    background-color: #ffffff;
+    opacity: 0.7;
+    color: #000000;
+    font-size: 300%;
+}
+
+.fpStrength.overwhelmed {
+    border-radius: 6px;
+    text-align: center;
+    vertical-align: middle;
+    background-color: #ff3333;
+    opacity: 0.7;
+    color: #000000;
+    font-size: 300%;
+}
+
+#chatBox {
+    font-size: 90%;
+}
+
+.chatMessage {
+    color: #3fafff;
+}
+
+.systemMessage {
+    color: #5f5f5f;
+    font-size: 80%;
+}
+
+.gameMessage {
+    padding-top: 2px;
+    font-size: 80%;
+}
+
+.warningMessage {
+    color: #ff0000;
+}
+
+.ui-tabs-nav li {
+    font-size: 70%;
+}
+
+#settingsBox label {
+    font-size: 70%;
+}
+
+.clock {
+    float: right;
+    font-size: 100%;
+}
+
+.alertButtons .ui-button-text-only .ui-button-text {
+    font-size: 70%;
+    padding: .2em .5em;
+}
+
+.ui-button-text-only.slimButton .ui-button-text {
+    font-size: 70%;
+    padding: .2em .5em;
+}
+
+.ui-tabs .ui-tabs-panel.slimPanel {
+    padding: 4px;
+}
+
+.ui-tabs .ui-tabs-nav li a.slimTab {
+    padding-left: 3px;
+    padding-right: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+}
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css
new file mode 100644
index 000000000..c90639e43
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/hall.css
@@ -0,0 +1,160 @@
+body {
+    font-size: 12px;
+    background-color: #000000;
+}
+
+.eventHeader {
+    font-size: 120%;
+    font-weight: bolder;
+    background-color: #666666;
+}
+
+.leagueName, #stats .period, .tournamentName, .playerStatHeader {
+    font-size: 200%;
+    font-weight: bolder;
+}
+
+.serieName {
+    font-size: 150%;
+    font-weight: bolder;
+}
+
+.borderOverlay {
+    border: 2px solid #000000;
+}
+
+.foilOverlay {
+    opacity: 0.2;
+}
+
+.cardHint {
+    display: inline;
+    color: #6f6fff;
+    cursor: pointer;
+}
+
+.clickableFormat {
+    cursor: pointer;
+    color: #6f6fff;
+}
+
+.pocket {
+    background-color: #000000;
+    border: 1px solid #ffffff;
+    color: #ffffff;
+    font-size: 90%;
+    font-weight: bolder;
+    text-align: right;
+    opacity: 1;
+}
+
+.cardCount {
+    width: 20px;
+    height: 18px;
+    background-color: #000000;
+    color: #ffffff;
+    font-size: 120%;
+    font-weight: bolder;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    opacity: 0.7;
+}
+
+.tableFormatName {
+    text-align: center;
+    font-weight: bold;
+    font-size: 100%;
+}
+
+.tableStatus {
+    text-align: center;
+    font-style: italic;
+    font-size: 100%;
+}
+
+.tablePlayer {
+    text-align: center;
+}
+
+.winningPlayer {
+    font-weight: bold;
+    font-size: 110%;
+}
+
+.losingPlayer {
+    font-size: 80%;
+}
+
+.chatMessage {
+    color: #ffffff;
+}
+
+.systemMessage {
+    color: #5f5f5f;
+}
+
+.warningMessage {
+    color: #ff0000;
+}
+
+.chatUser {
+    color: #ffffff;
+}
+
+.systemMessage > .timestamp {
+    display: inline;
+    color: #5f5f5f;
+}
+
+.timestamp {
+    display: inline;
+    color: #cfcfcf;
+}
+
+#disclaimer {
+    color: #ffffff;
+    font-size: 80%;
+}
+
+#latestNews {
+    color: #ffffff;
+    font-size: 90%;
+}
+
+#motd {
+    color: #ffffff;
+    font-size: 90%;
+}
+
+table.tables {
+    width: 100%;
+}
+
+table.tables td, table.tables th {
+    padding: 2px;
+    border: 1px solid white;
+}
+
+.ui-tabs-nav li {
+    font-size: 70%;
+}
+
+.ui-button-text-only .ui-button-text {
+    font-size: 70%;
+    padding: .2em .5em;
+}
+
+.standings td, .standings th {
+    padding: 2px;
+    border: 1px solid white;
+}
+
+.gameHistory td, .gameHistory th {
+    padding: 2px;
+    border: 1px solid white;
+}
+
+.userList {
+    border-left: 1px solid #FFFFFF;
+}
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/merchant.css b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/merchant.css
new file mode 100644
index 000000000..d25847c16
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/css/gemp-001/merchant.css
@@ -0,0 +1,75 @@
+body {
+    font-size: 12px;
+}
+
+.borderOverlay {
+    border: 0px solid #000000;
+}
+
+.foilOverlay {
+    opacity: 0.2;
+}
+
+.buyPrice.ui-state-disabled, .sellPrice.ui-state-disabled, .tradeFoil {
+    opacity: 0.6;
+}
+
+.owned {
+    background-color: #000000;
+    border: 1px solid #ffffff;
+    color: #ffffff;
+    font-size: 220%;
+    font-weight: bolder;
+    display: table-cell;
+    text-align: center;
+    vertical-align: middle;
+    opacity: 0.7;
+}
+
+.pocket {
+    background-color: #000000;
+    border: 1px solid #ffffff;
+    color: #ffffff;
+    font-size: 100%;
+    font-weight: bolder;
+    text-align: right;
+    opacity: 1;
+}
+
+.hideMerchant {
+    color: #ffffff;
+    text-align: right;
+}
+
+.countDiv {
+    color: #ffffff;
+    text-align: right;
+}
+
+.buyPrice, .sellPrice, .tradeFoil {
+    opacity: 0.9;
+}
+
+.ui-button-text-only .ui-button-text {
+    font-size: 70%;
+}
+
+#set {
+    width: 120px;
+}
+
+#cardType {
+    width: 100px;
+}
+
+#fullFiltering select {
+    font-size: 100%;
+}
+
+#fullFiltering input {
+    font-size: 100%;
+}
+
+#filtering select {
+    font-size: 100%;
+}
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
index 72100ba4f..7c71af804 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
@@ -1,136 +1,21 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+response.setHeader("Cache-Control","no-cache");
+response.setHeader("Pragma","no-cache");
+response.setDateHeader ("Expires", -1);
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title>Gemp-LotR</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <meta http-equiv="Expires" content="-1">
 
-    <style type="text/css">
-        body {
-            font-size: 12px;
-        }
+    <link rel="stylesheet" type="text/css" href="css/gemp-001/deckBuild.css">
 
-        .borderOverlay {
-            border: 0px solid #000000;
-        }
-
-        .foilOverlay {
-            opacity: 0.2;
-        }
-
-        .selectableCard > .borderOverlay {
-            border: 2px solid #00ff00;
-            cursor: pointer;
-        }
-
-        .selectedCard > .borderOverlay {
-            border: 2px solid #00cccc;
-        }
-
-        .cardCount {
-            width: 20px;
-            height: 18px;
-            background-color: #000000;
-            color: #ffffff;
-            font-size: 120%;
-            font-weight: bolder;
-            display: table-cell;
-            text-align: center;
-            vertical-align: middle;
-            opacity: 0.7;
-        }
-
-        .ui-layout-east {
-            width: 350px;
-        }
-
-        #manageDecks {
-            color: #ffffff;
-            font-size: 180%;
-        }
-
-        #editingDeck {
-            vertical-align: top;
-            padding-left: 3px;
-        }
-
-        #deckStats {
-            color: #ffffff;
-        }
-
-        .ui-button-text-only .ui-button-text {
-            font-size: 70%;
-        }
-
-        #set {
-            width: 120px;
-        }
-
-        #cardType {
-            width: 100px;
-        }
-
-        #fullFiltering select {
-            font-size: 80%;
-        }
-
-        #fullFiltering input {
-            font-size: 80%;
-        }
-
-        #filtering select {
-            font-size: 80%;
-        }
-
-    </style>
-    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
-
-    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
-
-    <script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-013/common.js"></script>
-    <script type="text/javascript" src="js/gemp-013/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-013/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-013/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-013/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-013/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-013/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-013/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-013/cardFilter.js"></script>
+    <%@ include file="js.inc" %>
 
     <script type="text/javascript">
 
-        // TODO: delete - Only for debugging
-        function getUrlParam(param) {
-            var search = window.location.search.substring(1);
-            if (search.indexOf('&') > -1) {
-                var params = search.split('&');
-                for (var i = 0; i < params.length; i++) {
-                    var key_value = params[i].split('=');
-                    if (key_value[0] == param) return key_value[1];
-                }
-            } else {
-                var params = search.split('=');
-                if (params[0] == param) return params[1];
-            }
-            return null;
-        }
-
-        function getMapSize(map) {
-            var size = 0, key;
-            for (key in map)
-                if (map.hasOwnProperty(key)) size++;
-            return size;
-        }
-
         $(document).ready(
                 function () {
                     var ui = new GempLotrDeckBuildingUI();
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
index df6459c80..69be45247 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html
@@ -78,29 +78,6 @@
 
     <script type="text/javascript">
 
-        // TODO: delete - Only for debugging
-        function getUrlParam(param) {
-            var search = window.location.search.substring(1);
-            if (search.indexOf('&') > -1) {
-                var params = search.split('&');
-                for (var i = 0; i < params.length; i++) {
-                    var key_value = params[i].split('=');
-                    if (key_value[0] == param) return key_value[1];
-                }
-            } else {
-                var params = search.split('=');
-                if (params[0] == param) return params[1];
-            }
-            return null;
-        }
-
-        function getMapSize(map) {
-            var size = 0, key;
-            for (key in map)
-                if (map.hasOwnProperty(key)) size++;
-            return size;
-        }
-
         $(document).ready(
                 function () {
                     var ui = new GempLotrDeckBuildingUI2(
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
index 23b8f9ef0..0e9c8074f 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
@@ -1,363 +1,23 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+response.setHeader("Cache-Control","no-cache");
+response.setHeader("Pragma","no-cache");
+response.setDateHeader ("Expires", -1);
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Game of Gemp-LotR</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta http-equiv="pragma" content="no-cache"/>
-<meta http-equiv="Cache-Control" content="no-cache"/>
-<meta http-equiv="Expires" content="-1">
 
-<style type="text/css">
-body {
-    font-size: 12px;
-}
+    <link rel="stylesheet" type="text/css" href="css/gemp-001/game.css">
 
-.deckSize {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 42px;
-    height: 42px;
-    background-image: url('images/deck-42.png');
-}
-
-.handSize {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 42px;
-    height: 42px;
-    background-image: url('images/hand-42.png');
-}
-
-.threatsSize {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 42px;
-    height: 42px;
-    background-image: url('images/threats-42.png');
-}
-
-.discardSize {
-    display: none;
-    text-align: center;
-    vertical-align: middle;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 42px;
-    height: 42px;
-    background-image: url('images/discard-42.png');
-}
-
-.deadPileSize {
-    display: none;
-    text-align: center;
-    vertical-align: middle;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 42px;
-    height: 42px;
-    background-image: url('images/deadPile-42.png');
-}
-
-.adventureDeckSize {
-    display: none;
-    text-align: center;
-    vertical-align: middle;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 42px;
-    height: 42px;
-    background-image: url('images/adventureDeck-42.png');
-}
-
-.showStats {
-    display: table-cell;
-}
-
-.borderOverlay {
-    border: solid #000000;
-}
-
-.highlightBorderOverlay {
-    border: solid #ffffff;
-}
-
-.foilOverlay {
-    opacity: 0.2;
-}
-
-.cardHint {
-    display: inline;
-    color: #6f6fff;
-    cursor: pointer;
-}
-
-.cardStrength {
-    text-align: center;
-    font-weight: bolder;
-    color: #ffffff;
-}
-
-.cardVitality {
-    text-align: center;
-    font-weight: bolder;
-    color: #ffffff;
-}
-
-.cardSiteNumber {
-    text-align: center;
-    font-weight: bolder;
-    color: #ffffff;
-}
-
-.cardResistance {
-    text-align: center;
-    font-weight: bolder;
-    color: #ffffff;
-}
-
-.selectableCard > .borderOverlay {
-    border-color: #7faf7f;
-    cursor: pointer;
-}
-
-.actionableCard > .borderOverlay {
-    border-color: #7f7fff;
-    cursor: pointer;
-}
-
-.selectedCard > .borderOverlay {
-    border-color: #009f9f;
-}
-
-.stats {
-    text-align: center;
-    padding: 2px;
-}
-
-.fpArchery {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    background-image: url('images/fpArchery.png');
-    background-repeat: no-repeat;
-    color: #007777;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 30px;
-    height: 30px;
-}
-
-.shadowArchery {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    background-image: url('images/shadowArchery.png');
-    background-repeat: no-repeat;
-    color: #007777;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 30px;
-    height: 30px;
-}
-
-.move {
-    display: table-cell;
-    text-align: center;
-    vertical-align: middle;
-    background-image: url('images/move.png');
-    background-repeat: no-repeat;
-    color: #007777;
-    font-size: 200%;
-    font-weight: bolder;
-    width: 30px;
-    height: 30px;
-}
-
-.player {
-    color: #ffffff;
-    position: relative;
-    z-index: 50;
-}
-
-.player.current {
-    background-color: #ffffff;
-    color: #000000;
-}
-
-.playerStats {
-    color: #ffffff;
-}
-
-.playerStats .clickable {
-    color: #9f9fff;
-    cursor: pointer;
-}
-
-.phase {
-    color: #ffffff;
-    font-size: 120%;
-}
-
-.twilightPool {
-    float: right;
-    font-size: 30px;
-    width: 40px;
-    border-radius: 7px;
-    border: 1px solid #ffffff;
-    background-color: #000000;
-    color: #ffffff;
-    padding: 2px;
-    text-align: right;
-}
-
-.skirmish {
-}
-
-.fpDamageBonus, .shadowDamageBonus {
-    border-radius: 6px;
-    text-align: center;
-    vertical-align: middle;
-    background-color: #cccccc;
-    opacity: 0.7;
-    color: #000000;
-    font-size: 180%;
-}
-
-.fpStrength, .shadowStrength {
-    border-radius: 6px;
-    text-align: center;
-    vertical-align: middle;
-    background-color: #ffffff;
-    opacity: 0.7;
-    color: #000000;
-    font-size: 300%;
-}
-
-.fpStrength.overwhelmed {
-    border-radius: 6px;
-    text-align: center;
-    vertical-align: middle;
-    background-color: #ff3333;
-    opacity: 0.7;
-    color: #000000;
-    font-size: 300%;
-}
-
-#chatBox {
-    font-size: 90%;
-}
-
-.chatMessage {
-    color: #3fafff;
-}
-
-.systemMessage {
-    color: #5f5f5f;
-    font-size: 80%;
-}
-
-.gameMessage {
-    padding-top: 2px;
-    font-size: 80%;
-}
-
-.warningMessage {
-    color: #ff0000;
-}
-
-.ui-tabs-nav li {
-    font-size: 70%;
-}
-
-#settingsBox label {
-    font-size: 70%;
-}
-
-.clock {
-    float: right;
-    font-size: 100%;
-}
-
-.alertButtons .ui-button-text-only .ui-button-text {
-    font-size: 70%;
-    padding: .2em .5em;
-}
-
-.ui-button-text-only.slimButton .ui-button-text {
-    font-size: 70%;
-    padding: .2em .5em;
-}
-
-.ui-tabs .ui-tabs-panel.slimPanel {
-    padding: 4px;
-}
-
-.ui-tabs .ui-tabs-nav li a.slimTab {
-    padding-left: 3px;
-    padding-right: 3px;
-    padding-top: 2px;
-    padding-bottom: 2px;
-}
-
-</style>
-<link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-<link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
-<link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
-
-<script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
-<script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
-<script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
-<script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
-<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
-
-<script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-013/communication.js"></script>
-<script type="text/javascript" src="js/gemp-013/common.js"></script>
-<script type="text/javascript" src="js/gemp-013/chat.js"></script>
-<script type="text/javascript" src="js/gemp-013/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-013/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-013/jCards.js"></script>
-<script type="text/javascript" src="js/gemp-013/logging.js"></script>
+<%@ include file="js.inc" %>
 
 <script type="text/javascript">
     var ui;
     var communication;
 
-    // TODO: delete - Only for debugging
-    function getUrlParam(param) {
-        var search = window.location.search.substring(1);
-        if (search.indexOf('&') > -1) {
-            var params = search.split('&');
-            for (var i = 0; i < params.length; i++) {
-                var key_value = params[i].split('=');
-                if (key_value[0] == param) return key_value[1];
-            }
-        } else {
-            var params = search.split('=');
-            if (params[0] == param) return params[1];
-        }
-        return null;
-    }
-
-    function getMapSize(map) {
-        var size = 0, key;
-        for (key in map)
-            if (map.hasOwnProperty(key)) size++;
-        return size;
-    }
-
     $(document).ready(
             function () {
                 var replay = getUrlParam("replayId");
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
index e2bd36b32..0f1db7649 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
@@ -1,218 +1,23 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+response.setHeader("Cache-Control","no-cache");
+response.setHeader("Pragma","no-cache");
+response.setDateHeader ("Expires", -1);
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Gemp-LotR</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta http-equiv="pragma" content="no-cache"/>
-<meta http-equiv="Cache-Control" content="no-cache"/>
-<meta http-equiv="Expires" content="-1">
 
-<style type="text/css">
-    body {
-        font-size: 12px;
-        background-color: #000000;
-    }
+    <link rel="stylesheet" type="text/css" href="css/gemp-001/hall.css">
 
-    .eventHeader {
-        font-size: 120%;
-        font-weight: bolder;
-        background-color: #666666;
-    }
-
-    .leagueName, #stats .period, .tournamentName, .playerStatHeader {
-        font-size: 200%;
-        font-weight: bolder;
-    }
-
-    .serieName {
-        font-size: 150%;
-        font-weight: bolder;
-    }
-
-    .borderOverlay {
-        border: 2px solid #000000;
-    }
-
-    .foilOverlay {
-        opacity: 0.2;
-    }
-
-    .cardHint {
-        display: inline;
-        color: #6f6fff;
-        cursor: pointer;
-    }
-
-    .clickableFormat {
-        cursor: pointer;
-        color: #6f6fff;
-    }
-
-    .pocket {
-        background-color: #000000;
-        border: 1px solid #ffffff;
-        color: #ffffff;
-        font-size: 90%;
-        font-weight: bolder;
-        text-align: right;
-        opacity: 1;
-    }
-
-    .cardCount {
-        width: 20px;
-        height: 18px;
-        background-color: #000000;
-        color: #ffffff;
-        font-size: 120%;
-        font-weight: bolder;
-        display: table-cell;
-        text-align: center;
-        vertical-align: middle;
-        opacity: 0.7;
-    }
-
-    .tableFormatName {
-        text-align: center;
-        font-weight: bold;
-        font-size: 100%;
-    }
-
-    .tableStatus {
-        text-align: center;
-        font-style: italic;
-        font-size: 100%;
-    }
-
-    .tablePlayer {
-        text-align: center;
-    }
-
-    .winningPlayer {
-        font-weight: bold;
-        font-size: 110%;
-    }
-
-    .losingPlayer {
-        font-size: 80%;
-    }
-
-    .chatMessage {
-        color: #ffffff;
-    }
-
-    .systemMessage {
-        color: #5f5f5f;
-    }
-
-    .warningMessage {
-        color: #ff0000;
-    }
-
-    .chatUser {
-        color: #ffffff;
-    }
-
-    .systemMessage > .timestamp {
-        display: inline;
-        color: #5f5f5f;
-    }
-
-    .timestamp {
-        display: inline;
-        color: #cfcfcf;
-    }
-
-    #disclaimer {
-        color: #ffffff;
-        font-size: 80%;
-    }
-
-    #latestNews {
-        color: #ffffff;
-        font-size: 90%;
-    }
-
-    #motd {
-        color: #ffffff;
-        font-size: 90%;
-    }
-
-    table.tables {
-        width: 100%;
-    }
-
-    table.tables td, table.tables th {
-        padding: 2px;
-        border: 1px solid white;
-    }
-
-    .ui-tabs-nav li {
-        font-size: 70%;
-    }
-
-    .ui-button-text-only .ui-button-text {
-        font-size: 70%;
-        padding: .2em .5em;
-    }
-
-    .standings td, .standings th {
-        padding: 2px;
-        border: 1px solid white;
-    }
-
-    .gameHistory td, .gameHistory th {
-        padding: 2px;
-        border: 1px solid white;
-    }
-
-    .userList {
-        border-left: 1px solid #FFFFFF;
-    }
-
-</style>
-<link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-<link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
-
-<script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
-<script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
-
-<script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-013/common.js"></script>
-<script type="text/javascript" src="js/gemp-013/logging.js"></script>
-<script type="text/javascript" src="js/gemp-013/chat.js"></script>
-<script type="text/javascript" src="js/gemp-013/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-013/communication.js"></script>
-<!-- This is needed for delivery -->
-<script type="text/javascript" src="js/gemp-013/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-013/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-013/jCards.js"></script>
+<%@ include file="js.inc" %>
 
 <script type="text/javascript">
     var chat;
     var hall;
 
-    function getUrlParam(param) {
-        var search = window.location.search.substring(1);
-        if (search.indexOf('&') > -1) {
-            var params = search.split('&');
-            for (var i = 0; i < params.length; i++) {
-                var key_value = params[i].split('=');
-                if (key_value[0] == param) return key_value[1];
-            }
-        } else {
-            var params = search.split('=');
-            if (params[0] == param) return params[1];
-        }
-        return null;
-    }
-
     $(document).ready(
             function () {
                 $("#latestNews").append("<b>All sets are available to play.</b> "
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
index 268d8518c..162649593 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
@@ -1,12 +1,14 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+response.setHeader("Cache-Control","no-cache");
+response.setHeader("Pragma","no-cache");
+response.setDateHeader ("Expires", -1);
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title>Gemp-LotR</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <meta http-equiv="Expires" content="-1">
 
     <style type="text/css">
         body {
@@ -18,31 +20,10 @@
             padding: .2em .5em;
         }
     </style>
-    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-
-    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
-
-    <script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-013/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-013/communication.js"></script>
 
+    <%@ include file="js.inc" %>
+    
     <script type="text/javascript">
-        function getUrlParam(param) {
-            var search = window.location.search.substring(1);
-            if (search.indexOf('&') > -1) {
-                var params = search.split('&');
-                for (var i = 0; i < params.length; i++) {
-                    var key_value = params[i].split('=');
-                    if (key_value[0] == param) return key_value[1];
-                }
-            } else {
-                var params = search.split('=');
-                if (params[0] == param) return params[1];
-            }
-            return null;
-        }
-
         jQuery.fn.center = function () {
             this.css("position", "absolute");
             this.css("top", (($(window).height() - this.outerHeight()) / 2) + $(window).scrollTop() + "px");
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js.inc b/gemp-lotr/gemp-lotr-web/src/main/webapp/js.inc
new file mode 100644
index 000000000..4bbd875f5
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js.inc
@@ -0,0 +1,33 @@
+<link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
+<link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
+<link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+
+<script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
+<script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
+
+<script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-013/common.js"></script>
+<script type="text/javascript" src="js/gemp-013/logging.js"></script>
+<script type="text/javascript" src="js/gemp-013/chat.js"></script>
+<script type="text/javascript" src="js/gemp-013/communication.js"></script>
+<script type="text/javascript" src="js/gemp-013/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-013/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/cardFilter.js"></script>
+
+<script type="text/javascript" src="js/gemp-013/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-013/jCards.js"></script>
+
+<script type="text/javascript" src="js/gemp-013/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/tournamentResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/statsUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/playerStatsUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/deckBuildingUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-013/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-013/merchantUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-013/common.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-013/common.js
index ab5e4b3e9..23945b085 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-013/common.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-013/common.js
@@ -27,3 +27,25 @@ function iterObj(obj, func) {
         }
     }
 }
+
+function getUrlParam(param) {
+    var search = window.location.search.substring(1);
+    if (search.indexOf('&') > -1) {
+        var params = search.split('&');
+        for (var i = 0; i < params.length; i++) {
+            var key_value = params[i].split('=');
+            if (key_value[0] == param) return key_value[1];
+        }
+    } else {
+        var params = search.split('=');
+        if (params[0] == param) return params[1];
+    }
+    return null;
+}
+
+function getMapSize(map) {
+    var size = 0, key;
+    for (key in map)
+        if (map.hasOwnProperty(key)) size++;
+    return size;
+}
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
index 8fe9ff284..15c98b47b 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
@@ -1,10 +1,12 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+response.setHeader("Cache-Control","no-cache");
+response.setHeader("Pragma","no-cache");
+response.setDateHeader ("Expires", -1);
+%>
 <html>
 <head>
     <title>Gemp-LotR League Administration</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <meta http-equiv="Expires" content="-1">
 
     <style type="text/css">
         body {
@@ -24,24 +26,8 @@
         }
     </style>
 
-    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-    <link rel="stylesheet" type="text/css" href="css/jquery.contextMenu.css">
-    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
+    <%@ include file="js.inc" %>
 
-    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
-
-    <script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-013/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-013/common.js"></script>
-    <script type="text/javascript" src="js/gemp-013/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-013/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-013/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-013/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-013/logging.js"></script>
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
             var data = {};
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
index db12c0189..f28e9f98b 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
@@ -1,136 +1,21 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%
+response.setHeader("Cache-Control","no-cache");
+response.setHeader("Pragma","no-cache");
+response.setDateHeader ("Expires", -1);
+%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title>Gemp-LotR</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <meta http-equiv="Expires" content="-1">
 
-    <style type="text/css">
-        body {
-            font-size: 12px;
-        }
+    <link rel="stylesheet" type="text/css" href="css/gemp-001/merchant.css">
 
-        .borderOverlay {
-            border: 0px solid #000000;
-        }
-
-        .foilOverlay {
-            opacity: 0.2;
-        }
-
-        .buyPrice.ui-state-disabled, .sellPrice.ui-state-disabled, .tradeFoil {
-            opacity: 0.6;
-        }
-
-        .owned {
-            background-color: #000000;
-            border: 1px solid #ffffff;
-            color: #ffffff;
-            font-size: 220%;
-            font-weight: bolder;
-            display: table-cell;
-            text-align: center;
-            vertical-align: middle;
-            opacity: 0.7;
-        }
-
-        .pocket {
-            background-color: #000000;
-            border: 1px solid #ffffff;
-            color: #ffffff;
-            font-size: 100%;
-            font-weight: bolder;
-            text-align: right;
-            opacity: 1;
-        }
-
-        .hideMerchant {
-            color: #ffffff;
-            text-align: right;
-        }
-
-        .countDiv {
-            color: #ffffff;
-            text-align: right;
-        }
-
-        .buyPrice, .sellPrice, .tradeFoil {
-            opacity: 0.9;
-        }
-
-        .ui-button-text-only .ui-button-text {
-            font-size: 70%;
-        }
-
-        #set {
-            width: 120px;
-        }
-
-        #cardType {
-            width: 100px;
-        }
-
-        #fullFiltering select {
-            font-size: 100%;
-        }
-
-        #fullFiltering input {
-            font-size: 100%;
-        }
-
-        #filtering select {
-            font-size: 100%;
-        }
-
-    </style>
-    <link rel="stylesheet" type="text/css" href="css/dark-hive/jquery-ui-1.8.16.custom.css">
-    <link rel="stylesheet" type="text/css" href="js/jquery/styles/jquery.spinnercontrol.css">
-
-    <script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
-
-    <script type="text/javascript" src="js/gemp-013/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-013/common.js"></script>
-    <script type="text/javascript" src="js/gemp-013/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-013/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-013/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-013/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-013/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-013/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-013/merchantUi.js"></script>
-    <script type="text/javascript" src="js/gemp-013/cardFilter.js"></script>
+    <%@ include file="js.inc" %>
 
     <script type="text/javascript">
 
-        // TODO: delete - Only for debugging
-        function getUrlParam(param) {
-            var search = window.location.search.substring(1);
-            if (search.indexOf('&') > -1) {
-                var params = search.split('&');
-                for (var i = 0; i < params.length; i++) {
-                    var key_value = params[i].split('=');
-                    if (key_value[0] == param) return key_value[1];
-                }
-            } else {
-                var params = search.split('=');
-                if (params[0] == param) return params[1];
-            }
-            return null;
-        }
-
-        function getMapSize(map) {
-            var size = 0, key;
-            for (key in map)
-                if (map.hasOwnProperty(key)) size++;
-            return size;
-        }
-
         $(document).ready(
                 function () {
                     var ui = new GempLotrMerchantUI($("#cardList"), $("#cardFilter"));