diff --git a/core/pom.xml b/core/pom.xml
index 9b4349b420..68f5273346 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,7 +41,7 @@
                     <minimizeJar>false</minimizeJar>
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <mainClass>io.bitsquare.app.gui.BitsquareAppMain</mainClass>
+                            <mainClass>io.bitsquare.app.BitsquareAppMain</mainClass>
                         </transformer>
                     </transformers>
                     <filters>
diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/core/src/main/java/io/bitsquare/app/BitsquareApp.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
rename to core/src/main/java/io/bitsquare/app/BitsquareApp.java
index b8776c7194..be2ee08d90 100644
--- a/core/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareApp.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app.gui;
+package io.bitsquare.app;
 
-import io.bitsquare.account.AccountSettings;
+import io.bitsquare.user.AccountSettings;
 import io.bitsquare.gui.SystemTray;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.MainView;
@@ -26,10 +26,10 @@ import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
 
 import com.google.common.base.Throwables;
 
diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
similarity index 98%
rename from core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
rename to core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
index 091f039838..5f79d1c83d 100644
--- a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareAppMain.java
@@ -15,11 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app.gui;
+package io.bitsquare.app;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.app.BitsquareEnvironment;
-import io.bitsquare.app.BitsquareExecutable;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java b/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
similarity index 93%
rename from core/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java
rename to core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
index b4b68d8c58..d4c8a6d16c 100644
--- a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppModule.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareAppModule.java
@@ -15,12 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app.gui;
+package io.bitsquare.app;
 
 import io.bitsquare.BitsquareModule;
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.arbitrator.ArbitratorMessageModule;
-import io.bitsquare.arbitrator.tomp2p.TomP2PArbitratorMessageModule;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.arbitration.ArbitratorMessageModule;
+import io.bitsquare.arbitration.tomp2p.TomP2PArbitratorMessageModule;
 import io.bitsquare.btc.BitcoinModule;
 import io.bitsquare.crypto.CryptoModule;
 import io.bitsquare.gui.GuiModule;
@@ -29,7 +29,7 @@ import io.bitsquare.network.tomp2p.TomP2PNetworkModule;
 import io.bitsquare.offer.OfferModule;
 import io.bitsquare.offer.tomp2p.TomP2POfferModule;
 import io.bitsquare.persistence.Persistence;
-import io.bitsquare.settings.Preferences;
+import io.bitsquare.user.Preferences;
 import io.bitsquare.trade.TradeMessageModule;
 import io.bitsquare.trade.tomp2p.TomP2PTradeMessageModule;
 import io.bitsquare.user.User;
diff --git a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
index 1b25bc4d26..8357dbd4bf 100644
--- a/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
+++ b/core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
@@ -18,7 +18,6 @@
 package io.bitsquare.app;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.app.gui.BitsquareAppMain;
 import io.bitsquare.btc.UserAgent;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.main.MainView;
diff --git a/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java b/core/src/main/java/io/bitsquare/app/UpdateProcess.java
similarity index 98%
rename from core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
rename to core/src/main/java/io/bitsquare/app/UpdateProcess.java
index 2b6c2c4da0..3ba56438b6 100644
--- a/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
+++ b/core/src/main/java/io/bitsquare/app/UpdateProcess.java
@@ -15,9 +15,8 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.app.gui;
+package io.bitsquare.app;
 
-import io.bitsquare.app.BitsquareEnvironment;
 import io.bitsquare.util.Utilities;
 
 import com.google.inject.Inject;
diff --git a/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java b/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
similarity index 99%
rename from core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
rename to core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
index 2847aa107f..828c271af4 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/Arbitrator.java
+++ b/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator;
+package io.bitsquare.arbitration;
 
 import org.bitcoinj.core.Coin;
 
diff --git a/core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageModule.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java
rename to core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageModule.java
index e84216b0db..172464fa76 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageModule.java
+++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageModule.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator;
+package io.bitsquare.arbitration;
 
 import io.bitsquare.BitsquareModule;
 
diff --git a/core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java b/core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageService.java
similarity index 91%
rename from core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java
rename to core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageService.java
index e85d03829f..fc206021f4 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/ArbitratorMessageService.java
+++ b/core/src/main/java/io/bitsquare/arbitration/ArbitratorMessageService.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator;
+package io.bitsquare.arbitration;
 
 
-import io.bitsquare.arbitrator.listeners.ArbitratorListener;
+import io.bitsquare.arbitration.listeners.ArbitratorListener;
 
 import java.util.Locale;
 import java.util.concurrent.Executor;
diff --git a/core/src/main/java/io/bitsquare/arbitrator/Reputation.java b/core/src/main/java/io/bitsquare/arbitration/Reputation.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/arbitrator/Reputation.java
rename to core/src/main/java/io/bitsquare/arbitration/Reputation.java
index 9ca54b954a..e26efd4887 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/Reputation.java
+++ b/core/src/main/java/io/bitsquare/arbitration/Reputation.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator;
+package io.bitsquare.arbitration;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java b/core/src/main/java/io/bitsquare/arbitration/listeners/ArbitratorListener.java
similarity index 91%
rename from core/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java
rename to core/src/main/java/io/bitsquare/arbitration/listeners/ArbitratorListener.java
index 9210598e1c..841d4b21f0 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/listeners/ArbitratorListener.java
+++ b/core/src/main/java/io/bitsquare/arbitration/listeners/ArbitratorListener.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator.listeners;
+package io.bitsquare.arbitration.listeners;
 
-import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitration.Arbitrator;
 
 import java.util.List;
 
diff --git a/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageModule.java
similarity index 92%
rename from core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java
rename to core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageModule.java
index 2982cc7387..47cbec85b1 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageModule.java
+++ b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageModule.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator.tomp2p;
+package io.bitsquare.arbitration.tomp2p;
 
-import io.bitsquare.arbitrator.ArbitratorMessageModule;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
+import io.bitsquare.arbitration.ArbitratorMessageModule;
+import io.bitsquare.arbitration.ArbitratorMessageService;
 import io.bitsquare.network.tomp2p.TomP2PNode;
 
 import com.google.inject.Injector;
diff --git a/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageService.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
rename to core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageService.java
index 321c6d663d..8c1ac58367 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
+++ b/core/src/main/java/io/bitsquare/arbitration/tomp2p/TomP2PArbitratorMessageService.java
@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.arbitrator.tomp2p;
+package io.bitsquare.arbitration.tomp2p;
 
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
-import io.bitsquare.arbitrator.listeners.ArbitratorListener;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.arbitration.ArbitratorMessageService;
+import io.bitsquare.arbitration.listeners.ArbitratorListener;
 import io.bitsquare.network.tomp2p.TomP2PNode;
 
 import java.io.IOException;
diff --git a/core/src/main/java/io/bitsquare/btc/BlockChainService.java b/core/src/main/java/io/bitsquare/btc/BlockChainService.java
index ad74b9cd75..7c35e0b79d 100644
--- a/core/src/main/java/io/bitsquare/btc/BlockChainService.java
+++ b/core/src/main/java/io/bitsquare/btc/BlockChainService.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 
 import javax.inject.Inject;
 
@@ -33,7 +33,7 @@ public class BlockChainService {
 
     //TODO
     @SuppressWarnings("SameReturnValue")
-    public boolean isAccountBlackListed(String accountId, BankAccount bankAccount) {
+    public boolean isAccountBlackListed(String accountId, FiatAccount fiatAccount) {
         return false;
     }
 
@@ -69,7 +69,7 @@ public class BlockChainService {
     }
 
     @SuppressWarnings("SameReturnValue")
-    private boolean isBankAccountBlacklisted(BankAccount bankAccount) {
+    private boolean isBankAccountBlacklisted(FiatAccount fiatAccount) {
         // TODO check if accountID is on blacklist
         return false;
     }
diff --git a/core/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java b/core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
rename to core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java
index 5f481b2191..b9972f2913 100644
--- a/core/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
+++ b/core/src/main/java/io/bitsquare/common/handlers/ErrorMessageHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.handlers;
+package io.bitsquare.common.handlers;
 
 /**
  * For reporting error message only (UI)
diff --git a/core/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java b/core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
rename to core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java
index a009e91964..c1122c1236 100644
--- a/core/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
+++ b/core/src/main/java/io/bitsquare/common/handlers/ExceptionHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.handlers;
+package io.bitsquare.common.handlers;
 
 /**
  * For reporting throwable objects only
diff --git a/core/src/main/java/io/bitsquare/util/handlers/FaultHandler.java b/core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
rename to core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java
index aa2d8e47bb..e288098c01 100644
--- a/core/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
+++ b/core/src/main/java/io/bitsquare/common/handlers/FaultHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.handlers;
+package io.bitsquare.common.handlers;
 
 /**
  * For reporting a description message and throwable
diff --git a/core/src/main/java/io/bitsquare/util/handlers/ResultHandler.java b/core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
rename to core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java
index 6a4f19ed88..eff8b8e605 100644
--- a/core/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
+++ b/core/src/main/java/io/bitsquare/common/handlers/ResultHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.handlers;
+package io.bitsquare.common.handlers;
 
 public interface ResultHandler {
     void handleResult();
diff --git a/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java b/core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
rename to core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java
index 25a0b0607f..f42cd37599 100644
--- a/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
+++ b/core/src/main/java/io/bitsquare/common/taskrunner/InterceptTaskException.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.taskrunner;
+package io.bitsquare.common.taskrunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java b/core/src/main/java/io/bitsquare/common/taskrunner/SharedModel.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java
rename to core/src/main/java/io/bitsquare/common/taskrunner/SharedModel.java
index fa946cbbdd..428b953c75 100644
--- a/core/src/main/java/io/bitsquare/util/taskrunner/SharedModel.java
+++ b/core/src/main/java/io/bitsquare/common/taskrunner/SharedModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.taskrunner;
+package io.bitsquare.common.taskrunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/util/taskrunner/Task.java b/core/src/main/java/io/bitsquare/common/taskrunner/Task.java
similarity index 98%
rename from core/src/main/java/io/bitsquare/util/taskrunner/Task.java
rename to core/src/main/java/io/bitsquare/common/taskrunner/Task.java
index 97b43b2ab0..abcc96bf2e 100644
--- a/core/src/main/java/io/bitsquare/util/taskrunner/Task.java
+++ b/core/src/main/java/io/bitsquare/common/taskrunner/Task.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.taskrunner;
+package io.bitsquare.common.taskrunner;
 
 import io.bitsquare.btc.exceptions.SigningException;
 import io.bitsquare.btc.exceptions.TransactionVerificationException;
diff --git a/core/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java b/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java
rename to core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
index 1118acf58b..1448715e7c 100644
--- a/core/src/main/java/io/bitsquare/util/taskrunner/TaskRunner.java
+++ b/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
@@ -15,10 +15,10 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.taskrunner;
+package io.bitsquare.common.taskrunner;
 
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.handlers.ResultHandler;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ResultHandler;
 
 import java.util.Arrays;
 import java.util.Queue;
diff --git a/core/src/main/java/io/bitsquare/viewfx/ViewfxException.java b/core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/ViewfxException.java
rename to core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java
index 319061d8b3..c32eb0aed6 100644
--- a/core/src/main/java/io/bitsquare/viewfx/ViewfxException.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/ViewfxException.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx;
+package io.bitsquare.common.viewfx;
 
 import static java.lang.String.format;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java b/core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
rename to core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java
index d861ee8092..a2fcadf2b6 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/model/Activatable.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.model;
+package io.bitsquare.common.viewfx.model;
 
 public interface Activatable {
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java b/core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java
rename to core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java
index b12285df46..5c08b16cb6 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/ActivatableWithDataModel.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/model/ActivatableWithDataModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.model;
+package io.bitsquare.common.viewfx.model;
 
 public abstract class ActivatableWithDataModel<D extends Activatable> extends WithDataModel<D> implements Activatable {
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/DataModel.java b/core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java
similarity index 94%
rename from core/src/main/java/io/bitsquare/viewfx/model/DataModel.java
rename to core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java
index aedbe61dc4..b15e8a5662 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/DataModel.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/model/DataModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.model;
+package io.bitsquare.common.viewfx.model;
 
 public interface DataModel extends Model {
 }
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/Model.java b/core/src/main/java/io/bitsquare/common/viewfx/model/Model.java
similarity index 94%
rename from core/src/main/java/io/bitsquare/viewfx/model/Model.java
rename to core/src/main/java/io/bitsquare/common/viewfx/model/Model.java
index e57cdca3ba..484d646afe 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/Model.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/model/Model.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.model;
+package io.bitsquare.common.viewfx.model;
 
 public interface Model {
 }
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/ViewModel.java b/core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java
similarity index 94%
rename from core/src/main/java/io/bitsquare/viewfx/model/ViewModel.java
rename to core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java
index 09d93208ff..3de7fb37b8 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/ViewModel.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/model/ViewModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.model;
+package io.bitsquare.common.viewfx.model;
 
 public interface ViewModel extends Model {
 }
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java b/core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java
rename to core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java
index 6fd8c4e19d..27ea811e97 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/WithDataModel.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/model/WithDataModel.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.model;
+package io.bitsquare.common.viewfx.model;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java b/core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java
index 767f550575..6b5591d0b1 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/AbstractView.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/AbstractView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import javafx.fxml.FXML;
 import javafx.scene.*;
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java b/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java
index 62c497d205..a2b72b075b 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/ActivatableView.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import javafx.scene.*;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java b/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java
similarity index 93%
rename from core/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java
index 2aa6422c22..fba1326655 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/ActivatableViewAndModel.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/ActivatableViewAndModel.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
-import io.bitsquare.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.Activatable;
 
 import javafx.scene.*;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java b/core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java
index 7a0c0ab095..2f2f509f8d 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/CachingViewLoader.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/CachingViewLoader.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import java.util.HashMap;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java b/core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java
index 6a16dc616b..3702d9f68a 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/DefaultPathConvention.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/DefaultPathConvention.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import org.springframework.util.ClassUtils;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/FxmlView.java b/core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java
similarity index 97%
rename from core/src/main/java/io/bitsquare/viewfx/view/FxmlView.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java
index 4a06464b41..faec91e597 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/FxmlView.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/FxmlView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import java.util.function.Function;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/InitializableView.java b/core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/view/InitializableView.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java
index 7c7d91b1fd..48555ff004 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/InitializableView.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/InitializableView.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import java.net.URL;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/View.java b/core/src/main/java/io/bitsquare/common/viewfx/view/View.java
similarity index 94%
rename from core/src/main/java/io/bitsquare/viewfx/view/View.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/View.java
index 64804e7183..49ac1b54e1 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/View.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/View.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import javafx.scene.*;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java b/core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java
index 00b8e3e088..42edf31ec3 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/ViewFactory.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/ViewFactory.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import javafx.util.Callback;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java b/core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java
index 2663b64703..9823e17300 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/ViewLoader.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/ViewLoader.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 public interface ViewLoader {
     View load(Class<? extends View> viewClass);
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java b/core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java
index b491ce323f..c6ea99e88b 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/ViewPath.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/Wizard.java b/core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java
similarity index 95%
rename from core/src/main/java/io/bitsquare/viewfx/view/Wizard.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java
index ba8474ffe0..040a6ee4c5 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/Wizard.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/Wizard.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view;
+package io.bitsquare.common.viewfx.view;
 
 public interface Wizard extends View {
     void nextStep(Step currentStep);
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java b/core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java
similarity index 93%
rename from core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java
index c07c9c0aff..6bd8495328 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoader.java
@@ -15,13 +15,13 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view.fxml;
+package io.bitsquare.common.viewfx.view.fxml;
 
-import io.bitsquare.viewfx.ViewfxException;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewFactory;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.ViewfxException;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewFactory;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java b/core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java
similarity index 92%
rename from core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
rename to core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java
index 5e0503dc56..2c12defe63 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/guice/InjectorViewFactory.java
+++ b/core/src/main/java/io/bitsquare/common/viewfx/view/guice/InjectorViewFactory.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view.guice;
+package io.bitsquare.common.viewfx.view.guice;
 
-import io.bitsquare.viewfx.view.ViewFactory;
+import io.bitsquare.common.viewfx.view.ViewFactory;
 
 import com.google.common.base.Preconditions;
 
diff --git a/core/src/main/java/io/bitsquare/bank/BankAccount.java b/core/src/main/java/io/bitsquare/fiat/FiatAccount.java
similarity index 88%
rename from core/src/main/java/io/bitsquare/bank/BankAccount.java
rename to core/src/main/java/io/bitsquare/fiat/FiatAccount.java
index 7555b811e4..a27011fc5c 100644
--- a/core/src/main/java/io/bitsquare/bank/BankAccount.java
+++ b/core/src/main/java/io/bitsquare/fiat/FiatAccount.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.bank;
+package io.bitsquare.fiat;
 
 import io.bitsquare.locale.Country;
 
@@ -27,10 +27,10 @@ import java.util.Objects;
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
-public class BankAccount implements Serializable {
+public class FiatAccount implements Serializable {
     private static final long serialVersionUID = 1792577576443221268L;
 
-    private final BankAccountType bankAccountType;
+    private final FiatAccountType fiatAccountType;
     private final String accountPrimaryID;  // like IBAN
     private final String accountSecondaryID; // like BIC
     private final String accountHolderName;
@@ -47,9 +47,9 @@ public class BankAccount implements Serializable {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public BankAccount(BankAccountType bankAccountType, Currency currency, Country country, String nameOfBank,
+    public FiatAccount(FiatAccountType fiatAccountType, Currency currency, Country country, String nameOfBank,
                        String accountHolderName, String accountPrimaryID, String accountSecondaryID) {
-        this.bankAccountType = bankAccountType;
+        this.fiatAccountType = fiatAccountType;
         this.currency = currency;
         this.country = country;
         this.nameOfBank = nameOfBank;
@@ -75,8 +75,8 @@ public class BankAccount implements Serializable {
         return accountHolderName;
     }
 
-    public BankAccountType getBankAccountType() {
-        return bankAccountType;
+    public FiatAccountType getFiatAccountType() {
+        return fiatAccountType;
     }
 
     public Currency getCurrency() {
@@ -108,17 +108,17 @@ public class BankAccount implements Serializable {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof BankAccount)) return false;
+        if (!(obj instanceof FiatAccount)) return false;
         if (obj == this) return true;
 
-        final BankAccount other = (BankAccount) obj;
+        final FiatAccount other = (FiatAccount) obj;
         return nameOfBank.equals(other.getUid());
     }
 
     @Override
     public String toString() {
         return "BankAccount{" +
-                "bankAccountType=" + bankAccountType +
+                "bankAccountType=" + fiatAccountType +
                 ", accountPrimaryID='" + accountPrimaryID + '\'' +
                 ", accountSecondaryID='" + accountSecondaryID + '\'' +
                 ", accountHolderName='" + accountHolderName + '\'' +
diff --git a/core/src/main/java/io/bitsquare/bank/BankAccountType.java b/core/src/main/java/io/bitsquare/fiat/FiatAccountType.java
similarity index 84%
rename from core/src/main/java/io/bitsquare/bank/BankAccountType.java
rename to core/src/main/java/io/bitsquare/fiat/FiatAccountType.java
index 8361703f1c..fffa7052a2 100644
--- a/core/src/main/java/io/bitsquare/bank/BankAccountType.java
+++ b/core/src/main/java/io/bitsquare/fiat/FiatAccountType.java
@@ -15,12 +15,12 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.bank;
+package io.bitsquare.fiat;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-public enum BankAccountType {
+public enum FiatAccountType {
     IRC("", ""),
     SEPA("IBAN", "BIC"),
     WIRE("primary ID", "secondary ID"),
@@ -32,13 +32,13 @@ public enum BankAccountType {
     private final String primaryId;
     private final String secondaryId;
 
-    BankAccountType(String primaryId, String secondaryId) {
+    FiatAccountType(String primaryId, String secondaryId) {
         this.primaryId = primaryId;
         this.secondaryId = secondaryId;
     }
 
-    public static ArrayList<BankAccountType> getAllBankAccountTypes() {
-        return new ArrayList<>(Arrays.asList(BankAccountType.values()));
+    public static ArrayList<FiatAccountType> getAllBankAccountTypes() {
+        return new ArrayList<>(Arrays.asList(FiatAccountType.values()));
     }
 
     public String getPrimaryId() {
diff --git a/core/src/main/java/io/bitsquare/gui/GuiModule.java b/core/src/main/java/io/bitsquare/gui/GuiModule.java
index c6476331f3..bb32d6004a 100644
--- a/core/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/core/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -29,11 +29,11 @@ import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.OfferBook;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.ViewFactory;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.fxml.FxmlViewLoader;
-import io.bitsquare.viewfx.view.guice.InjectorViewFactory;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.ViewFactory;
+import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.fxml.FxmlViewLoader;
+import io.bitsquare.common.viewfx.view.guice.InjectorViewFactory;
 
 import com.google.inject.Singleton;
 import com.google.inject.name.Names;
diff --git a/core/src/main/java/io/bitsquare/gui/Navigation.java b/core/src/main/java/io/bitsquare/gui/Navigation.java
index 90c7f4987a..1ef8af812e 100644
--- a/core/src/main/java/io/bitsquare/gui/Navigation.java
+++ b/core/src/main/java/io/bitsquare/gui/Navigation.java
@@ -20,8 +20,8 @@ package io.bitsquare.gui;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.trade.BuyView;
 import io.bitsquare.persistence.Persistence;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewPath;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewPath;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/MainView.java b/core/src/main/java/io/bitsquare/gui/main/MainView.java
index 35ac7aa0f4..82793b031d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/MainView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/MainView.java
@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main;
 
 import io.bitsquare.BitsquareException;
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.Popups;
@@ -32,11 +32,11 @@ import io.bitsquare.gui.main.settings.SettingsView;
 import io.bitsquare.gui.main.trade.BuyView;
 import io.bitsquare.gui.main.trade.SellView;
 import io.bitsquare.gui.util.Transitions;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -301,7 +301,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
     }
 
     private VBox createBankAccountComboBox() {
-        final ComboBox<BankAccount> comboBox = new ComboBox<>(model.getBankAccounts());
+        final ComboBox<FiatAccount> comboBox = new ComboBox<>(model.getBankAccounts());
         comboBox.setLayoutY(12);
         comboBox.setVisibleRowCount(5);
         comboBox.setConverter(model.getBankAccountsConverter());
diff --git a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 370d7855fc..4d18e0ee3d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -17,13 +17,13 @@
 
 package io.bitsquare.gui.main;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.app.gui.UpdateProcess;
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
-import io.bitsquare.arbitrator.Reputation;
-import io.bitsquare.bank.BankAccount;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.app.UpdateProcess;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.arbitration.ArbitratorMessageService;
+import io.bitsquare.arbitration.Reputation;
+import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.util.BSFormatter;
@@ -37,7 +37,7 @@ import io.bitsquare.trade.TradeManager;
 import io.bitsquare.trade.TradeMessageService;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
@@ -91,7 +91,7 @@ class MainViewModel implements ViewModel {
 
     final StringProperty bankAccountsComboBoxPrompt = new SimpleStringProperty();
     final BooleanProperty bankAccountsComboBoxDisable = new SimpleBooleanProperty();
-    final ObjectProperty<BankAccount> currentBankAccount = new SimpleObjectProperty<>();
+    final ObjectProperty<FiatAccount> currentBankAccount = new SimpleObjectProperty<>();
 
     final BooleanProperty showAppScreen = new SimpleBooleanProperty();
     final StringProperty numPendingTradesAsString = new SimpleStringProperty();
@@ -133,12 +133,12 @@ class MainViewModel implements ViewModel {
 
         user.getCurrentBankAccount().addListener((observable, oldValue, newValue) -> persistence.write(user));
         currentBankAccount.bind(user.currentBankAccountProperty());
-        user.getBankAccounts().addListener((ListChangeListener<BankAccount>) change -> {
+        user.getFiatAccounts().addListener((ListChangeListener<FiatAccount>) change -> {
             bankAccountsComboBoxDisable.set(change.getList().isEmpty());
             bankAccountsComboBoxPrompt.set(change.getList().isEmpty() ? "No accounts" : "");
         });
-        bankAccountsComboBoxDisable.set(user.getBankAccounts().isEmpty());
-        bankAccountsComboBoxPrompt.set(user.getBankAccounts().isEmpty() ? "No accounts" : "");
+        bankAccountsComboBoxDisable.set(user.getFiatAccounts().isEmpty());
+        bankAccountsComboBoxPrompt.set(user.getFiatAccounts().isEmpty() ? "No accounts" : "");
     }
 
     public void restart() {
@@ -218,14 +218,14 @@ class MainViewModel implements ViewModel {
 
         // For alpha version
         if (!user.isRegistered()) {
-            BankAccount bankAccount = new BankAccount(BankAccountType.IRC,
+            FiatAccount fiatAccount = new FiatAccount(FiatAccountType.IRC,
                     Currency.getInstance("EUR"),
                     CountryUtil.getDefaultCountry(),
                     "Demo (Name of bank)",
                     "Demo (Account holder name)",
                     "Demo (E.g. IBAN) ",
                     "Demo (E.g. BIC) ");
-            user.setBankAccount(bankAccount);
+            user.setBankAccount(fiatAccount);
             persistence.write(user);
 
             user.setAccountID(walletService.getRegistrationAddressEntry().toString());
@@ -306,26 +306,26 @@ class MainViewModel implements ViewModel {
     }
 
 
-    public StringConverter<BankAccount> getBankAccountsConverter() {
-        return new StringConverter<BankAccount>() {
+    public StringConverter<FiatAccount> getBankAccountsConverter() {
+        return new StringConverter<FiatAccount>() {
             @Override
-            public String toString(BankAccount bankAccount) {
-                return bankAccount.getNameOfBank();
+            public String toString(FiatAccount fiatAccount) {
+                return fiatAccount.getNameOfBank();
             }
 
             @Override
-            public BankAccount fromString(String s) {
+            public FiatAccount fromString(String s) {
                 return null;
             }
         };
     }
 
-    public ObservableList<BankAccount> getBankAccounts() {
-        return user.getBankAccounts();
+    public ObservableList<FiatAccount> getBankAccounts() {
+        return user.getFiatAccounts();
     }
 
-    public void setCurrentBankAccount(BankAccount currentBankAccount) {
-        user.setCurrentBankAccount(currentBankAccount);
+    public void setCurrentBankAccount(FiatAccount currentFiatAccount) {
+        user.setCurrentBankAccount(currentFiatAccount);
     }
 
     private void updateNumPendingTrades() {
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
index 69908e06ff..7a5814acb9 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -22,11 +22,11 @@ import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.account.arbitrator.ArbitratorSettingsView;
 import io.bitsquare.gui.main.account.settings.AccountSettingsView;
 import io.bitsquare.gui.main.account.setup.AccountSetupWizard;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.ActivatableView;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
index ee9cb9cef2..9dab45bee7 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
@@ -18,7 +18,7 @@
 package io.bitsquare.gui.main.account;
 
 import io.bitsquare.user.User;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
index 204a48bb2e..db5e47923a 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.java
@@ -18,11 +18,11 @@
 package io.bitsquare.gui.main.account.arbitrator;
 
 import io.bitsquare.gui.main.account.arbitrator.registration.ArbitratorRegistrationView;
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.AbstractView;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
index ee79ee6d8c..cd374ff376 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/browser/ArbitratorBrowserView.java
@@ -17,18 +17,18 @@
 
 package io.bitsquare.gui.main.account.arbitrator.browser;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
-import io.bitsquare.arbitrator.listeners.ArbitratorListener;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.arbitration.ArbitratorMessageService;
+import io.bitsquare.arbitration.listeners.ArbitratorListener;
 import io.bitsquare.gui.main.account.arbitrator.profile.ArbitratorProfileView;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.persistence.Persistence;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.ActivatableView;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
index 705fb3b7e8..29f2574353 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/profile/ArbitratorProfileView.java
@@ -17,10 +17,10 @@
 
 package io.bitsquare.gui.main.account.arbitrator.profile;
 
-import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.AbstractView;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
index 54cf771901..6635387aee 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/arbitrator/registration/ArbitratorRegistrationView.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.account.arbitrator.registration;
 
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
-import io.bitsquare.arbitrator.Reputation;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.arbitration.ArbitratorMessageService;
+import io.bitsquare.arbitration.Reputation;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
 import io.bitsquare.gui.util.BSFormatter;
@@ -29,8 +29,8 @@ import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableView;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
index d0d433cc13..0af61f23bc 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
@@ -19,9 +19,9 @@ package io.bitsquare.gui.main.account.content.changepassword;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
index c32997b9a2..672038f197 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
@@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.changepassword;
 
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
index 5a484de664..be24d48120 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
@@ -17,17 +17,17 @@
 
 package io.bitsquare.gui.main.account.content.fiat;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.bank.BankAccount;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.Region;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import com.google.inject.Inject;
 
@@ -55,13 +55,13 @@ class FiatAccountDataModel implements Activatable, DataModel {
     final StringProperty primaryIDPrompt = new SimpleStringProperty();
     final StringProperty secondaryIDPrompt = new SimpleStringProperty();
     final BooleanProperty countryNotInAcceptedCountriesList = new SimpleBooleanProperty();
-    final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
+    final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
     final ObjectProperty<Country> country = new SimpleObjectProperty<>();
     final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
 
-    final ObservableList<BankAccountType> allTypes = FXCollections.observableArrayList(BankAccountType
+    final ObservableList<FiatAccountType> allTypes = FXCollections.observableArrayList(FiatAccountType
             .getAllBankAccountTypes());
-    final ObservableList<BankAccount> allBankAccounts = FXCollections.observableArrayList();
+    final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
     final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil
             .getAllCurrencies());
     final ObservableList<Region> allRegions = FXCollections.observableArrayList(CountryUtil.getAllRegions());
@@ -77,7 +77,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
 
     @Override
     public void activate() {
-        allBankAccounts.setAll(user.getBankAccounts());
+        allFiatAccounts.setAll(user.getFiatAccounts());
     }
 
     @Override
@@ -87,16 +87,16 @@ class FiatAccountDataModel implements Activatable, DataModel {
 
 
     void saveBankAccount() {
-        BankAccount bankAccount = new BankAccount(type.get(),
+        FiatAccount fiatAccount = new FiatAccount(type.get(),
                 currency.get(),
                 country.get(),
                 title.get(),
                 holderName.get(),
                 primaryID.get(),
                 secondaryID.get());
-        user.setBankAccount(bankAccount);
+        user.setBankAccount(fiatAccount);
         saveUser();
-        allBankAccounts.setAll(user.getBankAccounts());
+        allFiatAccounts.setAll(user.getFiatAccounts());
         countryNotInAcceptedCountriesList.set(!accountSettings.getAcceptedCountries().contains(country.get()));
         reset();
     }
@@ -104,7 +104,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
     void removeBankAccount() {
         user.removeCurrentBankAccount();
         saveUser();
-        allBankAccounts.setAll(user.getBankAccounts());
+        allFiatAccounts.setAll(user.getFiatAccounts());
         reset();
     }
 
@@ -116,21 +116,21 @@ class FiatAccountDataModel implements Activatable, DataModel {
         countryNotInAcceptedCountriesList.set(false);
     }
 
-    void selectBankAccount(BankAccount bankAccount) {
-        user.setCurrentBankAccount(bankAccount);
+    void selectBankAccount(FiatAccount fiatAccount) {
+        user.setCurrentBankAccount(fiatAccount);
         persistence.write(user);
 
-        if (bankAccount != null) {
-            title.set(bankAccount.getNameOfBank());
-            holderName.set(bankAccount.getAccountHolderName());
-            primaryID.set(bankAccount.getAccountPrimaryID());
-            secondaryID.set(bankAccount.getAccountSecondaryID());
-            primaryIDPrompt.set(bankAccount.getBankAccountType().getPrimaryId());
-            secondaryIDPrompt.set(bankAccount.getBankAccountType().getSecondaryId());
+        if (fiatAccount != null) {
+            title.set(fiatAccount.getNameOfBank());
+            holderName.set(fiatAccount.getAccountHolderName());
+            primaryID.set(fiatAccount.getAccountPrimaryID());
+            secondaryID.set(fiatAccount.getAccountSecondaryID());
+            primaryIDPrompt.set(fiatAccount.getFiatAccountType().getPrimaryId());
+            secondaryIDPrompt.set(fiatAccount.getFiatAccountType().getSecondaryId());
 
-            type.set(bankAccount.getBankAccountType());
-            country.set(bankAccount.getCountry());
-            currency.set(bankAccount.getCurrency());
+            type.set(fiatAccount.getFiatAccountType());
+            country.set(fiatAccount.getCountry());
+            currency.set(fiatAccount.getCurrency());
         }
         else {
             reset();
@@ -143,7 +143,7 @@ class FiatAccountDataModel implements Activatable, DataModel {
     }
 
 
-    void setType(BankAccountType type) {
+    void setType(FiatAccountType type) {
         this.type.set(type);
 
         if (type != null) {
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
index f2aed21e39..db06db7afa 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.account.content.fiat;
 
-import io.bitsquare.bank.BankAccount;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.gui.OverlayManager;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
@@ -28,9 +28,9 @@ import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import java.util.ArrayList;
 import java.util.Currency;
@@ -58,8 +58,8 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
     @FXML ComboBox<Country> countryComboBox;
     @FXML InputTextField nameOfBankTextField, holderNameTextField, primaryIDTextField, secondaryIDTextField;
     @FXML Button saveButton, completedButton, removeBankAccountButton;
-    @FXML ComboBox<BankAccount> selectionComboBox;
-    @FXML ComboBox<BankAccountType> typesComboBox;
+    @FXML ComboBox<FiatAccount> selectionComboBox;
+    @FXML ComboBox<FiatAccountType> typesComboBox;
     @FXML ComboBox<Currency> currencyComboBox;
 
     private Wizard wizard;
@@ -234,7 +234,7 @@ public class FiatAccountView extends ActivatableViewAndModel<GridPane, FiatAccou
             }
         });
 
-        model.getAllBankAccounts().addListener((ListChangeListener<BankAccount>) change ->
+        model.getAllBankAccounts().addListener((ListChangeListener<FiatAccount>) change ->
                 completedButton.setDisable(model.getAllBankAccounts().isEmpty()));
         completedButton.setDisable(model.getAllBankAccounts().isEmpty());
     }
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
index d9b4fd340e..af17eb45db 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountViewModel.java
@@ -17,15 +17,15 @@
 
 package io.bitsquare.gui.main.account.content.fiat;
 
-import io.bitsquare.bank.BankAccount;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
@@ -54,7 +54,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
     final StringProperty selectionPrompt = new SimpleStringProperty();
     final BooleanProperty selectionDisable = new SimpleBooleanProperty();
     final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
-    final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
+    final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
     final ObjectProperty<Country> country = new SimpleObjectProperty<>();
     final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
 
@@ -87,7 +87,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
 
     @Override
     public void doActivate() {
-        dataModel.allBankAccounts.addListener((ListChangeListener<BankAccount>) change -> applyAllBankAccounts());
+        dataModel.allFiatAccounts.addListener((ListChangeListener<FiatAccount>) change -> applyAllBankAccounts());
         applyAllBankAccounts();
     }
 
@@ -108,34 +108,34 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
         dataModel.addCountryToAcceptedCountriesList();
     }
 
-    void selectBankAccount(BankAccount bankAccount) {
-        dataModel.selectBankAccount(bankAccount);
+    void selectBankAccount(FiatAccount fiatAccount) {
+        dataModel.selectBankAccount(fiatAccount);
     }
 
 
-    StringConverter<BankAccountType> getTypesConverter() {
-        return new StringConverter<BankAccountType>() {
+    StringConverter<FiatAccountType> getTypesConverter() {
+        return new StringConverter<FiatAccountType>() {
             @Override
-            public String toString(BankAccountType TypeInfo) {
+            public String toString(FiatAccountType TypeInfo) {
                 return BSResources.get(TypeInfo.toString());
             }
 
             @Override
-            public BankAccountType fromString(String s) {
+            public FiatAccountType fromString(String s) {
                 return null;
             }
         };
     }
 
-    StringConverter<BankAccount> getSelectionConverter() {
-        return new StringConverter<BankAccount>() {
+    StringConverter<FiatAccount> getSelectionConverter() {
+        return new StringConverter<FiatAccount>() {
             @Override
-            public String toString(BankAccount bankAccount) {
-                return bankAccount.getNameOfBank();
+            public String toString(FiatAccount fiatAccount) {
+                return fiatAccount.getNameOfBank();
             }
 
             @Override
-            public BankAccount fromString(String s) {
+            public FiatAccount fromString(String s) {
                 return null;
             }
         };
@@ -186,12 +186,12 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
     }
 
 
-    ObservableList<BankAccountType> getAllTypes() {
+    ObservableList<FiatAccountType> getAllTypes() {
         return dataModel.allTypes;
     }
 
-    ObservableList<BankAccount> getAllBankAccounts() {
-        return dataModel.allBankAccounts;
+    ObservableList<FiatAccount> getAllBankAccounts() {
+        return dataModel.allFiatAccounts;
     }
 
     ObservableList<Currency> getAllCurrencies() {
@@ -215,7 +215,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
     }
 
 
-    void setType(BankAccountType type) {
+    void setType(FiatAccountType type) {
         dataModel.setType(type);
         validateInput();
     }
@@ -232,7 +232,7 @@ class FiatAccountViewModel extends ActivatableWithDataModel<FiatAccountDataModel
 
 
     private void applyAllBankAccounts() {
-        if (dataModel.allBankAccounts.isEmpty()) {
+        if (dataModel.allFiatAccounts.isEmpty()) {
             selectionPrompt.set("No bank account available");
             selectionDisable.set(true);
         }
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
index 25a8aa1b1e..2aa73171d1 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
@@ -17,20 +17,20 @@
 
 package io.bitsquare.gui.main.account.content.irc;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
-import io.bitsquare.arbitrator.Reputation;
-import io.bitsquare.bank.BankAccount;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.arbitration.ArbitratorMessageService;
+import io.bitsquare.arbitration.Reputation;
+import io.bitsquare.fiat.FiatAccount;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.locale.LanguageUtil;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
@@ -57,13 +57,13 @@ class IrcAccountDataModel implements Activatable, DataModel {
     private final Persistence persistence;
 
     final StringProperty nickName = new SimpleStringProperty();
-    final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
+    final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
     final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
 
-    final ObservableList<BankAccountType> allTypes =
-            FXCollections.observableArrayList(BankAccountType.getAllBankAccountTypes());
+    final ObservableList<FiatAccountType> allTypes =
+            FXCollections.observableArrayList(FiatAccountType.getAllBankAccountTypes());
     final ObservableList<Currency> allCurrencies = FXCollections.observableArrayList(CurrencyUtil.getAllCurrencies());
-    final ObservableList<BankAccount> allBankAccounts = FXCollections.observableArrayList();
+    final ObservableList<FiatAccount> allFiatAccounts = FXCollections.observableArrayList();
 
 
     @Inject
@@ -80,7 +80,7 @@ class IrcAccountDataModel implements Activatable, DataModel {
 
     @Override
     public void activate() {
-        allBankAccounts.setAll(user.getBankAccounts());
+        allFiatAccounts.setAll(user.getFiatAccounts());
     }
 
     @Override
@@ -89,20 +89,20 @@ class IrcAccountDataModel implements Activatable, DataModel {
     }
 
     void saveBankAccount() {
-        BankAccount bankAccount = new BankAccount(type.get(),
+        FiatAccount fiatAccount = new FiatAccount(type.get(),
                 currency.get(),
                 CountryUtil.getDefaultCountry(),
                 nickName.get(),
                 nickName.get(),
                 "irc",
                 "irc");
-        user.setBankAccount(bankAccount);
+        user.setBankAccount(fiatAccount);
         saveUser();
-        allBankAccounts.setAll(user.getBankAccounts());
+        allFiatAccounts.setAll(user.getFiatAccounts());
         reset();
     }
 
-    void setType(BankAccountType type) {
+    void setType(FiatAccountType type) {
         this.type.set(type);
     }
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
index 13636e4ad9..3f1f1d1614 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
@@ -17,15 +17,15 @@
 
 package io.bitsquare.gui.main.account.content.irc;
 
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import java.util.Currency;
 
@@ -46,7 +46,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
     @FXML HBox buttonsHBox;
     @FXML InputTextField ircNickNameTextField;
     @FXML Button saveButton;
-    @FXML ComboBox<BankAccountType> typesComboBox;
+    @FXML ComboBox<FiatAccountType> typesComboBox;
     @FXML ComboBox<Currency> currencyComboBox;
 
     private Wizard wizard;
@@ -63,13 +63,13 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
         typesComboBox.setItems(model.getAllTypes());
         typesComboBox.setConverter(model.getTypesConverter());
         // we use a custom cell for deactivating non IRC items, later we use the standard cell and the StringConverter
-        typesComboBox.setCellFactory(new Callback<ListView<BankAccountType>, ListCell<BankAccountType>>() {
+        typesComboBox.setCellFactory(new Callback<ListView<FiatAccountType>, ListCell<FiatAccountType>>() {
             @Override
-            public ListCell<BankAccountType> call(ListView<BankAccountType> p) {
-                return new ListCell<BankAccountType>() {
+            public ListCell<FiatAccountType> call(ListView<FiatAccountType> p) {
+                return new ListCell<FiatAccountType>() {
 
                     @Override
-                    protected void updateItem(BankAccountType item, boolean empty) {
+                    protected void updateItem(FiatAccountType item, boolean empty) {
                         super.updateItem(item, empty);
 
                         setText(model.getBankAccountType(item));
@@ -77,7 +77,7 @@ public class IrcAccountView extends ActivatableViewAndModel<GridPane, IrcAccount
                         if (item == null || empty) {
                             setGraphic(null);
                         }
-                        else if (item != BankAccountType.IRC) {
+                        else if (item != FiatAccountType.IRC) {
                             setOpacity(0.3);
                             setDisable(true);
                         }
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
index 97e2e34ea3..b794f1702f 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
@@ -17,12 +17,12 @@
 
 package io.bitsquare.gui.main.account.content.irc;
 
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.gui.util.validation.BankAccountNumberValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
@@ -43,7 +43,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
 
     final StringProperty ircNickName = new SimpleStringProperty();
     final BooleanProperty saveButtonDisable = new SimpleBooleanProperty(true);
-    final ObjectProperty<BankAccountType> type = new SimpleObjectProperty<>();
+    final ObjectProperty<FiatAccountType> type = new SimpleObjectProperty<>();
     final ObjectProperty<Currency> currency = new SimpleObjectProperty<>();
 
 
@@ -69,22 +69,22 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
         return result;
     }
 
-    StringConverter<BankAccountType> getTypesConverter() {
-        return new StringConverter<BankAccountType>() {
+    StringConverter<FiatAccountType> getTypesConverter() {
+        return new StringConverter<FiatAccountType>() {
             @Override
-            public String toString(BankAccountType TypeInfo) {
+            public String toString(FiatAccountType TypeInfo) {
                 return BSResources.get(TypeInfo.toString());
             }
 
             @Override
-            public BankAccountType fromString(String s) {
+            public FiatAccountType fromString(String s) {
                 return null;
             }
         };
     }
 
-    String getBankAccountType(BankAccountType bankAccountType) {
-        return bankAccountType != null ? BSResources.get(bankAccountType.toString()) : "";
+    String getBankAccountType(FiatAccountType fiatAccountType) {
+        return fiatAccountType != null ? BSResources.get(fiatAccountType.toString()) : "";
     }
 
     StringConverter<Currency> getCurrencyConverter() {
@@ -102,7 +102,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
     }
 
 
-    ObservableList<BankAccountType> getAllTypes() {
+    ObservableList<FiatAccountType> getAllTypes() {
         return dataModel.allTypes;
     }
 
@@ -115,7 +115,7 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
     }
 
 
-    void setType(BankAccountType type) {
+    void setType(FiatAccountType type) {
         dataModel.setType(type);
         validateInput();
     }
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index 3346541581..d5986b923e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -19,9 +19,9 @@ package io.bitsquare.gui.main.account.content.password;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
index 3f9954411c..f51dc8a4f8 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
@@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.password;
 
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.gui.util.validation.PasswordValidator;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
index 16ff65e58e..38ef3bbce2 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
@@ -23,7 +23,7 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.InsufficientMoneyException;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
index a4141c5420..8ae8d9f8eb 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
@@ -24,9 +24,9 @@ import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.locale.BSResources;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
index b4ffd4329b..669d3c89ca 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
@@ -20,8 +20,8 @@ package io.bitsquare.gui.main.account.content.registration;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.BSResources;
-import io.bitsquare.viewfx.model.ViewModel;
-import io.bitsquare.viewfx.model.WithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.WithDataModel;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
index 8415cf76de..4960b4867b 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
@@ -17,10 +17,10 @@
 
 package io.bitsquare.gui.main.account.content.restrictions;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.arbitrator.ArbitratorMessageService;
-import io.bitsquare.arbitrator.Reputation;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.arbitration.ArbitratorMessageService;
+import io.bitsquare.arbitration.Reputation;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CountryUtil;
 import io.bitsquare.locale.LanguageUtil;
@@ -28,8 +28,8 @@ import io.bitsquare.locale.Region;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
index 322a5be6da..42449b7f87 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
@@ -17,19 +17,19 @@
 
 package io.bitsquare.gui.main.account.content.restrictions;
 
-import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.gui.main.account.arbitrator.browser.ArbitratorBrowserView;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import java.util.Locale;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
index b4d9cab366..1e421b2db5 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
@@ -17,11 +17,11 @@
 
 package io.bitsquare.gui.main.account.content.restrictions;
 
-import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.Region;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index fb47d13ef5..97380ff341 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -19,9 +19,9 @@ package io.bitsquare.gui.main.account.content.seedwords;
 
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.help.HelpId;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
index 6dfc3a51d4..ec45cbe0f7 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
@@ -19,7 +19,7 @@ package io.bitsquare.gui.main.account.content.seedwords;
 
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
index af19df66dd..7af2b5a665 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
@@ -27,13 +27,13 @@ import io.bitsquare.gui.main.account.content.registration.RegistrationView;
 import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 import io.bitsquare.gui.util.Colors;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.ViewPath;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.ViewPath;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
index 5d99bce09a..ca0525a310 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
@@ -25,12 +25,12 @@ import io.bitsquare.gui.main.account.content.registration.RegistrationView;
 import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
 import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
 import io.bitsquare.gui.main.trade.BuyView;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
-import io.bitsquare.viewfx.view.Wizard;
+import io.bitsquare.common.viewfx.view.ActivatableView;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.Wizard;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
index fc8e4c2d09..31cbc396d4 100644
--- a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
@@ -57,9 +57,9 @@ import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCommitDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.TakerCreatesAndSignsDepositTx;
 import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.taker.tasks.VerifyOffererAccount;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
 
 import java.util.Arrays;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java b/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
index 9ba5dec3c7..9ad3640e71 100644
--- a/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/funds/FundsView.java
@@ -21,12 +21,12 @@ import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.funds.transactions.TransactionsView;
 import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
index b189234d8d..e086e84084 100644
--- a/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
@@ -21,8 +21,8 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
index f4c0244cd3..d42582796a 100644
--- a/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java
@@ -25,8 +25,8 @@ import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
diff --git a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java b/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
index 5dc668ca18..4d82a3ff1e 100644
--- a/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/home/HomeView.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.home;
 
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.AbstractView;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 // home is just hosting the arbiters buttons yet, but that's just for dev, not clear yet what will be in home,
 // probably overview, event history, news, charts,... -> low prio
diff --git a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java b/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
index 4978c8479c..220a2fbcc9 100644
--- a/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/msg/MsgView.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.msg;
 
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.AbstractView;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 // will be probably only used for arbitration communication, will be renamed and the icon changed
 @FxmlView
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
index 7f8b5ea6be..75112f4589 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.java
@@ -23,12 +23,12 @@ import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
 import io.bitsquare.gui.main.portfolio.offer.OffersView;
 import io.bitsquare.gui.main.portfolio.pending.PendingTradesView;
 import io.bitsquare.trade.TradeManager;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
index 94b0181ee3..267939d654 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
@@ -22,8 +22,8 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
index 0b00a6eb31..736d529fa2 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
@@ -18,8 +18,8 @@
 package io.bitsquare.gui.main.portfolio.closed;
 
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
index aaef963e1e..77e5daf4a0 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
@@ -18,8 +18,8 @@
 package io.bitsquare.gui.main.portfolio.closed;
 
 import io.bitsquare.gui.util.BSFormatter;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
index c8789e1570..b130539a8d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
@@ -22,10 +22,10 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OpenOffer;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.handlers.ResultHandler;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
index 7563197a15..811eacdd17 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
@@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.offer;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
index 3acc046307..474f6b945c 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
@@ -20,8 +20,8 @@ package io.bitsquare.gui.main.portfolio.offer;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.offer.Offer;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
index 026757630b..f911dbc3ff 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
@@ -26,8 +26,8 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Coin;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
index 5759c0ca38..4cb8c7654c 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
@@ -33,8 +33,8 @@ import io.bitsquare.gui.main.portfolio.PortfolioView;
 import io.bitsquare.gui.main.portfolio.closed.ClosedTradesView;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
diff --git a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
index debcaf61e0..584088130f 100644
--- a/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
@@ -22,8 +22,8 @@ import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcAddressValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.trade.Trade;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
@@ -166,7 +166,7 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
 
     // payment
     String getPaymentMethod() {
-        return BSResources.get(dataModel.getTrade().getContract().getTakerBankAccount().getBankAccountType().toString());
+        return BSResources.get(dataModel.getTrade().getContract().getTakerFiatAccount().getFiatAccountType().toString());
     }
 
     String getFiatAmount() {
@@ -174,15 +174,15 @@ class PendingTradesViewModel extends ActivatableWithDataModel<PendingTradesDataM
     }
 
     String getHolderName() {
-        return dataModel.getTrade().getContract().getTakerBankAccount().getAccountHolderName();
+        return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountHolderName();
     }
 
     String getPrimaryId() {
-        return dataModel.getTrade().getContract().getTakerBankAccount().getAccountPrimaryID();
+        return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountPrimaryID();
     }
 
     String getSecondaryId() {
-        return dataModel.getTrade().getContract().getTakerBankAccount().getAccountSecondaryID();
+        return dataModel.getTrade().getContract().getTakerFiatAccount().getAccountSecondaryID();
     }
 
     // summary
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
index f5734d6d99..c72e6a98f0 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/SettingsView.java
@@ -21,13 +21,13 @@ import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.main.MainView;
 import io.bitsquare.gui.main.settings.application.PreferencesView;
 import io.bitsquare.gui.main.settings.network.NetworkSettingsView;
-import io.bitsquare.settings.Preferences;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.user.Preferences;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
index 6ce26e596d..32899a6278 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.settings.Preferences;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.user.Preferences;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
index add6236108..b78c5e6090 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index 66e5d52363..a69bfaa98f 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.gui.main.settings.application;
 
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import com.google.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index 6b35c16c99..4a6771b4c1 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -19,8 +19,8 @@ package io.bitsquare.gui.main.settings.network;
 
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.network.ClientNode;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.InitializableView;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.InitializableView;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java b/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
index ef8f86e159..442f0e7dc4 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/BuyView.java
@@ -18,8 +18,8 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java b/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
index 4a7cc3b36e..d6c270bd74 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/SellView.java
@@ -18,8 +18,8 @@
 package io.bitsquare.gui.main.trade;
 
 import io.bitsquare.gui.Navigation;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java b/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
index 882df47a7d..749bb4e056 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/TradeView.java
@@ -26,9 +26,9 @@ import io.bitsquare.gui.main.trade.offerbook.OfferBookView;
 import io.bitsquare.gui.main.trade.takeoffer.TakeOfferView;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
-import io.bitsquare.viewfx.view.ActivatableView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.ActivatableView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
index c41b1a9b39..c42b05e1b3 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.gui.main.trade.createoffer;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.WalletService;
@@ -28,11 +28,11 @@ import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.Country;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.persistence.Persistence;
-import io.bitsquare.settings.Preferences;
+import io.bitsquare.user.Preferences;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
@@ -272,13 +272,13 @@ class CreateOfferDataModel implements Activatable, DataModel {
         return addressEntry;
     }
 
-    private void applyBankAccount(BankAccount bankAccount) {
-        if (bankAccount != null) {
-            bankAccountType.set(bankAccount.getBankAccountType().toString());
-            bankAccountCurrency.set(bankAccount.getCurrency().getCurrencyCode());
-            bankAccountCounty.set(bankAccount.getCountry().getName());
+    private void applyBankAccount(FiatAccount fiatAccount) {
+        if (fiatAccount != null) {
+            bankAccountType.set(fiatAccount.getFiatAccountType().toString());
+            bankAccountCurrency.set(fiatAccount.getCurrency().getCurrencyCode());
+            bankAccountCounty.set(fiatAccount.getCountry().getName());
 
-            fiatCode.set(bankAccount.getCurrency().getCurrencyCode());
+            fiatCode.set(fiatAccount.getCurrency().getCurrencyCode());
         }
     }
 }
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
index 95d008c656..fe95d325bf 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
@@ -35,8 +35,8 @@ import io.bitsquare.gui.main.trade.TradeView;
 import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
index ee36572dfb..e50e843ede 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
@@ -24,8 +24,8 @@ import io.bitsquare.gui.util.validation.FiatValidator;
 import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
index bb39df2461..dad1faaf5b 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
@@ -17,20 +17,20 @@
 
 package io.bitsquare.gui.main.trade.offerbook;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OfferBook;
-import io.bitsquare.settings.Preferences;
+import io.bitsquare.user.Preferences;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.handlers.ResultHandler;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
@@ -65,7 +65,7 @@ class OfferBookDataModel implements Activatable, DataModel {
     private final FilteredList<OfferBookListItem> filteredItems;
     private final SortedList<OfferBookListItem> sortedItems;
     // private OfferBookInfo offerBookInfo;
-    private final ChangeListener<BankAccount> bankAccountChangeListener;
+    private final ChangeListener<FiatAccount> bankAccountChangeListener;
 
     private final ObjectProperty<Coin> amountAsCoin = new SimpleObjectProperty<>();
     private final ObjectProperty<Fiat> priceAsFiat = new SimpleObjectProperty<>();
@@ -149,11 +149,11 @@ class OfferBookDataModel implements Activatable, DataModel {
 
     boolean isTradable(Offer offer) {
         // if user has not registered yet we display all
-        BankAccount currentBankAccount = user.getCurrentBankAccount().get();
-        if (currentBankAccount == null)
+        FiatAccount currentFiatAccount = user.getCurrentBankAccount().get();
+        if (currentFiatAccount == null)
             return true;
 
-        boolean countryResult = offer.getAcceptedCountries().contains(currentBankAccount.getCountry());
+        boolean countryResult = offer.getAcceptedCountries().contains(currentFiatAccount.getCountry());
         // for IRC test version deactivate the check
         countryResult = true;
         if (!countryResult)
@@ -244,11 +244,11 @@ class OfferBookDataModel implements Activatable, DataModel {
         return direction;
     }
 
-    private void setBankAccount(BankAccount bankAccount) {
-        if (bankAccount != null) {
-            fiatCode.set(bankAccount.getCurrency().getCurrencyCode());
-            bankAccountCountry.set(bankAccount.getCountry());
-            sortedItems.stream().forEach(e -> e.setBankAccountCountry(bankAccount.getCountry()));
+    private void setBankAccount(FiatAccount fiatAccount) {
+        if (fiatAccount != null) {
+            fiatCode.set(fiatAccount.getCurrency().getCurrencyCode());
+            bankAccountCountry.set(fiatAccount.getCountry());
+            sortedItems.stream().forEach(e -> e.setBankAccountCountry(fiatAccount.getCountry()));
         }
         else {
             fiatCode.set(CurrencyUtil.getDefaultCurrency().getCurrencyCode());
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
index 919ee8146c..500240592d 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
@@ -33,8 +33,8 @@ import io.bitsquare.gui.util.validation.OptionalFiatValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -349,8 +349,8 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
       /*  countryColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountCountry().getName().compareTo(o2
       .getOffer()
                 .getBankAccountCountry().getName()));*/
-        bankAccountTypeColumn.setComparator((o1, o2) -> o1.getOffer().getBankAccountType().compareTo(o2.getOffer()
-                .getBankAccountType()));
+        bankAccountTypeColumn.setComparator((o1, o2) -> o1.getOffer().getFiatAccountType().compareTo(o2.getOffer()
+                .getFiatAccountType()));
     }
 
     public void setOfferActionHandler(TradeView.OfferActionHandler offerActionHandler) {
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
index 53783a5d23..7300a58b45 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
@@ -25,8 +25,8 @@ import io.bitsquare.gui.util.validation.OptionalFiatValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
@@ -152,7 +152,7 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
     }
 
     String getBankAccountType(OfferBookListItem item) {
-        return (item != null) ? BSResources.get(item.getOffer().getBankAccountType().toString()) : "";
+        return (item != null) ? BSResources.get(item.getOffer().getFiatAccountType().toString()) : "";
     }
 
     String getDirectionLabel(Offer offer) {
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
index ad851c80f9..82a870d365 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
@@ -23,11 +23,11 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.btc.listeners.BalanceListener;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.persistence.Persistence;
-import io.bitsquare.settings.Preferences;
+import io.bitsquare.user.Preferences;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.TradeManager;
-import io.bitsquare.viewfx.model.Activatable;
-import io.bitsquare.viewfx.model.DataModel;
+import io.bitsquare.common.viewfx.model.Activatable;
+import io.bitsquare.common.viewfx.model.DataModel;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
index 16b7ed78f0..a430f481ab 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
@@ -36,8 +36,8 @@ import io.bitsquare.gui.util.ImageUtil;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
-import io.bitsquare.viewfx.view.ActivatableViewAndModel;
-import io.bitsquare.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.ActivatableViewAndModel;
+import io.bitsquare.common.viewfx.view.FxmlView;
 
 import org.bitcoinj.core.Coin;
 
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
index a69f6d6c7c..fcdd077ef1 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
@@ -24,8 +24,8 @@ import io.bitsquare.gui.util.validation.InputValidator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
-import io.bitsquare.viewfx.model.ActivatableWithDataModel;
-import io.bitsquare.viewfx.model.ViewModel;
+import io.bitsquare.common.viewfx.model.ActivatableWithDataModel;
+import io.bitsquare.common.viewfx.model.ViewModel;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
@@ -136,7 +136,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
         acceptedCountries = formatter.countryLocalesToString(offer.getAcceptedCountries());
         acceptedLanguages = formatter.languageLocalesToString(offer.getAcceptedLanguageLocales());
         acceptedArbitrators = formatter.arbitratorsToString(offer.getArbitrators());
-        bankAccountType = BSResources.get(offer.getBankAccountType().toString());
+        bankAccountType = BSResources.get(offer.getFiatAccountType().toString());
         bankAccountCurrency = BSResources.get(offer.getCurrency().getDisplayName());
         bankAccountCounty = BSResources.get(offer.getBankAccountCountry().getName());
     }
diff --git a/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
index c07b2d3299..07dae4beb3 100644
--- a/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
+++ b/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.util;
 
-import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.locale.BSResources;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
diff --git a/core/src/main/java/io/bitsquare/gui/util/Transitions.java b/core/src/main/java/io/bitsquare/gui/util/Transitions.java
index cd0de5e2cb..c25650296d 100644
--- a/core/src/main/java/io/bitsquare/gui/util/Transitions.java
+++ b/core/src/main/java/io/bitsquare/gui/util/Transitions.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.util;
 
-import io.bitsquare.settings.Preferences;
+import io.bitsquare.user.Preferences;
 
 import javax.inject.Inject;
 
diff --git a/core/src/main/java/io/bitsquare/modena.css b/core/src/main/java/io/bitsquare/modena.css
deleted file mode 100644
index da85fed8ec..0000000000
--- a/core/src/main/java/io/bitsquare/modena.css
+++ /dev/null
@@ -1,3617 +0,0 @@
-/*
-    Modena
-    
-    This is the second generation theme for JavaFX after Caspian.
-*/
-
-/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. 
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
- *  
- * This code is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 2 only, as 
- * published by the Free Software Foundation.  Oracle designates this 
- * particular file as subject to the "Classpath" exception as provided 
- * by Oracle in the LICENSE file that accompanied this code. 
- *  
- * This code is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
- * version 2 for more details (a copy is included in the LICENSE file that 
- * accompanied this code). 
- *  
- * You should have received a copy of the GNU General Public License version 
- * 2 along with this work; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- *  
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
- * or visit www.oracle.com if you need additional information or have any 
- * questions.
- *                                                                              
- */
-
-/*******************************************************************************
- *                                                                             *
- * THEMING INSTRUCTIONS                                                       *
- *                                                                             *
- *******************************************************************************
-
-TODO: Explain here how theming works:
-
-     * -fx-text-base-color for text on top of -fx-base, -fx-color, and -fx-body-color
-     * -fx-text-background-color for text on top of -fx-background
-     * -fx-text-inner-color for text on top of -fx-control-inner-color
-     * -fx-selection-bar-text for text on top of -fx-selection-bar
-
-RESIZING FOR DIFFERENT SCREEN DPI
--------------------------------
-
-When the screen DPI changes Windows will use a different font size by default. 
-The default is 12px and can change to 15px or 18px depending on user 
-preference or screen DPI. On Mac the default is 13px and embedded will depend 
-on hardware. To make UI controls scale and be the right proportions for each of 
-these font sizes we base the padding (which controls size of control) on the 
-font size. This is done using the CSS measurement unit of a "em" where
-(1em = font size). The default sizes are based on Windows default of 12px, as
-a quick reference here are common px sizes in em units on windows.
-
-Windows 12px -> em units    -> Mac 13px      | 
-----------------------------------------
-     1px     -> 0.083333em  -> 1.08px ~ 2px
-     2px     -> 0.166667em  -> 2.16px ~ 3px
-     3px  = 0.25em
-     4px  = 0.333333em
-     5px  = 0.416667em
-     6px  = 0.5em
-     7px  = 0.583333em
-     8px  = 0.666667em
-     9px  = 0.75em
-    10px  = 0.833333em
-    11px  = 0.916667em
-    12px  = 1em
-
-IMPORTANT: Not all sizes are scaled with em units only padding. All borders and 
-background insets are still in pixels. Also any padding where it has to match up
-is being used to size a border should also be in pixels.
-
- ******************************************************************************/
-
-/*******************************************************************************
- *                                                                             *
- * CSS Styles for core infrastructure bits.  The .root section provides the    *
- * overall default colors used by the rest of the sections.                    *
- *                                                                             *
- ******************************************************************************/
-
-.root {
-    /***************************************************************************
-     *                                                                         *
-     * The main color palette from which the rest of the colors are derived.   *
-     *                                                                         *
-     **************************************************************************/
-
-    /* A light grey that is the base color for objects.  Instead of using
-     * -fx-base directly, the sections in this file will typically use -fx-color.
-     */
-    -fx-base: #ececec;
-
-    /* A very light grey used for the background of windows.  See also
-     * -fx-text-background-color, which should be used as the -fx-text-fill
-     * value for text painted on top of backgrounds colored with -fx-background.
-     */
-    -fx-background: derive(-fx-base, 26.4%);
-
-    /* Used for the inside of text boxes, password boxes, lists, trees, and
-     * tables.  See also -fx-text-inner-color, which should be used as the
-     * -fx-text-fill value for text painted on top of backgrounds colored
-     * with -fx-control-inner-background.
-     */
-    -fx-control-inner-background: derive(-fx-base, 80%);
-    /* Version of -fx-control-inner-background for alternative rows */
-    -fx-control-inner-background-alt: derive(-fx-control-inner-background, -2%);
-
-    /* One of these colors will be chosen based upon a ladder calculation
-     * that uses the brightness of a background color.  Instead of using these
-     * colors directly as -fx-text-fill values, the sections in this file should
-     * use a derived color to match the background in use.  See also:
-     *
-     * -fx-text-base-color for text on top of -fx-base, -fx-color, and -fx-body-color
-     * -fx-text-background-color for text on top of -fx-background
-     * -fx-text-inner-color for text on top of -fx-control-inner-color
-     * -fx-selection-bar-text for text on top of -fx-selection-bar
-     */
-    -fx-dark-text-color: black;
-    -fx-mid-text-color: #333;
-    -fx-light-text-color: white;
-
-    /* A bright blue for highlighting/accenting objects.  For example: selected
-     * text; selected items in menus, lists, trees, and tables; progress bars */
-    -fx-accent: #0096C9;
-
-    /* Default buttons color, this is similar to accent but more subtle */
-    -fx-default-button: #ABD8ED;
-
-    /* A bright blue for the focus indicator of objects. Typically used as the
-     * first color in -fx-background-color for the "focused" pseudo-class. Also
-     * typically used with insets of -1.4 to provide a glowing effect.
-     */
-    -fx-focus-color: #039ED3;
-    -fx-faint-focus-color: #039ED322;
-
-    /* The color that is used in styling controls. The default value is based
-     * on -fx-base, but is changed by pseudoclasses to change the base color.
-     * For example, the "hover" pseudoclass will typically set -fx-color to
-     * -fx-hover-base (see below) and the "armed" pseudoclass will typically
-     * set -fx-color to -fx-pressed-base.
-     */
-    -fx-color: -fx-base;
-
-    /* Chart Color Palette */
-    CHART_COLOR_1: #f3622d;
-    CHART_COLOR_2: #fba71b;
-    CHART_COLOR_3: #57b757;
-    CHART_COLOR_4: #41a9c9;
-    CHART_COLOR_5: #4258c9;
-    CHART_COLOR_6: #9a42c8;
-    CHART_COLOR_7: #c84164;
-    CHART_COLOR_8: #888888;
-    /* Chart Color Palette Semi-Transparent
-     * These are used by charts that need semi transparent versions of the above colors, such as BubbleChart. They
-     * are exactly the same colors as above just with alpha
-     *
-     * 20% opacity
-     */
-    CHART_COLOR_1_TRANS_20: #f3622d33;
-    CHART_COLOR_2_TRANS_20: #fba71b33;
-    CHART_COLOR_3_TRANS_20: #57b75733;
-    CHART_COLOR_4_TRANS_20: #41a9c933;
-    CHART_COLOR_5_TRANS_20: #4258c933;
-    CHART_COLOR_6_TRANS_20: #9a42c833;
-    CHART_COLOR_7_TRANS_20: #c8416433;
-    CHART_COLOR_8_TRANS_20: #88888833;
-    /* 70% opacity */
-    CHART_COLOR_1_TRANS_70: #f3622db3;
-    CHART_COLOR_2_TRANS_70: #fba71bb3;
-    CHART_COLOR_3_TRANS_70: #57b757b3;
-    CHART_COLOR_4_TRANS_70: #41a9c9b3;
-    CHART_COLOR_5_TRANS_70: #4258c9b3;
-    CHART_COLOR_6_TRANS_70: #9a42c8b3;
-    CHART_COLOR_7_TRANS_70: #c84164b3;
-    CHART_COLOR_8_TRANS_70: #888888b3;
-
-    /***************************************************************************
-     *                                                                         *
-     * Colors that are derived from the main color palette.                    *
-     *                                                                         *
-     **************************************************************************/
-
-    /* A little lighter than -fx-base and used as the -fx-color for the
-     * "hovered" pseudoclass state.
-     */
-    -fx-hover-base: ladder(
-            -fx-base,
-            derive(-fx-base, 20%) 20%,
-            derive(-fx-base, 30%) 35%,
-            derive(-fx-base, 40%) 50%
-    );
-
-    /* A little darker than -fx-base and used as the -fx-color for the
-     * "armed" pseudoclass state.
-     *
-     * TODO: should this be renamed to -fx-armed-base?
-     */
-    -fx-pressed-base: derive(-fx-base, -6%);
-
-    /* The color to use for -fx-text-fill when text is to be painted on top of
-     * a background filled with the -fx-background color.
-     */
-    -fx-text-background-color: ladder(
-            -fx-background,
-            -fx-light-text-color 45%,
-            -fx-dark-text-color 46%,
-            -fx-dark-text-color 59%,
-            -fx-mid-text-color 60%
-    );
-
-    /* A little darker than -fx-color and used to draw boxes around objects such
-     * as progress bars, scroll bars, scroll panes, trees, tables, and lists.
-     */
-    -fx-box-border: ladder(
-            -fx-color,
-            black 20%,
-            derive(-fx-color, -15%) 30%
-    );
-
-    /* Darker than -fx-background and used to draw boxes around text boxes and
-     * password boxes.
-     */
-    -fx-text-box-border: ladder(
-            -fx-background,
-            black 10%,
-            derive(-fx-background, -15%) 30%
-    );
-
-    /* Lighter than -fx-background and used to provide a small highlight when
-     * needed on top of -fx-background. This is never a shadow in Modena but
-     * keep -fx-shadow-highlight-color name to be compatible with Caspian.
-     */
-    -fx-shadow-highlight-color: ladder(
-            -fx-background,
-            rgba(255, 255, 255, 0.07) 0%,
-            rgba(255, 255, 255, 0.07) 20%,
-            rgba(255, 255, 255, 0.07) 70%,
-            rgba(255, 255, 255, 0.7) 90%,
-            rgba(255, 255, 255, 0.75) 100%
-    );
-
-    /* A gradient that goes from a little darker than -fx-color on the top to
-     * even more darker than -fx-color on the bottom.  Typically is the second
-     * color in the -fx-background-color list as the small thin border around
-     * a control. It is typically the same size as the control (i.e., insets
-     * are 0).
-     */
-    -fx-outer-border: derive(-fx-color, -23%);
-
-    /* A gradient that goes from a bit lighter than -fx-color on the top to
-     * a little darker at the bottom.  Typically is the third color in the
-     * -fx-background-color list as a thin highlight inside the outer border.
-     * Insets are typically 1.
-     */
-    -fx-inner-border: linear-gradient(to bottom,
-    ladder(
-            -fx-color,
-            derive(-fx-color, 30%) 0%,
-            derive(-fx-color, 20%) 40%,
-            derive(-fx-color, 25%) 60%,
-            derive(-fx-color, 55%) 80%,
-            derive(-fx-color, 55%) 90%,
-            derive(-fx-color, 75%) 100%
-    ),
-    ladder(
-            -fx-color,
-            derive(-fx-color, 20%) 0%,
-            derive(-fx-color, 10%) 20%,
-            derive(-fx-color, 5%) 40%,
-            derive(-fx-color, -2%) 60%,
-            derive(-fx-color, -5%) 100%
-    ));
-    -fx-inner-border-horizontal: linear-gradient(to right, derive(-fx-color, 55%), derive(-fx-color, -5%));
-    -fx-inner-border-bottomup: linear-gradient(to top, derive(-fx-color, 55%), derive(-fx-color, -5%));
-
-    /* A gradient that goes from a little lighter than -fx-color at the top to
-     * a little darker than -fx-color at the bottom and is used to fill the
-     * body of many controls such as buttons.
-     */
-    -fx-body-color: linear-gradient(to bottom,
-    ladder(
-            -fx-color,
-            derive(-fx-color, 8%) 75%,
-            derive(-fx-color, 10%) 80%
-    ),
-    derive(-fx-color, -8%));
-    -fx-body-color-bottomup: linear-gradient(to top, derive(-fx-color, 10%), derive(-fx-color, -6%));
-    -fx-body-color-to-right: linear-gradient(to right, derive(-fx-color, 10%), derive(-fx-color, -6%));
-
-    /* The color to use as -fx-text-fill when painting text on top of
-     * backgrounds filled with -fx-base, -fx-color, and -fx-body-color.
-     */
-    -fx-text-base-color: ladder(
-            -fx-color,
-            -fx-light-text-color 45%,
-            -fx-dark-text-color 46%,
-            -fx-dark-text-color 59%,
-            -fx-mid-text-color 60%
-    );
-
-    /* The color to use as -fx-text-fill when painting text on top of
-     * backgrounds filled with -fx-control-inner-background.
-     */
-    -fx-text-inner-color: ladder(
-            -fx-control-inner-background,
-            -fx-light-text-color 45%,
-            -fx-dark-text-color 46%,
-            -fx-dark-text-color 59%,
-            -fx-mid-text-color 60%
-    );
-
-    /* The color to use for small mark-like objects such as checks on check
-     * boxes, filled in circles in radio buttons, arrows on scroll bars, etc.
-     */
-    -fx-mark-color: ladder(
-            -fx-color,
-            white 30%,
-            derive(-fx-color, -63%) 31%
-    );
-
-    /* The small thin light "shadow" for mark-like objects. Typically used in
-     * conjunction with -fx-mark-color with an insets of 1 0 -1 0. */
-    -fx-mark-highlight-color: ladder(
-            -fx-color,
-            derive(-fx-color, 80%) 60%,
-            white 70%
-    );
-
-    /* Background for items in list like things such as menus, lists, trees,
-     * and tables. */
-    -fx-selection-bar: -fx-accent;
-
-    /* Background color to use for selection of list cells etc. This is when
-     * the control doesn't have focus or the row of a previously selected item. */
-    -fx-selection-bar-non-focused: lightgrey;
-
-    /* The color to use as -fx-text-fill when painting text on top of
-     * backgrounds filled with -fx-selection-bar.
-     *
-     * TODO: this can be removed
-     */
-    -fx-selection-bar-text: -fx-text-background-color;
-
-    /* These are needed for Popup */
-    -fx-background-color: inherit;
-    -fx-background-radius: inherit;
-    -fx-background-insets: inherit;
-    -fx-padding: inherit;
-
-    /* The color to use in ListView/TreeView/TableView to indicate hover. */
-    -fx-cell-hover-color: #cce3f4;
-
-    /** Focus line for keyboard focus traversal on cell based controls */
-    -fx-cell-focus-inner-border: derive(-fx-selection-bar, 30%);
-
-    /* The colors to use in Pagination */
-    -fx-page-bullet-border: #acacac;
-    -fx-page-indicator-hover-border: #accee5;
-
-    /***************************************************************************
-     *                                                                         *
-     * Set the default background color for the scene                          *
-     *                                                                         *
-     **************************************************************************/
-
-    -fx-background-color: -fx-background;
-}
-
-/* Make popups transparent */
-.root.popup {
-    -fx-background-color: transparent;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Common Styles                                                               *
- *                                                                             *
- * These are styles that give a standard look to a whole range of controls     *
- *                                                                             *
- ******************************************************************************/
-
-/* ====   TEXT NODES IN CONTROLS   ========================================== */
-
-.text {
-    /* This adjusts text alignment within the bounds of text nodes so that
-       the text is always vertically centered within the bounds. Based on
-       the cap height of the text. */
-    -fx-bounds-type: logical_vertical_center;
-    /* Enable LCD text rendering */
-    -fx-font-smoothing-type: lcd;
-}
-
-/* ====   BUTTON LIKE THINGS   ============================================== */
-
-.button,
-.toggle-button,
-.radio-button > .radio,
-.check-box > .box,
-.menu-button,
-.choice-box,
-.color-picker.split-button > .color-picker-label,
-.combo-box-base,
-.combo-box-base:editable > .arrow-button {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
-    -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
-    -fx-text-fill: -fx-text-base-color;
-    -fx-alignment: CENTER;
-    -fx-content-display: LEFT;
-}
-
-.menu-button > .label {
-    -fx-alignment: CENTER_LEFT;
-}
-
-.button:hover,
-.toggle-button:hover,
-.radio-button:hover > .radio,
-.check-box:hover > .box,
-.menu-button:hover,
-.split-menu-button > .label:hover,
-.split-menu-button > .arrow-button:hover,
-.slider .thumb:hover,
-.scroll-bar > .thumb:hover,
-.scroll-bar > .increment-button:hover,
-.scroll-bar > .decrement-button:hover,
-.choice-box:hover,
-.color-picker.split-button > .arrow-button:hover,
-.color-picker.split-button > .color-picker-label:hover,
-.combo-box-base:hover,
-.combo-box-base:editable > .arrow-button:hover,
-.tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button:hover {
-    -fx-color: -fx-hover-base;
-}
-
-.button:armed,
-.toggle-button:armed,
-.radio-button:armed > .radio,
-.check-box:armed .box,
-.menu-button:armed,
-.split-menu-button:armed > .label,
-.split-menu-button > .arrow-button:pressed,
-.split-menu-button:showing > .arrow-button,
-.slider .thumb:pressed,
-.scroll-bar > .thumb:pressed,
-.scroll-bar > .increment-button:pressed,
-.scroll-bar > .decrement-button:pressed,
-.choice-box:showing,
-.combo-box-base:showing,
-.combo-box-base:editable:showing > .arrow-button,
-.tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button:pressed {
-    -fx-color: -fx-pressed-base;
-}
-
-.button:focused,
-.toggle-button:focused,
-.radio-button:focused > .radio,
-.check-box:focused > .box,
-.menu-button:focused,
-.choice-box:focused,
-.color-picker.split-button:focused > .color-picker-label,
-.combo-box-base:focused,
-.slider:focused .thumb {
-    -fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-    -fx-background-insets: -0.2, 1, 2, -1.4, 2.6;
-    -fx-background-radius: 3, 2, 1, 4, 1;
-}
-
-/* ====   DISABLED THINGS   ================================================= */
-
-.label:disabled,
-.button:disabled,
-.toggle-button:disabled,
-.radio-button:disabled,
-.check-box:disabled,
-.hyperlink:disabled,
-.menu-button:disabled,
-.split-menu-button:disabled,
-.slider:disabled,
-.scroll-bar:disabled,
-.scroll-pane:disabled,
-.progress-bar:disabled,
-.progress-indicator:disabled,
-.text-input:disabled,
-.choice-box:disabled,
-.combo-box-base:disabled,
-.date-cell:disabled > *, /* This is set on children so border is not affected. */
-.list-view:disabled,
-.tree-view:disabled,
-.table-view:disabled,
-.tree-table-view:disabled,
-.tab-pane:disabled,
-.titled-pane:disabled > .title,
-.accordion:disabled > .titled-pane > .title,
-.tab-pane > .tab-header-area > .headers-region > .tab:disabled,
-.menu:disabled,
-.menu-item:disabled > .label,
-.menu-item:disabled,
-.list-cell:filled:selected:focused:disabled,
-.list-cell:filled:selected:disabled,
-.tree-cell:filled:selected:focused:disabled,
-.tree-cell:filled:selected:disabled,
-.tree-cell > .tree-disclosure-node:disabled,
-.tree-table-row-cell > .tree-disclosure-node:disabled,
-.table-row-cell:selected:disabled,
-.tree-table-row-cell:selected:disabled,
-.table-cell:selected:disabled,
-.tree-table-cell:selected:disabled {
-    -fx-opacity: 0.4;
-}
-
-/* ====   MNEMONIC THINGS   ================================================= */
-
-.mnemonic-underline {
-    -fx-stroke: transparent;
-}
-
-.titled-pane:show-mnemonics > .mnemonic-underline,
-.label:show-mnemonics > .mnemonic-underline,
-.context-menu:show-mnemonics > .mnemonic-underline,
-.menu:show-mnemonics > .mnemonic-underline,
-.menu-bar:show-mnemonics > .mnemonic-underline,
-.menu-item:show-mnemonics > .mnemonic-underline,
-.button:show-mnemonics > .mnemonic-underline,
-.toggle-button:show-mnemonics > .mnemonic-underline,
-.radio-button:show-mnemonics > .mnemonic-underline,
-.check-box:show-mnemonics > .mnemonic-underline,
-.hyperlink:show-mnemonics > .mnemonic-underline,
-.split-menu-button:show-mnemonics > .mnemonic-underline,
-.menu-button:show-mnemonics > .mnemonic-underline {
-    -fx-stroke: -fx-text-base-color;
-}
-
-/* ====   MARKS   =========================================================== */
-
-.radio-button:selected > .radio > .dot,
-.check-box:selected > .box > .mark,
-.check-box:indeterminate > .box > .mark {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-}
-
-/* ====   ARROWS   ========================================================== */
-
-.menu-button > .arrow-button > .arrow,
-.split-menu-button > .arrow-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 0 0 -1 0, 0;
-    -fx-padding: 0.25em;
-    -fx-shape: "M 0 -3.5 v 7 l 4 -3.5 z";
-}
-
-.choice-box > .open-button > .arrow,
-.menu-button:openvertically > .arrow-button > .arrow,
-.split-menu-button:openvertically > .arrow-button > .arrow,
-.combo-box-base > .arrow-button > .arrow,
-.web-view .form-select-button .arrow,
-.tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 0 0 -1 0, 0;
-    -fx-padding: 0.166667em 0.333333em 0.166667em 0.333333em; /* 2 4 2 4 */
-    -fx-shape: "M 0 0 h 7 l -3.5 4 z";
-}
-
-/* ====   CHOICE BOX LIKE THINGS   ========================================== */
-
-.choice-box,
-.menu-button,
-.combo-box-base {
-    -fx-padding: 0;
-}
-
-.choice-box > .label,
-.menu-button > .label,
-.color-picker > .label {
-    -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.choice-box > .open-button,
-.menu-button > .arrow-button {
-    -fx-padding: 0.5em 0.667em 0.5em 0.0em; /* 6 8 6 0 */
-}
-
-/* ====   BOX LIKE THINGS   ================================================= */
-
-.scroll-pane,
-.split-pane,
-.list-view,
-.tree-view,
-.table-view,
-.tree-table-view,
-.html-editor {
-    -fx-background-color: -fx-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-padding: 1;
-}
-
-.scroll-pane:focused,
-.split-pane:focused,
-.list-view:focused,
-.tree-view:focused,
-.table-view:focused,
-.tree-table-view:focused,
-.html-editor:focused {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-control-inner-background;
-    -fx-background-insets: -1.4, -0.3, 1;
-    -fx-background-radius: 2, 0, 0;
-}
-
-/* ones with grey -fx-background not lighter -fx-control-inner-background */
-.scroll-pane,
-.split-pane {
-    -fx-background-color: -fx-box-border, -fx-background;
-}
-
-.scroll-pane:focused,
-.split-pane:focused {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-background;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Label                                                                       *
- *                                                                             *
- ******************************************************************************/
-
-.label {
-    -fx-text-fill: -fx-text-background-color;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Button & ToggleButton                                                       *
- *                                                                             *
- ******************************************************************************/
-
-/* ====   DEFAULT   ========================================================= */
-
-.button:default {
-    -fx-base: -fx-default-button;
-}
-
-/* ====   WEB BUTTONS   ===================================================== */
-
-.web-view .form-select-button {
-    -fx-background-radius: 2, 2, 1, 0;
-    -fx-background-insets: 2 2 1 2, 2, 3, 4;
-}
-
-/* ====   PILL BUTTONS   ==================================================== */
-
-.button.left-pill,
-.toggle-button.left-pill {
-    -fx-background-radius: 3 0 0 3, 3 0 0 3, 2 0 0 2, 1 0 0 1;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-padding: 0.333333em 0.666667em 0.333333em 0.75em; /* 4 8 4 9 */
-}
-
-.button.center-pill,
-.toggle-button.center-pill {
-    -fx-background-radius: 0;
-    -fx-background-insets: 0 0 -1 0, 0 0 0 0, 1 1 1 0, 2 2 2 1;
-}
-
-.button.right-pill,
-.toggle-button.right-pill {
-    -fx-background-radius: 0 3 3 0, 0 3 3 0, 0 2 2 0, 0 1 1 0;
-    -fx-background-insets: 0 0 -1 0, 0, 1 1 1 0, 2 2 2 1;
-}
-
-.button.left-pill:focused,
-.toggle-button.left-pill:focused {
-    -fx-background-insets: -0.2 0 -0.2 -0.2, 1, 2, -1.4 0 -1.4 -1.4, 2.6;
-    -fx-background-radius: 3 0 0 3, 2 0 0 2, 1 0 0 1, 4 0 0 4, 1 0 0 1;
-}
-
-.button.center-pill:focused,
-.toggle-button.center-pill:focused {
-    -fx-background-insets: -0.2 0 -0.2 -1, 1 1 1 0, 2 2 2 1, -1.4 0 -1.4 -1, 2.6 2.6 2.6 1.6;
-    -fx-background-radius: 0, 0, 0, 0, 0;
-}
-
-.button.right-pill:focused,
-.toggle-button.right-pill:focused {
-    -fx-background-insets: -0.2 -0.2 -0.2 -1, 1 1 1 0, 2 2 2 1, -1.4 -1.4 -1.4 -1, 2.6 2.6 2.6 1.6;
-    -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0, 0 4 4 0, 0 1 1 0;
-}
-
-.toggle-button:selected.left-pill:focused {
-    -fx-background-insets: -0.2 0 -0.2 -0.2, 1, -1.4 0 -1.4 -1.4, 2.6;
-    -fx-background-radius: 3 0 0 3, 2 0 0 2, 4 0 0 4, 0;
-}
-
-.toggle-button:selected.center-pill:focused {
-    -fx-background-insets: -0.2 0 -0.2 -1, 1 1 1 0, -1.4 0 -1.4 -1, 2.6 2.6 2.6 1.6;
-    -fx-background-radius: 0, 0, 0, 0;
-}
-
-.toggle-button:selected.right-pill:focused {
-    -fx-background-insets: -0.2 -0.2 -0.2 -1, 1 1 1 0, -1.4 -1.4 -1.4 -1, 2.6 2.6 2.6 1.6;
-    -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 4 4 0, 0;
-}
-
-/* ====   SELECTED TOGGLE   ================================================= */
-
-.toggle-button:selected {
-    -fx-background-color: -fx-shadow-highlight-color,
-    linear-gradient(to bottom, derive(-fx-outer-border, -20%), -fx-outer-border),
-    linear-gradient(to bottom,
-            derive(-fx-color, -22%) 0%,
-            derive(-fx-color, -13%) 20%,
-            derive(-fx-color, -11%) 50%);
-    -fx-background-insets: 0 0 -1 0, 0, 1;
-}
-
-.toggle-button:selected:focused {
-    -fx-background-color: -fx-focus-color,
-    linear-gradient(to bottom,
-            derive(-fx-color, -22%) 0%,
-            derive(-fx-color, -13%) 20%,
-            derive(-fx-color, -11%) 50%),
-    -fx-faint-focus-color,
-    linear-gradient(to bottom,
-            derive(-fx-color, -22%) 0%,
-            derive(-fx-color, -13%) 20%,
-            derive(-fx-color, -11%) 50%);
-    -fx-background-insets: -0.2, 1, -1.4, 2.6;
-    -fx-background-radius: 3, 2, 4, 0;
-}
-
-/*******************************************************************************
- *                                                                             *
- * RadioButton                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.radio-button {
-    -fx-label-padding: 0.0em 0.0em 0.0em 0.416667em; /* 0 0 0 5 */
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.radio-button > .radio,
-.radio-button:focused > .radio {
-    -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
-    -fx-padding: 0.333333em; /* 4 -- padding from outside edge to the inner black dot */
-}
-
-.radio-button > .radio > .dot {
-    -fx-background-color: transparent;
-    -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
-    -fx-padding: 0.333333em; /* 4 -- radius of the inner black dot when selected */
-}
-
-/*******************************************************************************
- *                                                                             *
- * CheckBox                                                                    *
- *                                                                             *
- ******************************************************************************/
-
-.check-box {
-    -fx-label-padding: 0.0em 0.0em 0.0em 0.416667em; /* 0 0 0 5 */
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.check-box > .box {
-    -fx-background-radius: 3, 2, 1;
-    -fx-padding: 0.166667em 0.166667em 0.25em 0.25em; /* 2 2 3 3 */
-}
-
-.check-box > .box > .mark {
-    -fx-background-color: null;
-    -fx-padding: 0.416667em 0.416667em 0.5em 0.5em; /* 5 5 6 6 */
-    -fx-shape: "M-0.25,6.083c0.843-0.758,4.583,4.833,5.75,4.833S14.5-1.5,15.917-0.917c1.292,0.532-8.75,17.083-10.5,17.083C3,16.167-1.083,6.833-0.25,6.083z";
-}
-
-.check-box:indeterminate > .box {
-    -fx-padding: 0;
-}
-
-.check-box:indeterminate > .box > .mark {
-    -fx-shape: "M0,0H10V2H0Z";
-    -fx-scale-shape: false;
-    -fx-padding: 0.666667em; /* 16x16 = 8+8 */
-}
-
-/*******************************************************************************
- *                                                                             *
- * Hyperlink                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.hyperlink {
-    -fx-padding: 0.166667em 0.25em 0.166667em 0.25em; /* 2 3 2 3 */
-    -fx-cursor: hand;
-    -fx-content-display: LEFT;
-    -fx-text-fill: -fx-text-background-color;
-    -fx-border-color: transparent;
-    -fx-border-width: 1px;
-}
-
-.hyperlink,
-.hyperlink:hover,
-.hyperlink:hover:visited {
-    -fx-text-fill: -fx-accent;
-}
-
-.hyperlink:armed,
-.hyperlink:visited,
-.hyperlink:hover:armed {
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.hyperlink:hover,
-.hyperlink:visited,
-.hyperlink:hover:visited {
-    -fx-underline: true;
-}
-
-.hyperlink:visited:armed {
-    -fx-underline: false;
-}
-
-.hyperlink:focused {
-    -fx-border-color: -fx-focus-color;
-    -fx-border-style: segments(0.166667em, 0.166667em);
-    -fx-border-width: 1px;
-}
-
-.hyperlink:show-mnemonics > .mnemonic-underline {
-    -fx-stroke: -fx-text-fill;
-}
-
-/*******************************************************************************
- *                                                                             *
- * SplitMenuButton                                                             *
- *                                                                             *
- ******************************************************************************/
-
-.split-menu-button {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border;
-    -fx-background-insets: 0 0 -1 0, 0;
-    -fx-background-radius: 3, 3;
-    -fx-padding: 0;
-}
-
-.split-menu-button > .label {
-    -fx-text-fill: -fx-text-base-color;
-    -fx-background-color: -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 1 0 1 1, 2 1 2 2;
-    -fx-background-radius: 2 0 0 2, 1 0 0 1;
-    -fx-padding: 0.333333em 0.667em 0.333333em 0.667em; /* 4 8 4 8 */
-}
-
-.split-menu-button > .arrow-button {
-    -fx-background-color: -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 1, 2;
-    -fx-background-radius: 0 2 2 0, 0 1 1 0;
-    -fx-padding: 0.5em 0.667em 0.5em 0.667em; /* 6 8 6 8 */
-}
-
-.split-menu-button:focused {
-    -fx-background-color: -fx-focus-color;
-    -fx-background-insets: -0.2;
-    -fx-background-radius: 3;
-}
-
-.split-menu-button:focused > .label {
-    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-    -fx-background-insets: 1 0 1 1, 2 1 2 2, -1.4 0 -1.4 -1.4, 2.6 1.6 2.6 2.6;
-    -fx-background-radius: 2 0 0 2, 1 0 0 1, 4 0 0 4, 0;
-}
-
-.split-menu-button:focused > .arrow-button {
-    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-    -fx-background-insets: 1, 2, -1.4, 2.6;
-    -fx-background-radius: 0 2 2 0, 0 1 1 0, 0 4 4 0, 0;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ToolBar                                                                     *
- *                                                                             *
- ******************************************************************************/
-
-.tool-bar:vertical {
-    /* left */
-    -fx-background-color: -fx-outer-border,
-    linear-gradient(to right, derive(-fx-base, 0%) 0%, derive(-fx-base, 10%) 50%, derive(-fx-base, 0%) 100%);
-    -fx-background-insets: 0, 0 0 0 1;
-    -fx-padding: 0.5em 0.416667em 0.5em 0.416667em; /* 6 5 6 5 */
-    -fx-spacing: 0.333em; /* 4 */
-    -fx-alignment: TOP_LEFT;
-}
-
-.tool-bar {
-    /* top */
-    TOP-COLOR: ladder(
-            -fx-base,
-            derive(-fx-base, 0%) 0%,
-            derive(-fx-base, 46%) 100%
-    );
-    -fx-background-color: linear-gradient(to bottom, derive(TOP-COLOR, 25%) 0%, -fx-outer-border 90%),
-    linear-gradient(to bottom, TOP-COLOR 2%, derive(-fx-base, -2.1%) 95%);
-    -fx-background-insets: 0 0 0 0, 1 0 1 0;
-    -fx-padding: 0.416667em 0.5em 0.416667em 0.5em; /* 5 6  5 6 */
-    -fx-spacing: 0.333em; /* 4 */
-    -fx-alignment: CENTER_LEFT;
-}
-
-.tool-bar:vertical.right {
-    -fx-background-insets: 0, 0 1 0 0;
-}
-
-.tool-bar.bottom {
-    -fx-background-color: -fx-outer-border,
-    derive(TOP-COLOR, 25%),
-    linear-gradient(to bottom, TOP-COLOR 2%, derive(-fx-base, -2.1%) 95%);
-    -fx-background-insets: 0, 1 0 0 0, 2 0 0 0;
-}
-
-.tool-bar > .container > .separator {
-    -fx-orientation: vertical;
-}
-
-.tool-bar:vertical > .container > .separator {
-    -fx-orientation: horizontal;
-}
-
-.tool-bar-overflow-button {
-    -fx-padding: 0 0.75em 0 0;
-}
-
-.tool-bar:vertical > .tool-bar-overflow-button {
-    -fx-padding: 0 0 0.75em 0;
-}
-
-.tool-bar-overflow-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.666667em 0.916667em 0em 0em; /* 8 11 0 0 */
-    -fx-shape: "M337.273,297.622l-0.016,1.069l2.724,2.639l-2.723,2.628l0.015,1.048h0.881l3.81-3.685l-3.788-3.699H337.273z M343.783,297.622h-0.902l-0.015,1.069l2.724,2.639l-2.724,2.628l0.015,1.048h0.882l3.809-3.685L343.783,297.622z";
-}
-
-.tool-bar-overflow-button:focused > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-accent, -15%);
-    -fx-background-insets: 1 0 -1 0, 0;
-}
-
-.tool-bar-overflow-button:hover > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-hover-base, -35%);
-    -fx-background-insets: 1 0 -1 0, 0;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Slider                                                                      *
- *                                                                             *
- ******************************************************************************/
-
-.slider .thumb {
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)),
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: 0, 1, 2;
-    -fx-background-radius: 1.0em; /* makes sure this remains circular */
-    -fx-padding: 0.583333em; /* 7 */
-    -fx-effect: dropshadow(two-pass-box, rgba(0, 0, 0, 0.1), 5, 0.0, 0, 2);
-}
-
-.slider:focused .thumb {
-    -fx-background-radius: 1.0em; /* makes sure this remains circular */
-}
-
-.slider .track {
-    -fx-background-color: -fx-shadow-highlight-color,
-    linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-    linear-gradient(to bottom,
-            derive(-fx-control-inner-background, -9%),
-            derive(-fx-control-inner-background, 0%),
-            derive(-fx-control-inner-background, -5%),
-            derive(-fx-control-inner-background, -12%)
-    );
-    -fx-background-insets: 0 0 -1 0, 0, 1;
-    -fx-background-radius: 0.25em, 0.25em, 0.166667em; /* 3 3 2 */
-    -fx-padding: 0.25em; /* 3 */
-}
-
-.slider:vertical .track {
-    -fx-background-color: -fx-shadow-highlight-color,
-    -fx-text-box-border,
-    linear-gradient(to right,
-            derive(-fx-control-inner-background, -9%),
-            -fx-control-inner-background,
-            derive(-fx-control-inner-background, -9%)
-    );
-}
-
-.slider .axis {
-    -fx-tick-label-fill: derive(-fx-text-background-color, 30%);
-    -fx-tick-length: 5px;
-    -fx-minor-tick-length: 3px;
-    -fx-border-color: null;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ScrollBar                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.scroll-bar:horizontal {
-    -fx-background-color: derive(-fx-box-border, 30%), linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
-    -fx-background-insets: 0, 1 0 1 0;
-}
-
-.scroll-bar:vertical {
-    -fx-background-color: derive(-fx-box-border, 30%), linear-gradient(to right, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
-    -fx-background-insets: 0, 0 1 0 1;
-}
-
-.scroll-bar:focused {
-    -fx-background-color: -fx-focus-color,
-    linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%)),
-    -fx-faint-focus-color,
-    linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
-    -fx-background-insets: -0.2, 1, -1.4, 2.6;
-}
-
-.scroll-bar:vertical:focused {
-    -fx-background-color: -fx-focus-color,
-    linear-gradient(to right, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%)),
-    -fx-faint-focus-color,
-    linear-gradient(to right, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
-}
-
-.scroll-bar > .thumb {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-    /*-fx-background-insets: 1, 2, 3;*/
-    -fx-background-insets: 2, 3, 4;
-    /*-fx-background-radius: 0.416667em, 0.333333em, 0.25em; *//* 5, 4,3 */
-    -fx-background-radius: 3, 2, 1;
-}
-
-.scroll-bar:vertical > .thumb {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color-to-right;
-}
-
-.scroll-bar > .increment-button,
-.scroll-bar > .decrement-button {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-color: transparent;
-    -fx-padding: 0.25em; /* 3px */
-}
-
-.scroll-bar:horizontal > .increment-button,
-.scroll-bar:horizontal > .decrement-button {
-    -fx-background-insets: 2 1 2 1, 3 2 3 2, 4 3 4 3;
-}
-
-.scroll-bar:vertical > .increment-button,
-.scroll-bar:vertical > .decrement-button {
-    -fx-background-insets: 1 2 1 2, 2 3 2 3, 3 4 3 4;
-}
-
-.scroll-bar > .increment-button > .increment-arrow,
-.scroll-bar > .decrement-button > .decrement-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -45%);
-}
-
-.scroll-bar > .increment-button:hover > .increment-arrow,
-.scroll-bar > .decrement-button:hover > .decrement-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -50%);
-}
-
-.scroll-bar > .increment-button:pressed > .increment-arrow,
-.scroll-bar > .decrement-button:pressed > .decrement-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -55%);
-}
-
-.scroll-bar:horizontal > .decrement-button > .decrement-arrow {
-    -fx-padding: 0.333em 0.167em 0.333em 0.167em; /* 4 2 4 2 */
-    -fx-shape: "M5.997,5.072L5.995,6.501l-2.998-4l2.998-4l0.002,1.43l-1.976,2.57L5.997,5.072z";
-    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
-    /*-fx-background-insets: 2 0 -2 0, 0;*/
-}
-
-.scroll-bar:horizontal > .increment-button > .increment-arrow {
-    -fx-padding: 0.333em 0.167em 0.333em 0.167em; /* 4 2 4 2 */
-    -fx-shape: "M2.998-0.07L3-1.499l2.998,4L3,6.501l-0.002-1.43l1.976-2.57L2.998-0.07z";
-    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
-    /*-fx-background-insets: 2 0 -2 0, 0;*/
-}
-
-.scroll-bar:vertical > .decrement-button > .decrement-arrow {
-    -fx-padding: 0.167em 0.333em 0.167em 0.333em; /* 2 4 2 4 */
-    -fx-shape: "M1.929,4L0.5,3.998L4.5,1l4,2.998L7.07,4L4.5,2.024L1.929,4z";
-    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
-    /*-fx-background-insets: 2 0 -2 0, 0;*/
-}
-
-.scroll-bar:vertical > .increment-button > .increment-arrow {
-    -fx-padding: 0.167em 0.333em 0.167em 0.333em; /* 2 4 2 4 */
-    -fx-shape: "M7.071,1L8.5,1.002L4.5,4l-4-2.998L1.93,1L4.5,2.976L7.071,1z";
-    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
-    /*-fx-background-insets: 2 0 -2 0, 0;*/
-}
-
-/*******************************************************************************
- *                                                                             *
- * ScrollPane                                                                  *
- *                                                                             *
- ******************************************************************************/
-.scroll-pane > .viewport {
-    -fx-background-color: -fx-background;
-}
-
-.scroll-pane > .scroll-bar:horizontal {
-    -fx-background-insets: 0 1 1 1, 1;
-    -fx-padding: 0 1 0 1;
-}
-
-.scroll-pane > .scroll-bar:horizontal > .increment-button,
-.scroll-pane > .scroll-bar:horizontal > .decrement-button {
-    -fx-padding: 0.166667em 0.25em 0.25em 0.25em; /* 2 3 3 3 */
-}
-
-.scroll-pane > .scroll-bar:vertical > .increment-button,
-.scroll-pane > .scroll-bar:vertical > .decrement-button {
-    -fx-padding: 0.25em 0.25em 0.25em 0.166667em; /* 3 3 3 2 */
-}
-
-.scroll-pane > .scroll-bar:vertical {
-    -fx-background-insets: 1 1 1 0, 1;
-    -fx-padding: 1 0 1 0;
-}
-
-.scroll-pane > .corner {
-    -fx-background-color: derive(-fx-base, -1%);
-    -fx-background-insets: 0 1 1 0;
-}
-
-/* new styleclass for edge to edge scrollpanes that don't want to draw a border */
-.scroll-pane.edge-to-edge,
-.tab-pane > * > .scroll-pane {
-    -fx-background-color: -fx-background;
-    -fx-background-insets: 0;
-    -fx-padding: 0;
-}
-
-.scroll-pane.edge-to-edge > .scroll-bar,
-.tab-pane > * > .scroll-pane > .scroll-bar,
-.titled-pane > * > * > .scroll-pane > .scroll-bar {
-    -fx-background-insets: 0;
-    -fx-padding: 0;
-}
-
-.scroll-pane.edge-to-edge > .scroll-bar > .increment-button,
-.scroll-pane.edge-to-edge > .scroll-bar > .decrement-button,
-.tab-pane > * > .scroll-pane > .scroll-bar > .increment-button,
-.tab-pane > * > .scroll-pane > .scroll-bar > .decrement-button,
-.titled-pane > * > * > .scroll-pane > .scroll-bar > .increment-button,
-.titled-pane > * > * > .scroll-pane > .scroll-bar > .decrement-button {
-    -fx-padding: 0.25em; /* 3px */
-}
-
-/*******************************************************************************
- *                                                                             *
- * Separator                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.separator:horizontal .line {
-    -fx-border-color: -fx-text-box-border transparent transparent transparent,
-    -fx-shadow-highlight-color transparent transparent transparent;
-    -fx-border-insets: 0, 1 0 0 0;
-}
-
-.separator:vertical .line {
-    -fx-border-color: transparent transparent transparent -fx-shadow-highlight-color,
-    transparent transparent transparent -fx-text-box-border;
-    -fx-border-width: 3, 1;
-    -fx-border-insets: 0, 0 0 0 1;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ProgressBar                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.progress-bar {
-    -fx-indeterminate-bar-length: 60;
-    -fx-indeterminate-bar-escape: true;
-    -fx-indeterminate-bar-flip: true;
-    -fx-indeterminate-bar-animation-time: 2;
-}
-
-.progress-bar > .bar {
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-accent, -7%), derive(-fx-accent, 0%), derive(-fx-accent, -3%), derive(-fx-accent, -9%));
-    -fx-background-insets: 3 3 4 3;
-    /*-fx-background-radius: 0.583em; *//* 7 */
-    -fx-background-radius: 2;
-    -fx-padding: 0.75em;
-}
-
-.progress-bar:indeterminate > .bar {
-    -fx-background-color: linear-gradient(to left, transparent, -fx-accent);
-}
-
-.progress-bar > .track {
-    -fx-background-color: -fx-shadow-highlight-color,
-    linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-    linear-gradient(to bottom,
-            derive(-fx-control-inner-background, -7%),
-            derive(-fx-control-inner-background, 0%),
-            derive(-fx-control-inner-background, -3%),
-            derive(-fx-control-inner-background, -9%)
-    );
-    -fx-background-insets: 0, 0 0 1 0, 1 1 2 1;
-    -fx-background-radius: 4, 3, 2; /* 10, 9, 8 */
-}
-
-/*******************************************************************************
- *                                                                             *
- * ProgressIndicator                                                           *
- *                                                                             *
- ******************************************************************************/
-
-.progress-indicator {
-    -fx-indeterminate-segment-count: 12;
-    -fx-spin-enabled: true;
-}
-
-.progress-indicator > .determinate-indicator > .indicator {
-    -fx-background-color: -fx-box-border,
-    radial-gradient(center 50% 50%, radius 50%, -fx-control-inner-background 70%, derive(-fx-control-inner-background, -9%) 100%),
-    -fx-control-inner-background;
-    -fx-background-insets: 0, 1, 5 2 1 2;
-    -fx-padding: 0.166667em; /* 2px */
-}
-
-.progress-indicator > .determinate-indicator > .progress {
-    -fx-background-color: -fx-accent;
-    -fx-padding: 0.083333em; /* 1px */
-}
-
-.progress-indicator > .determinate-indicator > .tick {
-    -fx-background-color: white;
-    -fx-background-insets: 0;
-    -fx-padding: 0.666667em; /* 8 */
-    -fx-shape: "M-0.25,6.083c0.843-0.758,4.583,4.833,5.75,4.833S14.5-1.5,15.917-0.917c1.292,0.532-8.75,17.083-10.5,17.083C3,16.167-1.083,6.833-0.25,6.083z";
-}
-
-.progress-indicator > .percentage {
-    -fx-font-size: 0.916667em; /* 11pt - 1 less than the default font */
-    -fx-fill: -fx-text-background-color;
-}
-
-.progress-indicator:indeterminate .segment {
-    -fx-background-color: -fx-accent;
-}
-
-.progress-indicator:indeterminate .segment0 {
-    -fx-shape: "M41.98 14.74 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment1 {
-    -fx-shape: "M33.75 6.51 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment2 {
-    -fx-shape: "M22.49 3.5 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment3 {
-    -fx-shape: "M11.24 6.51 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment4 {
-    -fx-shape: "M3.01 14.74 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment5 {
-    -fx-shape: "M0.0 26.0 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment6 {
-    -fx-shape: "M3.01 37.25 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment7 {
-    -fx-shape: "M11.25 45.48 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment8 {
-    -fx-shape: "M22.5 48.5 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment9 {
-    -fx-shape: "M33.75 45.48 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment10 {
-    -fx-shape: "M41.98 37.25 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-.progress-indicator:indeterminate .segment11 {
-    -fx-shape: "M45.0 26.0 a3.5,3.5 0 1,1 0,1 Z";
-}
-
-/*******************************************************************************
- *                                                                             *
- * Text COMMON                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.text-input {
-    -fx-text-fill: -fx-text-inner-color;
-    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
-    -fx-highlight-text-fill: -fx-text-inner-color;
-    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 3, 2;
-    -fx-cursor: text;
-    -fx-padding: 0.333333em 0.583em 0.333333em 0.583em; /* 4 7 4 7 */
-}
-
-.text-input:focused {
-    -fx-highlight-fill: -fx-accent;
-    -fx-highlight-text-fill: white;
-    -fx-background-color: -fx-focus-color,
-    -fx-control-inner-background,
-    -fx-faint-focus-color,
-    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
-    -fx-background-insets: -0.2, 1, -1.4, 3;
-    -fx-background-radius: 3, 2, 4, 0;
-    -fx-prompt-text-fill: transparent;
-}
-
-/*******************************************************************************
- *                                                                             *
- * TextArea                                                                    *
- *                                                                             *
- ******************************************************************************/
-
-.text-area {
-    -fx-padding: 0;
-    -fx-cursor: default;
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-    derive(-fx-base, -1%);
-}
-
-.text-area > .scroll-pane {
-    -fx-background-color: null;
-}
-
-.text-area > .scroll-pane > .scroll-bar:horizontal {
-    -fx-background-radius: 0 0 2 2;
-}
-
-.text-area > .scroll-pane > .scroll-bar:vertical {
-    -fx-background-radius: 0 2 2 0;
-}
-
-.text-area > .scroll-pane > .corner {
-    -fx-background-radius: 0 0 2 0;
-}
-
-.text-area .content {
-    /*the is 1px less top and bottom than TextInput because of scrollpane border */
-    -fx-padding: 0.25em 0.583em 0.25em 0.583em; /* 3 7 3 7 */
-    -fx-cursor: text;
-    -fx-background-color: linear-gradient(from 0px 0px to 0px 4px, derive(-fx-control-inner-background, -8%), -fx-control-inner-background);
-    -fx-background-radius: 2;
-}
-
-.text-area:focused .content {
-    -fx-background-color: -fx-control-inner-background,
-    -fx-faint-focus-color,
-    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
-    -fx-background-insets: 0, 0, 2;
-    -fx-background-radius: 2, 1, 0;
-}
-
-/*******************************************************************************
- *                                                                             *
- * HTML Editor                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.html-editor-foreground {
-    -fx-color-label-visible: false;
-    -fx-color-rect-x: 1;
-    -fx-color-rect-y: 1;
-    -fx-color-rect-width: 4;
-    -fx-color-rect-height: 3;
-    -fx-graphic: url("HTMLEditor-Text-Color.png");
-}
-
-.html-editor-background {
-    -fx-color-label-visible: false;
-    -fx-color-rect-x: 1;
-    -fx-color-rect-y: 1;
-    -fx-color-rect-width: 4;
-    -fx-color-rect-height: 3;
-    -fx-graphic: url("HTMLEditor-Background-Color.png");
-}
-
-.color-picker.html-editor-foreground > .color-picker-label > .picker-color > .picker-color-rect,
-.color-picker.html-editor-background > .color-picker-label > .picker-color > .picker-color-rect {
-    -fx-stroke: null;
-}
-
-.html-editor .button,
-.html-editor .toggle-button {
-    -fx-padding: 0.333333em 0.416667em 0.333333em 0.416667em; /* 4 5 4 5 */
-}
-
-.html-editor-cut {
-    -fx-graphic: url("HTMLEditor-Cut.png");
-}
-
-.html-editor-copy {
-    -fx-graphic: url("HTMLEditor-Copy.png");
-}
-
-.html-editor-paste {
-    -fx-graphic: url("HTMLEditor-Paste.png");
-}
-
-.html-editor-align-left {
-    -fx-graphic: url("HTMLEditor-Left.png");
-}
-
-.html-editor-align-center {
-    -fx-graphic: url("HTMLEditor-Center.png");
-}
-
-.html-editor-align-right {
-    -fx-graphic: url("HTMLEditor-Right.png");
-}
-
-.html-editor-align-justify {
-    -fx-graphic: url("HTMLEditor-Justify.png");
-}
-
-.html-editor-outdent {
-    -fx-graphic: url("HTMLEditor-Outdent.png");
-}
-
-.html-editor-indent {
-    -fx-graphic: url("HTMLEditor-Indent.png");
-}
-
-.html-editor-bullets {
-    -fx-graphic: url("HTMLEditor-Bullets.png");
-}
-
-.html-editor-numbers {
-    -fx-graphic: url("HTMLEditor-Numbered.png");
-}
-
-.html-editor-bold {
-    -fx-graphic: url("HTMLEditor-Bold.png");
-}
-
-.html-editor-italic {
-    -fx-graphic: url("HTMLEditor-Italic.png");
-}
-
-.html-editor-underline {
-    -fx-graphic: url("HTMLEditor-Underline.png");
-}
-
-.html-editor-strike {
-    -fx-graphic: url("HTMLEditor-Strikethrough.png");
-}
-
-.html-editor-hr {
-    -fx-graphic: url("HTMLEditor-Break.png");
-}
-
-/*******************************************************************************
- *                                                                             *
- * PopupMenu                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.context-menu {
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-color, -17%),
-    derive(-fx-color, -30%)
-    ),
-    -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-padding: 0.333333em 0.083333em 0.333333em 0.083333em; /* 4 1 8 1 */
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
-}
-
-.context-menu .separator:horizontal .line {
-    -fx-border-color: -fx-box-border transparent transparent transparent;
-    -fx-border-insets: 1 0 0 0;
-}
-
-.context-menu > .scroll-arrow {
-    -fx-padding: 0.416667em 0.416667em 0.416667em 0.416667em; /* 5 */
-    -fx-background-color: transparent;
-}
-
-.context-menu > .scroll-arrow:hover {
-    -fx-background: -fx-selection-bar;
-    -fx-background-color: -fx-background;
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.context-menu:show-mnemonics > .mnemonic-underline {
-    -fx-stroke: -fx-text-fill;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Menu                                                                        *
- *                                                                             *
- ******************************************************************************/
-
-.menu {
-    -fx-background-color: transparent;
-    -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
-}
-
-.menu:show-mnemonics > .mnemonic-underline {
-    -fx-stroke: -fx-text-fill;
-}
-
-.menu > .right-container > .arrow {
-    -fx-padding: 0.458em 0.167em 0.458em 0.167em; /* 4.5 2 4.5 2 */
-    -fx-background-color: -fx-mark-color;
-    -fx-shape: "M0,-4L4,0L0,4Z";
-    -fx-scale-shape: false;
-}
-
-.menu:focused > .right-container > .arrow {
-    -fx-background-color: white;
-}
-
-.menu-up-arrow {
-    -fx-padding: 0.666667em 0.416667em 0.0em 0.416667em; /* 8 5 0 5 */
-    -fx-background-color: derive(-fx-color, -2%);
-    -fx-shape: "M0 1 L1 1 L.5 0 Z";
-    -fx-effect: innershadow(two-pass-box, rgba(0, 0, 0, 0.6), 4, 0.0, 0, 1);
-}
-
-.menu-down-arrow {
-    -fx-background-color: derive(-fx-color, -2%);
-    -fx-padding: 0.666667em 0.416667em 0.0em 0.416667em; /* 8 5 0 5 */
-    -fx-shape: "M0 0 L1 0 L.5 1 Z";
-    -fx-effect: innershadow(two-pass-box, rgba(0, 0, 0, 0.6), 4, 0.0, 0, 1);
-}
-
-/*******************************************************************************
- *                                                                             *
- * MenuBar                                                                     *
- *                                                                             *
- ******************************************************************************/
-
-.menu-bar {
-    -fx-padding: 0.0em 0.666667em 0.0em 0.666667em; /* 0 8 0 8 */
-    -fx-spacing: 0.166667em; /* 2 */
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-base, 75%) 0%, -fx-outer-border 90%),
-    linear-gradient(to bottom, derive(-fx-base, 46.9%) 2%, derive(-fx-base, -2.1%) 95%);
-    -fx-background-insets: 0 0 0 0, 1 0 1 0;
-    -fx-background-radius: 0, 0;
-}
-
-/* Show nothing for background of normal menu button in a menu bar */
-.menu-bar > .container > .menu-button {
-    -fx-background-radius: 0;
-    -fx-background-color: transparent;
-    -fx-background-insets: 0;
-}
-
-/* Change padding of menu buttons when in menu bar */
-.menu-bar > .container > .menu-button > .label {
-    -fx-padding: 0;
-}
-
-/* Hide the down arrow for a menu placed in a menubar */
-.menu-bar > .container > .menu-button > .arrow-button > .arrow {
-    -fx-padding: 0.167em 0 0.250em 0; /* 2 0 3 0 */
-    -fx-background-color: transparent;
-    -fx-shape: null;
-}
-
-.menu-bar > .container > .menu > .arrow-button {
-    -fx-padding: 0.500em 0 0.500em 0; /* 6 0 6 0 */
-}
-
-.menu-bar > .container > .menu-button:hover,
-.menu-bar > .container > .menu-button:focused,
-.menu-bar > .container > .menu-button:showing {
-    -fx-background: -fx-selection-bar;
-    -fx-background-color: -fx-background;
-}
-
-.menu-bar > .container > .menu-button:hover > .label,
-.menu-bar > .container > .menu-button:focused > .label,
-.menu-bar > .container > .menu-button:showing > .label {
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.menu-bar:show-mnemonics > .mnemonic-underline {
-    -fx-stroke: -fx-text-fill;
-}
-
-/*******************************************************************************
- *                                                                             *
- * MenuItem                                                                    *
- *                                                                             *
- ******************************************************************************/
-
-.menu-item {
-    -fx-background-color: transparent;
-    -fx-padding: 0.333333em 0.41777em 0.333333em 0.41777em; /* 4 5 4 5 */
-}
-
-.menu-item > .left-container {
-    -fx-padding: 0.458em 0.791em 0.458em 0.458em;
-}
-
-.menu-item > .graphic-container {
-    -fx-padding: 0em 0.333em 0em 0em;
-}
-
-.menu-item > .label {
-    -fx-padding: 0em 0.5em 0em 0em;
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.menu-item:focused {
-    -fx-background: -fx-selection-bar;
-    -fx-background-color: -fx-background;
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.menu-item:focused > .label {
-    -fx-text-fill: white;
-}
-
-.menu-item > .right-container {
-    -fx-padding: 0em 0em 0em 0.5em;
-}
-
-.menu-item:show-mnemonics > .mnemonic-underline {
-    -fx-stroke: -fx-text-fill;
-}
-
-.radio-menu-item:checked > .left-container > .radio {
-    -fx-background-color: -fx-mark-color;
-    -fx-shape: "M0,5H2L4,8L8,0H10L5,10H3Z";
-    -fx-scale-shape: false;
-}
-
-.radio-menu-item:focused:checked > .left-container > .radio {
-    -fx-background-color: white;
-}
-
-.check-menu-item:checked > .left-container > .check {
-    -fx-background-color: -fx-mark-color;
-    -fx-shape: "M0,5H2L4,8L8,0H10L5,10H3Z";
-    -fx-scale-shape: false;
-}
-
-.check-menu-item:focused:checked > .left-container > .check {
-    -fx-background-color: white;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ChoiceBox                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-/*.choice-box > .open-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.166667em 0.333333em 0.166667em 0.333333em;  2 3.5 2 3.5 
-    -fx-shape: "M 0 0 h 7 l -3.5 4 z";
-}*/
-.choice-box > .context-menu {
-    -fx-background-radius: 6, 5, 4;
-}
-
-/*******************************************************************************
- *                                                                             *
- * TabPane                                                                     *
- *                                                                             *
- ******************************************************************************/
-
-.tab-pane {
-    -fx-tab-min-height: 1.8333em; /* 22 */
-    -fx-tab-max-height: 1.8333em; /* 22 */
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-label {
-    -fx-alignment: CENTER;
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab {
-    -fx-background-insets: 0 1 1 0, 1 2 1 1, 2 3 1 2;
-    -fx-background-radius: 3 3 0 0, 2 2 0 0, 1 1 0 0;
-    -fx-padding: 0.083333em 0.5em 0.0769em 0.5em; /* 1 6 0.99 6 */
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:top {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:right {
-    -fx-background-color: -fx-outer-border, -fx-inner-border-bottomup, -fx-body-color-bottomup;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:bottom {
-    -fx-background-color: -fx-outer-border, -fx-inner-border-bottomup, -fx-body-color-bottomup;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:left {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:hover {
-    -fx-color: -fx-hover-base;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:selected {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-background;
-    -fx-background-insets: 0 1 1 0, 1 2 0 1, 2 3 0 2;
-}
-
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
-    -fx-border-width: 1, 1;
-    -fx-border-color: -fx-focus-color, -fx-faint-focus-color;
-    -fx-border-insets: -4 -4 -6 -5, -2 -2 -5 -3;
-    -fx-border-radius: 2, 1; /* looks sharper if outer border has a tighter radius (2 instead of 3) */
-}
-
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
-    -fx-border-insets: -6 -5 -4 -4, -5 -3 -2 -2;
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab:disabled:hover {
-    -fx-color: -fx-base;
-}
-
-.tab-pane > .tab-header-area > .tab-header-background {
-    /* TODO should not be using text-box-border I think? */
-    -fx-background-color: -fx-outer-border,
-    -fx-text-box-border,
-    linear-gradient(from 0px 0px to 0px 5px, -fx-text-box-border, derive(-fx-text-box-border, 30%));
-}
-
-.tab-pane:top > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 0 0 1 0, 1;
-}
-
-.tab-pane:bottom > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 1 0 0 0, 1;
-}
-
-.tab-pane:left > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 0 1 0 0, 1;
-}
-
-.tab-pane:right > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 0 0 0 1, 1;
-}
-
-.tab-pane:top > .tab-header-area {
-    /*-fx-padding: 0.416667em 0.166667em 0.0em 0.416667em; *//* 5 2 0 5 */
-    -fx-padding: 0.416667em 5 0.0em 0.416667em; /* 5 2 0 5 */
-}
-
-.tab-pane:bottom > .tab-header-area {
-    -fx-padding: 0 0.166667em 0.416667em 0.416667em; /* 0 2 5 5 */
-}
-
-.tab-pane:left > .tab-header-area {
-    -fx-padding: 0.416667em 0.0em 0.166667em 0.416667em; /* 5 0 2 5 */
-}
-
-.tab-pane:right > .tab-header-area {
-    -fx-padding: 0.416667em 0.416667em 0.166667em 0.0em; /* 5 5 2 0 */
-}
-
-/* TODO: scaling the shape seems to make it way too large */
-.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-close-button {
-    -fx-background-color: -fx-mark-color;
-    -fx-shape: "M 0,0 H1 L 4,3 7,0 H8 V1 L 5,4 8,7 V8 H7 L 4,5 1,8 H0 V7 L 3,4 0,1 Z";
-    -fx-scale-shape: false;
-    -fx-effect: dropshadow(two-pass-box, rgba(255, 255, 255, 0.4), 1, 0.0, 0, 1);
-}
-
-.tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-close-button:hover {
-    -fx-background-color: derive(-fx-mark-color, -30%);
-}
-
-/* CONTROL BUTTONS */
-.tab-pane > .tab-header-area > .control-buttons-tab > .container {
-    -fx-padding: 3 0 0 0;
-}
-
-.tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: -1 0 5 0, 0 1 6 1, 1 2 7 2;
-    -fx-padding: 4 4 9 4;
-    -fx-background-radius: 10;
-}
-
-.tab-pane:bottom > .tab-header-area > .control-buttons-tab > .container > .tab-down-button {
-    -fx-padding: -5 4 4 4; /* TODO convert to ems */
-}
-
-/* FLOATING TABS CUSTOMISATION */
-.tab-pane.floating > .tab-header-area > .tab-header-background {
-    -fx-background-color: null;
-}
-
-.tab-pane.floating > .tab-header-area {
-    -fx-background-color: null;
-}
-
-.tab-pane.floating > .tab-content-area {
-    -fx-background-color: -fx-outer-border, -fx-background;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 2, 0;
-    -fx-padding: 2;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ComboBox                                                                    *
- *                                                                             *
- ******************************************************************************/
-
-/* Customise the ListCell that appears in the ComboBox button itself */
-.combo-box > .list-cell {
-    -fx-background: transparent;
-    -fx-background-color: transparent;
-    -fx-text-fill: -fx-text-base-color;
-    -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
-}
-
-.combo-box-base > .arrow-button {
-    -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0;
-    -fx-padding: 0.5em 0.667em 0.5em 0.833333em; /* 6 8 6 10 */
-    -fx-background-color: transparent;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Editable ComboBox                                                           *
- *                                                                             *
- * The editable ComboBox TextBox inherits its properties from the TextBox      *
- * Control. Only the properties with values that are different from the        *
- * TextBox are specified here.                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.combo-box-base:editable > .arrow-button,
-.date-picker > .arrow-button {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 1 1 1 0, 1, 2;
-    -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0;
-}
-
-.combo-box-base:editable > .text-field,
-.date-picker > .text-field {
-    -fx-background-color: -fx-control-inner-background;
-    -fx-background-insets: 1 0 1 1;
-    -fx-background-radius: 2 0 0 2;
-}
-
-.combo-box-base:editable:contains-focus,
-.date-picker:contains-focus {
-    -fx-background-color: -fx-focus-color;
-    -fx-background-insets: -0.2;
-    -fx-background-radius: 3;
-}
-
-.combo-box-base:editable:focused > .text-field,
-.combo-box-base:editable > .text-field:focused,
-.date-picker:focused > .text-field,
-.date-picker > .text-field:focused {
-    -fx-background-color: -fx-control-inner-background,
-    -fx-faint-focus-color,
-    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
-    -fx-background-insets: 1 0 1 1, 1 0 1 1, 3 2 3 3;
-    -fx-background-radius: 2 0 0 2, 1 0 0 1, 0;
-}
-
-.combo-box-base:editable:contains-focus > .arrow-button,
-.date-picker:contains-focus > .arrow-button {
-    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-    -fx-background-insets: 1, 2, 1, 2.6;
-    -fx-background-radius: 0 2 2 0, 0 1 1 0, 0 1 1 0, 0 1 1 0;
-}
-
-/* -------------- STYLES FOR THE DEFAULT LISTVIEW-BASED COMBOBOX ------------- */
-
-.combo-box-popup > .list-view {
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-color, -17%),
-    derive(-fx-color, -30%)
-    ),
-    -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
-}
-
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
-    -fx-padding: 4 0 4 5;
-    /* No alternate highlighting */
-    -fx-background: -fx-control-inner-background;
-}
-
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
-    -fx-background: -fx-selection-bar-non-focused;
-    -fx-background-color: -fx-background;
-}
-
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover,
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
-    -fx-background: -fx-accent;
-    -fx-background-color: -fx-selection-bar;
-}
-
-.combo-box-popup > .list-view > .placeholder > .label {
-    -fx-text-fill: derive(-fx-control-inner-background, -30%);
-}
-
-/*******************************************************************************
- *                                                                             *
- * TitledPane                                                                  *
- *                                                                             *
- ******************************************************************************/
-
-.titled-pane {
-    -fx-text-fill: -fx-text-base-color;
-}
-
-.titled-pane > .title {
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-color, -15%) 95%,
-    derive(-fx-color, -25%) 100%
-    ),
-    -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0, 1, 2;
-    -fx-background-radius: 3 3 0 0, 2 2 0 0, 1 1 0 0;
-    -fx-padding: 0.3333em 0.75em 0.3333em 0.75em; /* 4 9 4 9 */
-}
-
-/* alternative focus using the ring around the entire title area */
-/*.titled-pane:focused > .title {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-inner-border, -fx-body-color; 
-    -fx-background-insets: 0, 0.7, 2, 3;    
-}*/
-/* focus purely on the arrow */
-.titled-pane:focused > .title > .arrow-button > .arrow {
-    -fx-background-color: -fx-focus-color, -fx-mark-color;
-    -fx-background-insets: -1, 0;
-    -fx-effect: dropshadow(two-pass-box, -fx-focus-color, 5, 0.2, 0, 0);
-}
-
-.titled-pane > .title > .arrow-button {
-    -fx-background-color: null;
-    -fx-background-insets: 0;
-    -fx-background-radius: 0;
-    -fx-padding: 0.0em 0.583em 0.0em 0.0em; /* 0 7 0 0 */
-}
-
-.titled-pane > .title > .arrow-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.25em 0.3125em 0.25em 0.3125em; /* 3 3.75 3 3.75 */
-    -fx-shape: "M 0 0 h 7 l -3.5 4 z";
-}
-
-.titled-pane > .title:hover {
-    -fx-color: -fx-hover-base;
-}
-
-/* alternative content using a border and a grad to transparent background - why should TitledPane content have a colour? */
-.titled-pane > *.content {
-    -fx-border-color: -fx-box-border;
-    -fx-border-insets: -1 0 0 0;
-    -fx-background-color: linear-gradient(from 0px 0px to 0px 5px, derive(-fx-background, -6%), -fx-background);
-}
-
-/*******************************************************************************
- *                                                                             *
- * Accordion                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.accordion > .titled-pane > .title {
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-color, -15%) 95%,
-    derive(-fx-color, -25%) 100%
-    ),
-    -fx-inner-border,
-    -fx-body-color;
-    -fx-background-insets: -1 0 0 0, 0 1 1 1, 1 2 2 2;
-    -fx-background-radius: 0, 0, 0;
-}
-
-.accordion > .first-titled-pane > .title {
-    -fx-background-insets: 0, 1, 2;
-}
-
-/*******************************************************************************
- *                                                                             *
- * SplitPane                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.split-pane > .split-pane-divider {
-    -fx-padding: 0 0.25em 0 0.25em; /* 0 3 0 3 */
-}
-
-/* horizontal the two nodes are placed to the left/right of each other. */
-.split-pane:horizontal > .split-pane-divider {
-    -fx-background-color: -fx-box-border, -fx-inner-border-horizontal;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-
-/* vertical the two nodes are placed on top of each other. */
-.split-pane:vertical > .split-pane-divider {
-    -fx-background-color: -fx-box-border, -fx-inner-border;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ColorPicker                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.color-picker > .arrow-button {
-    -fx-background-color: null;
-    -fx-padding: 0.5em 0.667em 0.5em 0; /*  6 8 6 0 */
-}
-
-.color-picker.split-button > .arrow-button {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 1 1 1 0, 1, 2;
-    -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0;
-}
-
-.color-picker.split-button:focused > .arrow-button {
-    /*-fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color !important;*/
-    /*-fx-background-insets: 0, 1, 2;*/
-    -fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-    -fx-background-insets: 1 1 1 0, 1, 2, 1, 2.6;
-    -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0, 0 1 1 0, 0 1 1 0;
-}
-
-.color-picker.split-button > .color-picker-label,
-.color-picker.split-button:focused > .color-picker-label {
-    -fx-background-color: null;
-}
-
-.color-picker.split-button > .arrow-button {
-    /*-fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color !important;*/
-    -fx-padding: 0.5em 0.667em 0.5em 0.667em; /* 6 8 6 8 */
-}
-
-.color-picker > .color-picker-label > .picker-color > .picker-color-rect {
-    -fx-stroke: -fx-box-border;
-}
-
-.color-palette {
-    -fx-spacing: 0.833333em; /* 10px */
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-color, -17%),
-    derive(-fx-color, -30%)
-    ),
-    linear-gradient(to bottom,
-            derive(-fx-background, 10%) 0%,
-            derive(-fx-background, -5%) 12%,
-            derive(-fx-background, 15%) 88%,
-            derive(-fx-background, -10%) 100%);
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 6, 5;
-    -fx-padding: 1em; /* 12 */
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
-}
-
-.color-palette > .color-picker-grid {
-    -fx-padding: 0.5px;
-    -fx-snap-to-pixel: false;
-}
-
-.color-palette > .color-picker-grid > .color-square {
-    -fx-background-color: transparent;
-    -fx-padding: 0.5px;
-}
-
-/* the color over which the user is hovering */
-.color-palette > .color-picker-grid > .color-square:focused,
-.color-palette > .color-picker-grid > .color-square:selected:focused {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color;
-    -fx-background-insets: -2, 0;
-    -fx-background-radius: 5, 0;
-    -fx-scale-x: 1.5;
-    -fx-scale-y: 1.5;
-}
-
-/* the currently selected color */
-.color-palette > .color-picker-grid > .color-square:selected {
-    -fx-background-color: black;
-}
-
-/* ------- CUSTOM COLOR DIALOG ------- */
-.custom-color-dialog > .color-rect-pane {
-    -fx-spacing: 0.75em;
-    -fx-pref-height: 16.666667em;
-    -fx-alignment: top-left;
-    -fx-fill-height: true;
-}
-
-.custom-color-dialog .color-rect-pane .color-rect {
-    -fx-min-width: 16.666667em;
-    -fx-min-height: 16.666667em;
-}
-
-.custom-color-dialog .color-rect-pane .color-rect-border {
-    -fx-border-color: derive(-fx-base, -20%);
-}
-
-.custom-color-dialog > .color-rect-pane #color-rect-indicator {
-    -fx-background-color: null;
-    -fx-border-color: white;
-    -fx-border-radius: 0.4166667em;
-    -fx-translate-x: -0.4166667em;
-    -fx-translate-y: -0.4166667em;
-    -fx-pref-width: 0.833333em;
-    -fx-pref-height: 0.833333em;
-    -fx-effect: dropshadow(three-pass-box, black, 2, 0.0, 0, 1);
-}
-
-.custom-color-dialog > .color-rect-pane > .color-bar {
-    -fx-min-width: 1.666667em;
-    -fx-min-height: 16.666667em;
-    -fx-max-width: 1.666667em;
-    -fx-border-color: derive(-fx-base, -20%);
-}
-
-.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
-    -fx-border-radius: 0.333333em;
-    -fx-border-color: white;
-    -fx-effect: dropshadow(three-pass-box, black, 2, 0.0, 0, 1);
-    -fx-pref-width: 2em;
-    -fx-pref-height: 0.833333em;
-    -fx-translate-x: -0.1666667em;
-    -fx-translate-y: -0.4166667em;
-}
-
-.custom-color-dialog {
-    -fx-background-color: -fx-background;
-    -fx-padding: 1.25em;
-    -fx-spacing: 1.25em;
-}
-
-.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
-    -fx-border-color: derive(-fx-base, -20%);
-    -fx-border-width: 2px;
-}
-
-.custom-color-dialog .controls-pane .current-new-color-grid .color-rect {
-    -fx-min-width: 10.666667em;
-    -fx-min-height: 1.75em;
-    -fx-pref-width: 10.666667em;
-    -fx-pref-height: 1.75em;
-}
-
-.custom-color-dialog .transparent-pattern {
-    -fx-background-image: url("pattern-transparent.png");
-    -fx-background-repeat: repeat;
-    -fx-background-size: auto;
-}
-
-.custom-color-dialog .controls-pane #spacer1 {
-    -fx-min-height: 0.1666667em;
-    -fx-max-height: 0.1666667em;
-    -fx-pref-height: 0.1666667em;
-}
-
-.custom-color-dialog .controls-pane #spacer2 {
-    -fx-min-height: 1em;
-    -fx-max-height: 1em;
-    -fx-pref-height: 1em;
-}
-
-.custom-color-dialog .controls-pane #settings-pane {
-    -fx-hgap: 0.4166667em;
-    -fx-vgap: 0.3333333em;
-}
-
-.custom-color-dialog .controls-pane #settings-pane .settings-label {
-    -fx-min-width: 5.75em;
-}
-
-.custom-color-dialog .controls-pane #settings-pane .settings-unit {
-    -fx-max-width: 1em;
-}
-
-.custom-color-dialog .controls-pane #settings-pane .slider {
-    -fx-pref-width: 8.25em;
-}
-
-.custom-color-dialog .controls-pane .color-input-field {
-    -fx-pref-column-count: 3;
-    -fx-max-width: 3.25em;
-    -fx-min-width: 3.25em;
-    -fx-pref-width: 3.25em;
-}
-
-.custom-color-dialog .controls-pane .web-field {
-    -fx-pref-column-count: 6;
-    -fx-pref-width: 8.25em;
-}
-
-.custom-color-dialog .controls-pane #spacer-side {
-    -fx-min-width: 0.5em;
-    -fx-pref-width: 0.5em;
-}
-
-.custom-color-dialog .controls-pane #spacer-bottom {
-    -fx-pref-height: 0.833333em;
-    -fx-min-height: 0.833333em;
-}
-
-.custom-color-dialog .controls-pane .customcolor-controls-background {
-    -fx-background-color: -fx-text-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0.8333333em 0 0.4166667em 0,
-    1em 0.166667em 0.5833333em 0.166667em;
-    -fx-background-radius: 0.3333333em, 0.166667em;
-}
-
-.custom-color-dialog .controls-pane .current-new-color-grid .label {
-    -fx-padding: 0 0 0 0.4166667em;
-}
-
-.custom-color-dialog .controls-pane #buttons-hbox {
-    -fx-spacing: 0.333333em;
-    -fx-padding: 1em 0 0 0;
-    -fx-alignment: bottom-right;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Pagination                                                                  *
- *                                                                             *
- ******************************************************************************/
-
-.pagination {
-    -fx-padding: 0;
-    -fx-arrows-visible: true;
-    -fx-tooltip-visible: true;
-    -fx-page-information-visible: true;
-    -fx-page-information-alignment: bottom;
-    -fx-arrow-button-gap: 0;
-}
-
-.pagination > .page {
-    -fx-background-color: transparent;
-}
-
-.pagination > .pagination-control {
-    -fx-background-color: transparent;
-    -fx-font-size: 0.82em;
-}
-
-.pagination > .pagination-control > .control-box {
-    -fx-padding: 5px 0 0 0;
-    -fx-spacing: 2;
-    -fx-alignment: center;
-}
-
-.pagination > .pagination-control > .control-box > .left-arrow-button {
-    -fx-background-radius: 3 0 0 3, 3 0 0 3, 2 0 0 2, 1 0 0 1;
-    -fx-background-insets: 0 0 -1 5, 0 0 0 5, 1 1 1 6, 2 2 2 7;
-    -fx-padding: 0em 0.417em 0em 0.833em; /* 0 5 0 10 */
-}
-
-.pagination > .pagination-control > .control-box > .right-arrow-button {
-    -fx-background-radius: 0 3 3 0, 0 3 3 0, 0 2 2 0, 0 1 1 0;
-    -fx-background-insets: 0 5 -1 0, 0 5 0 0, 1 6 1 1, 2 7 2 2;
-    -fx-padding: 0em 0.75em 0em 0.417em; /* 0 9 0 5 */
-}
-
-.pagination > .pagination-control .left-arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.375em 0.291em 0.375em 0.291em;
-    -fx-shape: "M 0 0 L -13 7 L 0 13 z";
-    -fx-scale-shape: true;
-}
-
-.pagination > .pagination-control .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.375em 0.291em 0.375em 0.291em;
-    -fx-shape: "M 0 0 L 13 7 L 0 13 z";
-    -fx-scale-shape: true;
-}
-
-.pagination > .pagination-control > .control-box > .bullet-button {
-    -fx-background-radius: 0, 4em, 4em, 4em, 4em;
-    -fx-padding: 0.333em;
-    -fx-background-color: transparent, -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0, 5, 6, 7;
-}
-
-.pagination > .pagination-control > .control-box > .bullet-button:selected {
-    -fx-base: -fx-accent;
-}
-
-.pagination.bullet > .pagination-control > .control-box {
-    -fx-spacing: 0;
-    -fx-alignment: center;
-}
-
-.pagination.bullet > .pagination-control > .control-box > .left-arrow-button {
-    -fx-background-radius: 4em;
-    -fx-background-insets: 0, 1, 2;
-    -fx-padding: 0em 0.25em 0em 0.083em; /* 0 3 0 1 */
-}
-
-.pagination.bullet > .pagination-control > .control-box > .right-arrow-button {
-    -fx-background-radius: 4em;
-    -fx-background-insets: 0, 1, 2;
-    -fx-padding: 0em 0.083em 0em 0.25em; /* 0 1 0 3 */
-}
-
-.pagination > .pagination-control > .control-box > .number-button {
-    -fx-background-radius: 0;
-    -fx-padding: 0.166667em 0.25em 0.25em 0.333em;
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-
-.pagination > .pagination-control > .control-box > .number-button:selected {
-    -fx-base: -fx-accent;
-}
-
-.pagination > .pagination-control > .page-information {
-    -fx-padding: 0.416em 0 0 0;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Customised CSS for controls placed directly within cells                    *
- *                                                                             *
- ******************************************************************************/
-
-.cell > .choice-box {
-    -fx-background-color: transparent;
-    -fx-background-insets: 0;
-    -fx-background-radius: 0;
-    -fx-padding: 0.0em 0.5em 0.0em 0.0em; /* 0 6 0 0 */
-    -fx-alignment: CENTER_LEFT;
-    -fx-content-display: LEFT;
-}
-
-.cell > .choice-box > .label {
-    -fx-padding: 0em 0.333333em 0.0em 0.333333; /* 2 4 3 6 */
-}
-
-.cell:focused:selected > .choice-box > .label {
-    -fx-text-fill: white;
-}
-
-.cell:focused:selected > .choice-box > .open-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color, white;
-}
-
-/*******************************************************************************
- *                                                                             *
- * List, Tree, Table COMMON                                                    *
- *                                                                             *
- ******************************************************************************/
-
-/* remove double borders from scrollbars */
-.list-view > .virtual-flow > .scroll-bar:vertical,
-.tree-view > .virtual-flow > .scroll-bar:vertical,
-.table-view > .virtual-flow > .scroll-bar:vertical,
-.tree-table-view > .virtual-flow > .scroll-bar:vertical {
-    -fx-background-insets: 0, 0 0 0 1;
-    -fx-padding: -1 -1 -1 0;
-}
-
-.list-view > .virtual-flow > .scroll-bar:horizontal,
-.tree-view > .virtual-flow > .scroll-bar:horizontal,
-.table-view > .virtual-flow > .scroll-bar:horizontal,
-.tree-table-view > .virtual-flow > .scroll-bar:horizontal {
-    -fx-background-insets: 0, 1 0 0 0;
-    -fx-padding: 0 -1 -1 -1;
-}
-
-.list-view > .virtual-flow > .corner,
-.tree-view > .virtual-flow > .corner,
-.table-view > .virtual-flow > .corner,
-.tree-table-view > .virtual-flow > .corner {
-    -fx-background-color: derive(-fx-base, -1%);
-}
-
-/* standard cell */
-.list-cell,
-.tree-cell {
-    -fx-background: -fx-control-inner-background;
-    -fx-background-color: -fx-background;
-    -fx-text-fill: -fx-text-background-color;
-}
-
-/* Selected rows */
-.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
-.tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected,
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected,
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell .table-cell:selected,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell .tree-table-cell:selected {
-    -fx-background: -fx-selection-bar;
-    -fx-table-cell-border-color: derive(-fx-selection-bar, 20%);
-}
-
-/* Selected when control is not focused */
-.list-cell:filled:selected,
-.tree-cell:filled:selected,
-.table-row-cell:filled:selected,
-.tree-table-row-cell:filled:selected,
-.table-row-cell:filled > .table-cell:selected,
-.tree-table-row-cell:filled > .tree-table-cell:selected {
-    -fx-background: -fx-selection-bar-non-focused;
-    -fx-table-cell-border-color: derive(-fx-selection-bar-non-focused, 20%);
-}
-
-/* focused cell (keyboard navigation) */
-.list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:focused,
-.tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:focused,
-.table-view:focused:row-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:focused,
-.tree-table-view:focused:row-selection > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:focused,
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:focused,
-.tree-table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell > .tree-table-cell:focused {
-    -fx-background-color: -fx-background, -fx-cell-focus-inner-border, -fx-background;
-    -fx-background-insets: 0, 1, 2;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ListView and ListCell                                                       *
- *                                                                             *
- ******************************************************************************/
-
-.list-cell {
-    -fx-padding: 0.25em 0.583em 0.25em 0.583em; /* 3 7 3 7 */
-}
-
-.list-cell:odd {
-    -fx-background: -fx-control-inner-background-alt;
-}
-
-/*******************************************************************************
- *                                                                             *
- * TreeView and TreeCell                                                       *
- *                                                                             *
- ******************************************************************************/
-
-.tree-cell {
-    -fx-padding: 0.25em; /* 3 */
-    -fx-indent: 1em;
-}
-
-.tree-cell .label {
-    -fx-padding: 0.0em 0.0em 0.0em 0.25em; /* 0 0 0 3 */
-}
-
-.tree-cell > .tree-disclosure-node,
-.tree-table-row-cell > .tree-disclosure-node {
-    -fx-padding: 4 6 4 8;
-    -fx-background-color: transparent;
-}
-
-.tree-cell > .tree-disclosure-node > .arrow,
-.tree-table-row-cell > .tree-disclosure-node > .arrow {
-    -fx-background-color: -fx-text-background-color;
-    -fx-padding: 0.333333em 0.229em 0.333333em 0.229em; /* 4 */
-    -fx-shape: "M 0 -3.5 L 4 0 L 0 3.5 z";
-}
-
-.tree-cell:expanded > .tree-disclosure-node > .arrow,
-.tree-table-row-cell:expanded > .tree-disclosure-node > .arrow {
-    -fx-rotate: 90;
-}
-
-/*******************************************************************************
- *                                                                             *
- * TableView                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.table-view,
-.tree-table-view {
-    /* Constants used throughout the tableview. */
-    -fx-table-header-border-color: -fx-box-border;
-    -fx-table-cell-border-color: derive(-fx-color, 5%);
-}
-
-/***** ROW CELLS **************************************************************/
-/* Each row in the table is a table-row-cell. Inside a table-row-cell is any
-   number of table-cell. */
-.table-row-cell {
-    -fx-background: -fx-control-inner-background;
-    -fx-background-color: -fx-table-cell-border-color, -fx-background;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0;
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.table-row-cell:odd {
-    -fx-background: -fx-control-inner-background-alt;
-}
-
-/***** INDIVIDUAL CELLS ********************************************************/
-.table-cell {
-    -fx-padding: 0.166667em; /* 2px, plus border adds 1px */
-    -fx-background-color: null;
-    -fx-border-color: transparent -fx-table-cell-border-color transparent transparent;
-    -fx-cell-size: 2.0em; /* 24 */
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell .table-cell:selected,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell .tree-table-cell:selected {
-    -fx-background-color: -fx-table-cell-border-color, -fx-background;
-    -fx-background-insets: 0, 0 0 1 0;
-}
-
-/* When in constrained resize mode, the right-most visible cell should not have
-   a right-border, as it is not possible to get this cleanly out of view without
-   introducing horizontal scrollbars (see RT-14886). */
-.table-view:constrained-resize > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:last-visible,
-.tree-table-view:constrained-resize > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell > .tree-table-cell:last-visible {
-    -fx-border-color: transparent;
-}
-
-/***** HEADER **********************************************************************/
-/* The column-resize-line is shown when the user is attempting to resize a column. */
-.table-view .column-resize-line,
-.tree-table-view .column-resize-line {
-    -fx-background: -fx-accent;
-    -fx-background-color: -fx-background;
-    -fx-padding: 0.0em 0.0416667em 0.0em 0.0416667em; /* 0 0.571429 0 0.571429 */
-}
-
-/* This is the area behind the column headers. An ideal place to specify background
-   and border colors for the whole area (not individual column-header's). */
-.table-view .column-header-background,
-.tree-table-view > .column-header-background {
-    -fx-background-color: -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0, 1;
-}
-
-/* The column header row is made up of a number of column-header, one for each
-   TableColumn, and a 'filler' area that extends from the right-most column
-   to the edge of the tableview, or up to the 'column control' button. */
-.table-view .column-header,
-.tree-table-view .column-header,
-.table-view .filler,
-.tree-table-view .filler,
-.table-view > .column-header-background > .show-hide-columns-button,
-.tree-table-view > .column-header-background > .show-hide-columns-button,
-.table-view:constrained-resize .filler,
-.tree-table-view:constrained-resize .filler {
-    -fx-background-color: -fx-box-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0, 0 1 1 0, 1 2 2 1;
-    -fx-font-weight: bold;
-    -fx-size: 2em;
-    -fx-text-fill: -fx-selection-bar-text;
-    -fx-padding: 0.166667em;
-}
-
-.table-view .filler,
-.tree-table-view .filler,
-.table-view:constrained-resize .filler,
-.tree-table-view:constrained-resize .filler {
-    -fx-background-insets: 0, 0 0 1 0, 1 1 2 1;
-}
-
-.table-view > .column-header-background > .show-hide-columns-button,
-.tree-table-view > .column-header-background > .show-hide-columns-button {
-    -fx-background-insets: 0, 0 0 1 1, 1 1 2 2;
-}
-
-.table-view .column-header .sort-order-dots-container,
-.tree-table-view .column-header .sort-order-dots-container {
-    -fx-padding: 2 0 2 0;
-}
-
-.table-view .column-header .sort-order,
-.tree-table-view .column-header .sort-order {
-    -fx-font-size: 0.916667em; /* 11pt - 1 less than the default font */
-}
-
-.table-view .column-header .sort-order-dot,
-.tree-table-view .column-header .sort-order-dot {
-    -fx-background-color: -fx-mark-color;
-    -fx-padding: 0.115em;
-    -fx-background-radius: 0.115em;
-}
-
-.table-view .column-header .label,
-.tree-table-view .column-header .label {
-    -fx-alignment: center;
-}
-
-/* Plus Symbol */
-.table-view .show-hide-column-image,
-.tree-table-view .show-hide-column-image {
-    -fx-background-color: -fx-mark-color;
-    -fx-padding: 0.25em; /* 3px */
-    -fx-shape: "M398.902,298.045c0.667,0,1.333,0,2,0c0,0.667,0,1.333,0,2c0.667,0,1.333,0,2,0c0,0.667,0,1.333,0,2c-0.667,0-1.333,0-2,0c0,0.666,0,1.332,0,1.999c-0.667,0-1.333,0-2,0c0-0.667,0-1.333,0-1.999c-0.666,0-1.333,0-1.999,0c0-0.667,0-1.334,0-2c0.666,0,1.333,0,1.999,0C398.902,299.378,398.902,298.711,398.902,298.045z";
-}
-
-/* When a column is being 'dragged' to be placed in a different position, there
-   is a region that follows along the column header area to indicate where the
-   column will be dropped. This region can be styled using the .column-drag-header
-   name. */
-.table-view .column-drag-header,
-.tree-table-view .column-drag-header {
-    -fx-background: -fx-accent;
-    -fx-background-color: -fx-selection-bar;
-    -fx-border-color: transparent;
-    -fx-opacity: 0.6;
-}
-
-/* Semi-transparent overlay to indicate the column that is currently being moved */
-.table-view .column-overlay,
-.tree-table-view .column-overlay {
-    -fx-background-color: darkgray;
-    -fx-opacity: 0.3;
-}
-
-/* Header Sort Arrows */
-.table-view /*> column-header-background > nested-column-header >*/   .arrow,
-.tree-table-view /*> column-header-background > nested-column-header >*/   .arrow {
-    -fx-background-color: -fx-mark-color;
-    -fx-padding: 0.25em 0.3125em 0.25em 0.3125em; /* 3 3.75 3 3.75 */
-    -fx-shape: "M 0 0 h 7 l -3.5 4 z";
-}
-
-/* This is shown when the table has no rows and/or no columns. */
-.table-view .empty-table,
-.tree-table-view .empty-table {
-    -fx-background-color: white;
-    -fx-font-size: 1.166667em; /* 14pt - 2 more than the default font */
-}
-
-/*******************************************************************************
- *                                                                             *
- * Table Cells                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.check-box-table-cell {
-    -fx-alignment: center;
-    -fx-padding: 0;
-}
-
-.check-box-table-cell > .check-box {
-    -fx-font-size: 0.8em;
-    -fx-opacity: 1;
-    -fx-padding: 0 0 1 0;
-}
-
-.check-box-table-cell > .check-box > .box {
-    -fx-background-color: -fx-outer-border, -fx-background;
-    -fx-background-insets: 0, 1;
-}
-
-.check-box-table-cell > .check-box:selected > .box > .mark {
-    -fx-background-color: -fx-text-background-color;
-    -fx-background-insets: 0;
-}
-
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
-    -fx-background-color: derive(-fx-accent, 40%), -fx-background;
-}
-
-/*******************************************************************************
- *                                                                             *
- * TreeTableView                                                               *
- *                                                                             *
- * Note: A lot of the CSS for TreeTableView is included with the TreeView and  *
- * TableView CSS styles elsewhere in modena.css (as they are the same, just   *
- * targeting different CSS style classes).                                     *
- ******************************************************************************/
-
-.tree-table-row-cell {
-    -fx-background: -fx-control-inner-background;
-    -fx-background-color: -fx-background;
-    -fx-padding: 0;
-    -fx-text-fill: -fx-text-background-color;
-    -fx-indent: 1em;
-}
-
-.tree-table-cell {
-    /* tree-table-cell needs slightly different padding to make the text sit at
-    the right height for the arrow */
-    -fx-padding: 0.25em 0.166667em 0.083em 0.166667em; /* 3 2 1 2 , plus border adds 1px */
-    -fx-background-color: null;
-    -fx-border-color: transparent -fx-table-cell-border-color transparent transparent;
-    -fx-cell-size: 2.0em; /* 24 */
-    -fx-text-fill: -fx-text-background-color;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Tooltip                                                                     *
- *                                                                             *
- ******************************************************************************/
-
-.tooltip {
-    -fx-background: rgba(30, 30, 30);
-    -fx-text-fill: white;
-    -fx-background-color: rgba(30, 30, 30, 0.8);
-    -fx-background-radius: 6px;
-    -fx-background-insets: 0;
-    -fx-padding: 0.667em 0.75em 0.667em 0.75em; /* 10px */
-    -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 10, 0.0, 0, 3);
-    -fx-font-size: 0.85em;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Charts                                                                      *
- *                                                                             *
- ******************************************************************************/
-
-.chart {
-    -fx-padding: 5px;
-}
-
-.chart-content {
-    -fx-padding: 10px;
-}
-
-.chart-title {
-    -fx-font-size: 1.4em;
-}
-
-.chart-legend {
-    -fx-background-color: -fx-shadow-highlight-color,
-    linear-gradient(to bottom, derive(-fx-background, -10%), derive(-fx-background, -5%)),
-    linear-gradient(from 0px 0px to 0px 4px, derive(-fx-background, -4%), derive(-fx-background, 10%));
-    -fx-background-insets: 0 0 -1 0, 0, 1;
-    -fx-background-radius: 4, 4, 3;
-    -fx-padding: 6px;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Axis                                                                        *
- *                                                                             *
- ******************************************************************************/
-
-.axis {
-    AXIS_COLOR: derive(-fx-background, -20%);
-    -fx-tick-label-font-size: 0.833333em; /* 10px */
-    -fx-tick-label-fill: derive(-fx-text-background-color, 30%);
-}
-
-.axis:top {
-    -fx-border-color: transparent transparent AXIS_COLOR transparent;
-}
-
-.axis:right {
-    -fx-border-color: transparent transparent transparent AXIS_COLOR;
-}
-
-.axis:bottom {
-    -fx-border-color: AXIS_COLOR transparent transparent transparent;
-}
-
-.axis:left {
-    -fx-border-color: transparent AXIS_COLOR transparent transparent;
-}
-
-.axis:top > .axis-label,
-.axis:left > .axis-label {
-    -fx-padding: 0 0 4px 0;
-}
-
-.axis:bottom > .axis-label,
-.axis:right > .axis-label {
-    -fx-padding: 4px 0 0 0;
-}
-
-.axis-tick-mark,
-.axis-minor-tick-mark {
-    -fx-fill: null;
-    -fx-stroke: AXIS_COLOR;
-}
-
-/*******************************************************************************
- *                                                                             *
- * ChartPlot                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.chart-vertical-grid-lines {
-    -fx-stroke: derive(-fx-background, -10%);
-    -fx-stroke-dash-array: 0.25em, 0.25em;
-}
-
-.chart-horizontal-grid-lines {
-    -fx-stroke: derive(-fx-background, -10%);
-    -fx-stroke-dash-array: 0.25em, 0.25em;
-}
-
-.chart-alternative-column-fill {
-    -fx-fill: null;
-    -fx-stroke: null;
-}
-
-.chart-alternative-row-fill {
-    -fx-fill: null;
-    -fx-stroke: null;
-}
-
-.chart-vertical-zero-line,
-.chart-horizontal-zero-line {
-    -fx-stroke: derive(-fx-text-background-color, 40%);
-}
-
-/*******************************************************************************
- *                                                                             *
- * ScatterChart                                                                *
- *                                                                             *
- ******************************************************************************/
-
-.chart-symbol {
-    /* solid circle */
-    -fx-background-color: CHART_COLOR_1;
-    -fx-background-radius: 5px;
-    -fx-padding: 5px;
-}
-
-.default-color1.chart-symbol {
-    /* solid square */
-    -fx-background-color: CHART_COLOR_2;
-    -fx-background-radius: 0;
-}
-
-.default-color2.chart-symbol {
-    /* solid diamond */
-    -fx-background-color: CHART_COLOR_3;
-    -fx-background-radius: 0;
-    -fx-padding: 7px 5px 7px 5px;
-    -fx-shape: "M5,0 L10,9 L5,18 L0,9 Z";
-}
-
-.default-color3.chart-symbol {
-    /* cross */
-    -fx-background-color: CHART_COLOR_4;
-    -fx-background-radius: 0;
-    -fx-background-insets: 0;
-    -fx-shape: "M2,0 L5,4 L8,0 L10,0 L10,2 L6,5 L10,8 L10,10 L8,10 L5,6 L2,10 L0,10 L0,8 L4,5 L0,2 L0,0 Z";
-}
-
-.default-color4.chart-symbol {
-    /* solid triangle */
-    -fx-background-color: CHART_COLOR_5;
-    -fx-background-radius: 0;
-    -fx-background-insets: 0;
-    -fx-shape: "M5,0 L10,8 L0,8 Z";
-}
-
-.default-color5.chart-symbol {
-    /* hollow circle */
-    -fx-background-color: CHART_COLOR_6, white;
-    -fx-background-insets: 0, 2;
-    -fx-background-radius: 5px;
-    -fx-padding: 5px;
-}
-
-.default-color6.chart-symbol {
-    /* hollow square */
-    -fx-background-color: CHART_COLOR_7, white;
-    -fx-background-insets: 0, 2;
-    -fx-background-radius: 0;
-}
-
-.default-color7.chart-symbol {
-    /* hollow diamond */
-    -fx-background-color: CHART_COLOR_8, white;
-    -fx-background-radius: 0;
-    -fx-background-insets: 0, 2.5;
-    -fx-padding: 7px 5px 7px 5px;
-    -fx-shape: "M5,0 L10,9 L5,18 L0,9 Z";
-}
-
-/*******************************************************************************
- *                                                                             *
- * LineChart                                                                     *
- *                                                                             *
- ******************************************************************************/
-
-.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_1, white;
-    -fx-background-insets: 0, 2;
-    -fx-background-radius: 5px;
-    -fx-padding: 5px;
-}
-
-.chart-series-line {
-    -fx-stroke: CHART_COLOR_1;
-    -fx-stroke-width: 3px;
-}
-
-.default-color0.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_1, white;
-}
-
-.default-color1.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_2, white;
-}
-
-.default-color2.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_3, white;
-}
-
-.default-color3.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_4, white;
-}
-
-.default-color4.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_5, white;
-}
-
-.default-color5.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_6, white;
-}
-
-.default-color6.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_7, white;
-}
-
-.default-color7.chart-line-symbol {
-    -fx-background-color: CHART_COLOR_8, white;
-}
-
-.default-color0.chart-series-line {
-    -fx-stroke: CHART_COLOR_1;
-}
-
-.default-color1.chart-series-line {
-    -fx-stroke: CHART_COLOR_2;
-}
-
-.default-color2.chart-series-line {
-    -fx-stroke: CHART_COLOR_3;
-}
-
-.default-color3.chart-series-line {
-    -fx-stroke: CHART_COLOR_4;
-}
-
-.default-color4.chart-series-line {
-    -fx-stroke: CHART_COLOR_5;
-}
-
-.default-color5.chart-series-line {
-    -fx-stroke: CHART_COLOR_6;
-}
-
-.default-color6.chart-series-line {
-    -fx-stroke: CHART_COLOR_7;
-}
-
-.default-color7.chart-series-line {
-    -fx-stroke: CHART_COLOR_8;
-}
-
-/*******************************************************************************
- *                                                                             *
- * AreaChart                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_1, white;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 4px; /* makes sure this remains circular */
-    -fx-padding: 3px;
-}
-
-.default-color0.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_1, white;
-}
-
-.default-color1.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_2, white;
-}
-
-.default-color2.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_3, white;
-}
-
-.default-color3.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_4, white;
-}
-
-.default-color4.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_5, white;
-}
-
-.default-color5.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_6, white;
-}
-
-.default-color6.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_7, white;
-}
-
-.default-color7.chart-area-symbol {
-    -fx-background-color: CHART_COLOR_8, white;
-}
-
-.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_1;
-    -fx-stroke-width: 1px;
-}
-
-.default-color0.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_1;
-}
-
-.default-color1.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_2;
-}
-
-.default-color2.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_3;
-}
-
-.default-color3.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_4;
-}
-
-.default-color4.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_5;
-}
-
-.default-color5.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_6;
-}
-
-.default-color6.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_7;
-}
-
-.default-color7.chart-series-area-line {
-    -fx-stroke: CHART_COLOR_8;
-}
-
-.chart-series-area-fill {
-    -fx-stroke: null;
-    -fx-fill: CHART_COLOR_1_TRANS_20;
-}
-
-.default-color0.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_1_TRANS_20;
-}
-
-.default-color1.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_2_TRANS_20;
-}
-
-.default-color2.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_3_TRANS_20;
-}
-
-.default-color3.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_4_TRANS_20;
-}
-
-.default-color4.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_5_TRANS_20;
-}
-
-.default-color5.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_6_TRANS_20;
-}
-
-.default-color6.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_7_TRANS_20;
-}
-
-.default-color7.chart-series-area-fill {
-    -fx-fill: CHART_COLOR_8_TRANS_20;
-}
-
-.area-legend-symbol {
-    -fx-padding: 6px;
-    -fx-background-radius: 6px; /* makes sure this remains circular */
-    -fx-background-insets: 0, 3;
-}
-
-/*******************************************************************************
- *                                                                             *
- * BubbleChart                                                                 *
- *                                                                             *
- ******************************************************************************/
-
-.bubble-legend-symbol {
-    -fx-background-radius: 8px;
-    -fx-padding: 8px;
-}
-
-.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_1_TRANS_70;
-    -fx-background-color: radial-gradient(center 50% 50%, radius 80%, derive(-fx-bubble-fill, 20%), derive(-fx-bubble-fill, -30%));
-}
-
-.default-color0.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_1_TRANS_70;
-}
-
-.default-color1.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_2_TRANS_70;
-}
-
-.default-color2.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_3_TRANS_70;
-}
-
-.default-color3.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_4_TRANS_70;
-}
-
-.default-color4.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_5_TRANS_70;
-}
-
-.default-color5.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_6_TRANS_70;
-}
-
-.default-color6.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_7_TRANS_70;
-}
-
-.default-color7.chart-bubble {
-    -fx-bubble-fill: CHART_COLOR_8_TRANS_70;
-}
-
-/*******************************************************************************
- *                                                                             *
- * BarChart                                                                    *
- *                                                                             *
- ******************************************************************************/
-
-.chart-bar {
-    -fx-bar-fill: CHART_COLOR_1;
-    -fx-background-color: linear-gradient(to right,
-    derive(-fx-bar-fill, -4%),
-    derive(-fx-bar-fill, -1%),
-    derive(-fx-bar-fill, 0%),
-    derive(-fx-bar-fill, -1%),
-    derive(-fx-bar-fill, -6%)
-    );
-    -fx-background-insets: 0;
-}
-
-.chart-bar.negative {
-    -fx-background-insets: 1 0 0 0;
-}
-
-.bar-chart:horizontal .chart-bar {
-    -fx-background-insets: 0 0 0 1;
-}
-
-.bar-chart:horizontal .chart-bar,
-.stacked-bar-chart:horizontal .chart-bar {
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-bar-fill, -4%),
-    derive(-fx-bar-fill, -1%),
-    derive(-fx-bar-fill, 0%),
-    derive(-fx-bar-fill, -1%),
-    derive(-fx-bar-fill, -6%)
-    );
-}
-
-.default-color0.chart-bar {
-    -fx-bar-fill: CHART_COLOR_1;
-}
-
-.default-color1.chart-bar {
-    -fx-bar-fill: CHART_COLOR_2;
-}
-
-.default-color2.chart-bar {
-    -fx-bar-fill: CHART_COLOR_3;
-}
-
-.default-color3.chart-bar {
-    -fx-bar-fill: CHART_COLOR_4;
-}
-
-.default-color4.chart-bar {
-    -fx-bar-fill: CHART_COLOR_5;
-}
-
-.default-color5.chart-bar {
-    -fx-bar-fill: CHART_COLOR_6;
-}
-
-.default-color6.chart-bar {
-    -fx-bar-fill: CHART_COLOR_7;
-}
-
-.default-color7.chart-bar {
-    -fx-bar-fill: CHART_COLOR_8;
-}
-
-.bar-legend-symbol {
-    -fx-padding: 8px;
-}
-
-/*******************************************************************************
- *                                                                             *
- * PieChart                                                                    *
- *                                                                             *
- ******************************************************************************/
-
-.chart-pie {
-    -fx-pie-color: CHART_COLOR_1;
-    -fx-background-color: radial-gradient(radius 100%, derive(-fx-pie-color, 20%), derive(-fx-pie-color, -10%));
-    -fx-background-insets: 1;
-    -fx-border-color: -fx-background;
-}
-
-.chart-pie-label {
-    -fx-padding: 3px;
-}
-
-.chart-pie-label-line {
-    -fx-stroke: derive(-fx-background, -20%);
-}
-
-.default-color0.chart-pie {
-    -fx-pie-color: CHART_COLOR_1;
-}
-
-.default-color1.chart-pie {
-    -fx-pie-color: CHART_COLOR_2;
-}
-
-.default-color2.chart-pie {
-    -fx-pie-color: CHART_COLOR_3;
-}
-
-.default-color3.chart-pie {
-    -fx-pie-color: CHART_COLOR_4;
-}
-
-.default-color4.chart-pie {
-    -fx-pie-color: CHART_COLOR_5;
-}
-
-.default-color5.chart-pie {
-    -fx-pie-color: CHART_COLOR_6;
-}
-
-.default-color6.chart-pie {
-    -fx-pie-color: CHART_COLOR_7;
-}
-
-.default-color7.chart-pie {
-    -fx-pie-color: CHART_COLOR_8;
-}
-
-.negative.chart-pie {
-    -fx-pie-color: transparent;
-    -fx-background-color: white;
-}
-
-.pie-legend-symbol.chart-pie {
-    -fx-background-radius: 8px;
-    -fx-padding: 8px;
-    -fx-border-color: null;
-}
-
-/*******************************************************************************
- *                                                                             *
- * Combinations                                                                *
- *                                                                             *
- * This section is for special handling of when one control is nested inside   *
- * another control. There are many cases where we would end up with ugly       *
- * double borders that are fixed here.                                         *
- *                                                                             *
- ******************************************************************************/
-
-.tab-pane > * > .table-view,
-.tab-pane > * > .tree-table-view,
-.tab-pane > * > .list-view,
-.tab-pane > * > .tree-view,
-.tab-pane > * > .scroll-pane,
-.tab-pane > * > .split-pane,
-.tab-pane > * > .text-area,
-.tab-pane > * > .html-editor,
-.split-pane > * > .tab-pane,
-.split-pane > * > .table-view,
-.split-pane > * > .tree-table-view,
-.split-pane > * > .list-view,
-.split-pane > * > .tree-view,
-.split-pane > * > .scroll-pane,
-.split-pane > * > .split-pane,
-.split-pane > * > .text-area,
-.split-pane > * > .html-editor {
-    -fx-background-insets: 0, 0;
-    -fx-padding: 0;
-}
-
-.tab-pane.floating > * > .table-view,
-.tab-pane.floating > * > .tree-table-view,
-.tab-pane.floating > * > .list-view,
-.tab-pane.floating > * > .tree-view,
-.tab-pane.floating > * > .scroll-pane,
-.tab-pane.floating > * > .split-pane,
-.tab-pane.floating > * > .text-area,
-.tab-pane.floating > * > .html-editor {
-    -fx-background-insets: 0, 0;
-    -fx-padding: -1;
-}
-
-.split-pane > * > .accordion > .titled-pane > *.content {
-    -fx-border-color: null;
-    -fx-border-insets: 0;
-}
-
-.split-pane > * > .accordion > .titled-pane > .title {
-    -fx-background-insets: 0, 1 0 1 0, 2 1 2 1;
-}
-
-.split-pane > * > .accordion > .first-titled-pane > .title {
-    -fx-background-insets: 0, 0 0 1 0, 1 1 2 1;
-}
-
-.split-pane > * > .accordion > .titled-pane:collapsed > .title {
-    -fx-background-insets: 0, 1 0 0 0, 2 1 1 1;
-}
-
-.split-pane > * > .accordion > .first-titled-pane:collapsed > .title {
-    -fx-background-insets: 0, 0 0 0 0, 1 1 1 1;
-}
-
-.titled-pane > * > * > .split-pane,
-.titled-pane > * > * > .text-area,
-.titled-pane > * > * > .html-editor,
-.titled-pane > * > * > .list-view,
-.titled-pane > * > * > .tree-view,
-.titled-pane > * > * > .table-view,
-.titled-pane > * > * > .tree-table-view,
-.titled-pane > * > * > .scroll-pane {
-    -fx-background-color: null;
-    -fx-background-insets: 0, 0;
-    -fx-padding: 0;
-}
-
-.titled-pane > * > * > AnchorPane,
-.titled-pane > * > * > BorderPane,
-.titled-pane > * > * > FlowPane,
-.titled-pane > * > * > GridPane,
-.titled-pane > * > * > HBox,
-.titled-pane > * > * > Pane,
-.titled-pane > * > * > StackPane,
-.titled-pane > * > * > TilePane,
-.titled-pane > * > * > VBox {
-    -fx-padding: 0.8em;
-}
-
-/*******************************************************************************
- *                                                                             *
- * DatePicker                                                                  *
- *                                                                             *
- ******************************************************************************/
-
-.date-picker > .arrow-button > .arrow {
-    -fx-shape: "M0,0v9h9V0H0z M2,8H1V7h1V8z M2,6H1V5h1V6z M2,4H1V3h1V4z M4,8H3V7h1V8z M4,6H3V5h1V6z M4,4H3V3h1V4z M6,8H5V7h1V8z M6,6H5 V5h1V6z M6,4H5V3h1V4z M8,8H7V7h1V8z M8,6H7V5h1V6z M8,4H7V3h1V4z";
-    -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.416667em 0.416667em 0.333333em 0.333333em; /* 5 5 4 4 */
-    -fx-scale-shape: true;
-}
-
-.date-picker-popup {
-    -fx-background-color: linear-gradient(to bottom,
-    derive(-fx-color, -17%),
-    derive(-fx-color, -30%)
-    ),
-    -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 0;
-    -fx-alignment: CENTER; /* VBox */
-    -fx-spacing: 0; /* VBox */
-    -fx-padding: 0.083333em; /* 1 1 1 1 */
-    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
-}
-
-.date-picker-popup > .month-year-pane {
-    -fx-padding: 0.588883em 0.5em 0.666667em 0.5em; /* 7 6 8 6 */
-    -fx-background-color: derive(-fx-box-border, 30%), linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
-    -fx-background-insets: 0 0 0 0, 0 0 1 0;
-}
-
-.date-picker-popup > * > .spinner {
-    -fx-spacing: 0.25em; /* 3 */
-    -fx-alignment: CENTER;
-    -fx-fill-height: false;
-}
-
-.date-picker-popup > * > .spinner > .button {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0, 1, 2;
-    -fx-color: transparent;
-    -fx-background-radius: 0;
-}
-
-.date-picker-popup > * > .spinner > .button:focused {
-    -fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-    -fx-color: -fx-hover-base;
-    -fx-background-insets: -0.2, 1, 2, -1.4, 2.6;
-}
-
-.date-picker-popup > * > .spinner > .button:hover {
-    -fx-color: -fx-hover-base;
-}
-
-.date-picker-popup > * > .spinner > .button:armed {
-    -fx-color: -fx-pressed-base;
-}
-
-.date-picker-popup > * > .spinner > .left-button {
-    -fx-padding: 0 0.333333em 0 0.25em; /* 0 4 0 3 */
-}
-
-.date-picker-popup > * > .spinner > .right-button {
-    -fx-padding: 0 0.25em 0 0.333333em; /* 0 3 0 4 */
-}
-
-.date-picker-popup > * > .spinner > .button > .left-arrow,
-.date-picker-popup > * > .spinner > .button > .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -45%);
-    -fx-background-insets: 1 0 -1 0, 0;
-    -fx-padding: 0.333333em 0.166667em 0.333333em 0.166667em; /* 4 2 4 2 */
-    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
-}
-
-.date-picker-popup > * > .spinner > .button:hover > .left-arrow,
-.date-picker-popup > * > .spinner > .button:hover > .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -50%);
-}
-
-.date-picker-popup > * > .spinner > .button:pressed > .left-arrow,
-.date-picker-popup > * > .spinner > .button:pressed > .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -55%);
-}
-
-.date-picker-popup > * > .spinner > .button > .left-arrow {
-    -fx-padding: 0.333333em 0.25em 0.333333em 0.166667em; /* 4 3 4 2 */
-    -fx-shape: "M5.997,5.072L5.995,6.501l-2.998-4l2.998-4l0.002,1.43l-1.976,2.57L5.997,5.072z";
-    -fx-scale-shape: true;
-}
-
-.date-picker-popup > * > .spinner > .button > .right-arrow {
-    -fx-padding: 0.333333em 0.25em 0.333333em 0.166667em; /* 4 3 4 2 */
-    -fx-shape: "M2.998-0.07L3-1.499l2.998,4L3,6.501l-0.002-1.43l1.976-2.57L2.998-0.07z";
-    -fx-scale-shape: true;
-}
-
-.date-picker-popup > * > .spinner > .label {
-    -fx-alignment: CENTER;
-}
-
-.date-picker-popup > .month-year-pane > .secondary-label {
-    -fx-alignment: BASELINE_CENTER;
-    -fx-padding: 0.5em 0 0 0; /* 6 0 0 0 */
-    -fx-text-fill: #f3622d;
-}
-
-.date-picker-popup > .calendar-grid {
-    -fx-background-color: derive(-fx-selection-bar-non-focused, 60%);
-    /*-fx-background-insets: 1 0 0 0;*/
-    -fx-padding: 0;
-}
-
-.date-picker-popup > * > .date-cell {
-    -fx-background-color: transparent;
-    -fx-background-insets: 1, 2;
-    -fx-padding: 0;
-    -fx-alignment: BASELINE_CENTER;
-    -fx-opacity: 1.0;
-}
-
-.date-picker-popup > * > .day-name-cell,
-.date-picker-popup > * > .week-number-cell {
-    -fx-font-size: 0.916667em;
-}
-
-.date-picker-popup > * > .week-number-cell {
-    -fx-padding: 0.333333em 0.583333em 0.333333em 0.583333em; /* 4 7 4 7 */
-    -fx-border-color: -fx-control-inner-background;
-    -fx-border-width: 1px;
-    -fx-background: -fx-control-inner-background;
-    -fx-background-color: -fx-background;
-    -fx-text-fill: -fx-accent;
-}
-
-.date-picker-popup > * > .day-cell {
-    -fx-padding: 0.333333em 0.583333em 0.333333em 0.583333em; /* 4 7 4 7 */
-    -fx-border-color: derive(-fx-selection-bar-non-focused, 60%);
-    -fx-border-width: 1px;
-    -fx-font-size: 1em;
-    -fx-background: -fx-control-inner-background;
-    -fx-background-color: -fx-background;
-    -fx-text-fill: -fx-text-background-color;
-}
-
-.date-picker-popup > * > .hijrah-day-cell {
-    -fx-alignment: TOP_LEFT;
-    -fx-padding: 0.083333em 0.333333em 0.083333em 0.333333em; /* 1 4 1 4 */
-    -fx-cell-size: 2.75em;
-}
-
-.date-picker-popup > * > .day-cell > .secondary-text {
-    -fx-fill: #f3622d;
-}
-
-.date-picker-popup > * > .today {
-    -fx-background-color: -fx-control-inner-background, derive(-fx-selection-bar-non-focused, -20%), -fx-control-inner-background;
-    -fx-background-insets: 1, 2, 3;
-}
-
-.date-picker-popup > * > .day-cell:hover,
-.date-picker-popup > * > .selected,
-.date-picker-popup > * > .previous-month.selected,
-.date-picker-popup > * > .next-month.selected {
-    -fx-background: -fx-selection-bar;
-}
-
-.date-picker-popup > * > .previous-month:hover,
-.date-picker-popup > * > .next-month:hover {
-    -fx-background: -fx-selection-bar-non-focused;
-}
-
-.date-picker-popup > * > .today:hover,
-.date-picker-popup > * > .today.selected {
-    -fx-background-color: -fx-selection-bar, derive(-fx-selection-bar-non-focused, -20%), -fx-selection-bar;
-}
-
-.date-picker-popup > * > .day-cell:focused,
-.date-picker-popup > * > .today:focused {
-    -fx-background-color: -fx-control-inner-background, -fx-cell-focus-inner-border, -fx-control-inner-background;
-    -fx-background-insets: 1, 2, 3;
-}
-
-.date-picker-popup > * > .day-cell:focused:hover,
-.date-picker-popup > * > .today:focused:hover,
-.date-picker-popup > * > .selected:focused,
-.date-picker-popup > * > .today.selected:focused {
-    -fx-background-color: -fx-selection-bar, -fx-cell-focus-inner-border, -fx-selection-bar;
-}
-
-.date-picker-popup > * > .previous-month,
-.date-picker-popup > * > .next-month {
-    -fx-background: derive(-fx-control-inner-background, -4%);
-}
-
-.date-picker-popup > * > .day-cell:hover > .secondary-text,
-.date-picker-popup > * > .previous-month > .secondary-text,
-.date-picker-popup > * > .next-month > .secondary-text,
-.date-picker-popup > * > .selected > .secondary-text {
-    -fx-fill: -fx-text-background-color;
-}
-
-.date-picker-popup > * > .previous-month.today,
-.date-picker-popup > * > .next-month.today {
-    -fx-background-color: derive(-fx-control-inner-background, -4%), derive(-fx-selection-bar-non-focused, -20%), derive(-fx-control-inner-background, -4%);
-}
-
-.date-picker-popup > * > .previous-month.today:hover,
-.date-picker-popup > * > .next-month.today:hover {
-    -fx-background-color: -fx-selection-bar-non-focused, derive(-fx-selection-bar-non-focused, -20%), -fx-selection-bar-non-focused;
-}
diff --git a/core/src/main/java/io/bitsquare/util/MessageHandler.java b/core/src/main/java/io/bitsquare/network/MessageHandler.java
similarity index 96%
rename from core/src/main/java/io/bitsquare/util/MessageHandler.java
rename to core/src/main/java/io/bitsquare/network/MessageHandler.java
index eac501e2ef..5b366bb73a 100644
--- a/core/src/main/java/io/bitsquare/util/MessageHandler.java
+++ b/core/src/main/java/io/bitsquare/network/MessageHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util;
+package io.bitsquare.network;
 
 public interface MessageHandler {
 
diff --git a/core/src/main/java/io/bitsquare/offer/Offer.java b/core/src/main/java/io/bitsquare/offer/Offer.java
index 7efe7d5de1..6859ac8a5b 100644
--- a/core/src/main/java/io/bitsquare/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/offer/Offer.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.offer;
 
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.btc.Restrictions;
 import io.bitsquare.locale.Country;
 
@@ -71,7 +71,7 @@ public class Offer implements Serializable {
     private final Coin minAmount;
     //TODO use hex string
     private final PublicKey messagePublicKey;
-    private final BankAccountType bankAccountType;
+    private final FiatAccountType fiatAccountType;
     private final Country bankAccountCountry;
 
     private final Coin securityDeposit;
@@ -99,7 +99,7 @@ public class Offer implements Serializable {
                  long fiatPrice,
                  Coin amount,
                  Coin minAmount,
-                 BankAccountType bankAccountType,
+                 FiatAccountType fiatAccountType,
                  Currency currency,
                  Country bankAccountCountry,
                  String bankAccountUID,
@@ -113,7 +113,7 @@ public class Offer implements Serializable {
         this.fiatPrice = fiatPrice;
         this.amount = amount;
         this.minAmount = minAmount;
-        this.bankAccountType = bankAccountType;
+        this.fiatAccountType = fiatAccountType;
         this.currency = currency;
         this.bankAccountCountry = bankAccountCountry;
         this.bankAccountUID = bankAccountUID;
@@ -167,8 +167,8 @@ public class Offer implements Serializable {
         return direction == Direction.BUY ? Direction.SELL : Direction.BUY;
     }
 
-    public BankAccountType getBankAccountType() {
-        return bankAccountType;
+    public FiatAccountType getFiatAccountType() {
+        return fiatAccountType;
     }
 
     public Currency getCurrency() {
@@ -280,7 +280,7 @@ public class Offer implements Serializable {
                 ", amount=" + amount +
                 ", minAmount=" + minAmount +
                 ", messagePubKey=" + messagePublicKey.hashCode() +
-                ", bankAccountTypeEnum=" + bankAccountType +
+                ", bankAccountTypeEnum=" + fiatAccountType +
                 ", bankAccountCountryLocale=" + bankAccountCountry +
                 ", securityDeposit=" + securityDeposit +
                 ", acceptedCountryLocales=" + acceptedCountries +
diff --git a/core/src/main/java/io/bitsquare/offer/OfferBook.java b/core/src/main/java/io/bitsquare/offer/OfferBook.java
index 009d0255b3..afb7a7eef2 100644
--- a/core/src/main/java/io/bitsquare/offer/OfferBook.java
+++ b/core/src/main/java/io/bitsquare/offer/OfferBook.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.offer;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.gui.main.trade.offerbook.OfferBookListItem;
 import io.bitsquare.locale.Country;
 import io.bitsquare.locale.CurrencyUtil;
@@ -56,7 +56,7 @@ public class OfferBook {
 
     private final ObservableList<OfferBookListItem> offerBookListItems = FXCollections.observableArrayList();
     private final OfferBookService.Listener offerBookServiceListener;
-    private final ChangeListener<BankAccount> bankAccountChangeListener;
+    private final ChangeListener<FiatAccount> bankAccountChangeListener;
     private final ChangeListener<Number> invalidationListener;
     private String fiatCode;
     private AnimationTimer pollingTimer;
@@ -134,11 +134,11 @@ public class OfferBook {
     // Private
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void setBankAccount(BankAccount bankAccount) {
-        log.debug("setBankAccount " + bankAccount);
-        if (bankAccount != null) {
-            country = bankAccount.getCountry();
-            fiatCode = bankAccount.getCurrency().getCurrencyCode();
+    private void setBankAccount(FiatAccount fiatAccount) {
+        log.debug("setBankAccount " + fiatAccount);
+        if (fiatAccount != null) {
+            country = fiatAccount.getCountry();
+            fiatCode = fiatAccount.getCurrency().getCurrencyCode();
 
             // TODO check why that was used (probably just for update triggering, if so refactor that)
             //offerBookListItems.stream().forEach(e -> e.setBankAccountCountry(country));
diff --git a/core/src/main/java/io/bitsquare/offer/OfferBookService.java b/core/src/main/java/io/bitsquare/offer/OfferBookService.java
index 8bd6cd310b..1f007784c2 100644
--- a/core/src/main/java/io/bitsquare/offer/OfferBookService.java
+++ b/core/src/main/java/io/bitsquare/offer/OfferBookService.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.offer;
 
-import io.bitsquare.util.handlers.FaultHandler;
-import io.bitsquare.util.handlers.ResultHandler;
+import io.bitsquare.common.handlers.FaultHandler;
+import io.bitsquare.common.handlers.ResultHandler;
 
 import java.util.List;
 import java.util.concurrent.Executor;
diff --git a/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java b/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
index ce2104493c..9bc81e56dd 100644
--- a/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
+++ b/core/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBookService.java
@@ -20,8 +20,8 @@ package io.bitsquare.offer.tomp2p;
 import io.bitsquare.network.tomp2p.TomP2PNode;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OfferBookService;
-import io.bitsquare.util.handlers.FaultHandler;
-import io.bitsquare.util.handlers.ResultHandler;
+import io.bitsquare.common.handlers.FaultHandler;
+import io.bitsquare.common.handlers.ResultHandler;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/io/bitsquare/trade/Contract.java b/core/src/main/java/io/bitsquare/trade/Contract.java
index e42891ce17..1aa22b58c6 100644
--- a/core/src/main/java/io/bitsquare/trade/Contract.java
+++ b/core/src/main/java/io/bitsquare/trade/Contract.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.util.DSAKeyUtil;
 
@@ -38,8 +38,8 @@ public class Contract implements Serializable {
     private final Coin tradeAmount;
     private final String offererAccountID;
     private final String takerAccountID;
-    private final BankAccount offererBankAccount;
-    private final BankAccount takerBankAccount;
+    private final FiatAccount offererFiatAccount;
+    private final FiatAccount takerFiatAccount;
     private final String offererMessagePublicKeyAsString;
     private final String takerMessagePublicKeyAsString;
 
@@ -48,8 +48,8 @@ public class Contract implements Serializable {
                     String takeOfferFeeTxID,
                     String offererAccountID,
                     String takerAccountID,
-                    BankAccount offererBankAccount,
-                    BankAccount takerBankAccount,
+                    FiatAccount offererFiatAccount,
+                    FiatAccount takerFiatAccount,
                     PublicKey offererMessagePublicKey,
                     PublicKey takerMessagePublicKey) {
         this.offer = offer;
@@ -57,8 +57,8 @@ public class Contract implements Serializable {
         this.takeOfferFeeTxID = takeOfferFeeTxID;
         this.offererAccountID = offererAccountID;
         this.takerAccountID = takerAccountID;
-        this.offererBankAccount = offererBankAccount;
-        this.takerBankAccount = takerBankAccount;
+        this.offererFiatAccount = offererFiatAccount;
+        this.takerFiatAccount = takerFiatAccount;
         this.offererMessagePublicKeyAsString = DSAKeyUtil.getHexStringFromPublicKey(offererMessagePublicKey);
         this.takerMessagePublicKeyAsString = DSAKeyUtil.getHexStringFromPublicKey(takerMessagePublicKey);
     }
@@ -88,12 +88,12 @@ public class Contract implements Serializable {
         return takerAccountID;
     }
 
-    public BankAccount getOffererBankAccount() {
-        return offererBankAccount;
+    public FiatAccount getOffererFiatAccount() {
+        return offererFiatAccount;
     }
 
-    public BankAccount getTakerBankAccount() {
-        return takerBankAccount;
+    public FiatAccount getTakerFiatAccount() {
+        return takerFiatAccount;
     }
 
     public String getTakerMessagePublicKey() {
@@ -112,8 +112,8 @@ public class Contract implements Serializable {
                 ", tradeAmount=" + tradeAmount +
                 ", offererAccountID='" + offererAccountID + '\'' +
                 ", takerAccountID='" + takerAccountID + '\'' +
-                ", offererBankAccount=" + offererBankAccount +
-                ", takerBankAccount=" + takerBankAccount +
+                ", offererBankAccount=" + offererFiatAccount +
+                ", takerBankAccount=" + takerFiatAccount +
                 ", takerMessagePublicKeyAsString=" + takerMessagePublicKeyAsString +
                 ", offererMessagePublicKeyAsString=" + offererMessagePublicKeyAsString +
                 '}';
diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index 78617ff22d..3b47423b46 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.account.AccountSettings;
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.user.AccountSettings;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.crypto.SignatureService;
@@ -42,8 +42,8 @@ import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererProtocol;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerProtocol;
 import io.bitsquare.user.User;
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.handlers.ResultHandler;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ResultHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.Fiat;
@@ -162,17 +162,17 @@ public class TradeManager {
                            TransactionResultHandler resultHandler,
                            ErrorMessageHandler errorMessageHandler) {
 
-        BankAccount currentBankAccount = user.getCurrentBankAccount().get();
+        FiatAccount currentFiatAccount = user.getCurrentBankAccount().get();
         Offer offer = new Offer(id,
                 user.getNetworkPubKey(),
                 direction,
                 price.getValue(),
                 amount,
                 minAmount,
-                currentBankAccount.getBankAccountType(),
-                currentBankAccount.getCurrency(),
-                currentBankAccount.getCountry(),
-                currentBankAccount.getUid(),
+                currentFiatAccount.getFiatAccountType(),
+                currentFiatAccount.getCurrency(),
+                currentFiatAccount.getCountry(),
+                currentFiatAccount.getUid(),
                 accountSettings.getAcceptedArbitrators(),
                 accountSettings.getSecurityDeposit(),
                 accountSettings.getAcceptedCountries(),
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
index aeee43a6ab..cdf3d3962a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityModel.java
@@ -21,8 +21,8 @@ import io.bitsquare.network.Peer;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.TradeMessageService;
 import io.bitsquare.trade.protocol.trade.OfferMessage;
-import io.bitsquare.util.handlers.ResultHandler;
-import io.bitsquare.util.taskrunner.SharedModel;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.taskrunner.SharedModel;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
index 3d22f64466..982bf0b5a6 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java
@@ -25,7 +25,7 @@ import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailability
 import io.bitsquare.trade.protocol.availability.tasks.GetPeerAddress;
 import io.bitsquare.trade.protocol.availability.tasks.ProcessReportOfferAvailabilityMessage;
 import io.bitsquare.trade.protocol.availability.tasks.RequestIsOfferAvailable;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import javafx.application.Platform;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
index 3f945a9b36..cb09ae676f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/GetPeerAddress.java
@@ -21,8 +21,8 @@ import io.bitsquare.network.Peer;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
index cf6ae8a86d..b66196d846 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/ProcessReportOfferAvailabilityMessage.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.availability.tasks;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
 import io.bitsquare.trade.protocol.availability.messages.ReportOfferAvailabilityMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
index b152ea2e65..f6ede90c33 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/RequestIsOfferAvailable.java
@@ -21,8 +21,8 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.availability.CheckOfferAvailabilityModel;
 import io.bitsquare.trade.protocol.availability.messages.RequestIsOfferAvailableMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
index 1b9491947f..2574cbd0fa 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferModel.java
@@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.placeoffer;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.OfferBookService;
-import io.bitsquare.util.taskrunner.SharedModel;
+import io.bitsquare.common.taskrunner.SharedModel;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
index d092acfc95..7b20d3856d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
@@ -22,8 +22,8 @@ import io.bitsquare.trade.protocol.placeoffer.tasks.AddOfferToRemoteOfferBook;
 import io.bitsquare.trade.protocol.placeoffer.tasks.BroadcastCreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer;
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
index de03b7fb10..84fa7fc8da 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.placeoffer.tasks;
 
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
index 956bc3e611..3b7930a225 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/BroadcastCreateOfferFeeTx.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.placeoffer.tasks;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
index 52134de1b0..f1ce076533 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.placeoffer.tasks;
 
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
index 785b147299..f11555a270 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.placeoffer.tasks;
 
 import io.bitsquare.trade.protocol.placeoffer.PlaceOfferModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java
index 9f895b372b..44556b0a75 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.TradeWalletService;
@@ -26,7 +26,7 @@ import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.TradeMessageService;
 import io.bitsquare.user.User;
-import io.bitsquare.util.taskrunner.SharedModel;
+import io.bitsquare.common.taskrunner.SharedModel;
 
 import org.bitcoinj.crypto.DeterministicKey;
 
@@ -48,7 +48,7 @@ public class OfferSharedModel extends SharedModel {
 
     // derived
     private final String id;
-    private final BankAccount bankAccount;
+    private final FiatAccount fiatAccount;
     private final String accountId;
     private final PublicKey networkPubKey;
     private final byte[] registrationPubKey;
@@ -80,7 +80,7 @@ public class OfferSharedModel extends SharedModel {
         registrationPubKey = walletService.getRegistrationAddressEntry().getPubKey();
         registrationKeyPair = walletService.getRegistrationAddressEntry().getKeyPair();
         addressEntry = walletService.getAddressEntry(id);
-        bankAccount = user.getBankAccount(offer.getBankAccountId());
+        fiatAccount = user.getBankAccount(offer.getBankAccountId());
         accountId = user.getAccountId();
         networkPubKey = user.getNetworkPubKey();
     }
@@ -123,8 +123,8 @@ public class OfferSharedModel extends SharedModel {
         return signatureService;
     }
 
-    public BankAccount getBankAccount() {
-        return bankAccount;
+    public FiatAccount getFiatAccount() {
+        return fiatAccount;
     }
 
     public String getAccountId() {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
index 0453fdb1e3..35bfbe1b88 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererModel.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade.offerer;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.crypto.SignatureService;
@@ -55,7 +55,7 @@ public class BuyerAsOffererModel extends OfferSharedModel {
     private Peer taker;
 
     private String takerAccountId;
-    private BankAccount takerBankAccount;
+    private FiatAccount takerFiatAccount;
     private PublicKey takerMessagePublicKey;
     private String takerContractAsJson;
     private Coin takerPayoutAmount;
@@ -136,12 +136,12 @@ public class BuyerAsOffererModel extends OfferSharedModel {
         this.takerAccountId = takerAccountId;
     }
 
-    public BankAccount getTakerBankAccount() {
-        return takerBankAccount;
+    public FiatAccount getTakerFiatAccount() {
+        return takerFiatAccount;
     }
 
-    public void setTakerBankAccount(BankAccount takerBankAccount) {
-        this.takerBankAccount = takerBankAccount;
+    public void setTakerFiatAccount(FiatAccount takerFiatAccount) {
+        this.takerFiatAccount = takerFiatAccount;
     }
 
     public PublicKey getTakerMessagePublicKey() {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java
index e7b914e201..656a758eaf 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererTaskRunner.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.trade.protocol.trade.offerer;
 
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.handlers.ResultHandler;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestDepositPaymentMessage.java
index f78a9760a3..e6a7f770c1 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestDepositPaymentMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/messages/RequestDepositPaymentMessage.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade.offerer.messages;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.trade.protocol.trade.TradeMessage;
 
 import org.bitcoinj.core.TransactionOutput;
@@ -33,20 +33,20 @@ public class RequestDepositPaymentMessage implements Serializable, TradeMessage
     private final List<TransactionOutput> offererConnectedOutputsForAllInputs;
     private final List<TransactionOutput> offererOutputs;
     private final byte[] offererPubKey;
-    private final BankAccount bankAccount;
+    private final FiatAccount fiatAccount;
     private final String accountID;
 
     public RequestDepositPaymentMessage(String tradeId,
                                         List<TransactionOutput> offererConnectedOutputsForAllInputs,
                                         List<TransactionOutput> offererOutputs,
                                         byte[] offererPubKey,
-                                        BankAccount bankAccount,
+                                        FiatAccount fiatAccount,
                                         String accountID) {
         this.tradeId = tradeId;
         this.offererConnectedOutputsForAllInputs = offererConnectedOutputsForAllInputs;
         this.offererOutputs = offererOutputs;
         this.offererPubKey = offererPubKey;
-        this.bankAccount = bankAccount;
+        this.fiatAccount = fiatAccount;
         this.accountID = accountID;
     }
 
@@ -67,8 +67,8 @@ public class RequestDepositPaymentMessage implements Serializable, TradeMessage
         return offererPubKey;
     }
 
-    public BankAccount getBankAccount() {
-        return bankAccount;
+    public FiatAccount getFiatAccount() {
+        return fiatAccount;
     }
 
     public String getAccountId() {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java
index 838502bf6a..483ffb00d1 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/GetOffererDepositTxInputs.java
@@ -21,8 +21,8 @@ import io.bitsquare.btc.AddressEntry;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Coin;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
index d7a100920f..39190df956 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
index 086b0cba63..cfceb32da5 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOf
             checkTradeId(model.getId(), model.getTradeMessage());
             RequestOffererPublishDepositTxMessage message = (RequestOffererPublishDepositTxMessage) model.getTradeMessage();
 
-            model.setTakerBankAccount(checkNotNull(message.getTakerBankAccount()));
+            model.setTakerFiatAccount(checkNotNull(message.getTakerBankAccount()));
             model.setTakerAccountId(nonEmptyStringOf(message.getTakerAccountId()));
             model.setTakerMessagePublicKey(checkNotNull(message.getTakerMessagePublicKey()));
             model.setTakerContractAsJson(nonEmptyStringOf(message.getTakerContractAsJson()));
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
index dbe5a98b1a..3b5db114fe 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
index fe47931fb7..42889f60c7 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
index fac3ad5b42..83a490602f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestDepositPayment.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public class RequestDepositPayment extends Task<BuyerAsOffererModel> {
                 model.getOffererConnectedOutputsForAllInputs(),
                 model.getOffererOutputs(),
                 model.getOffererPubKey(),
-                model.getBankAccount(),
+                model.getFiatAccount(),
                 model.getAccountId());
 
         model.getTradeMessageService().sendMessage(model.getTaker(), tradeMessage, new SendMessageListener() {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
index 6fa6566660..48ee15417b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RespondToTakeOfferRequest.java
@@ -22,8 +22,8 @@ import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
index 086bebbe3a..943959813e 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
index 05d5d0f0f0..975809664d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
index c198b2eed7..c2a0c87699 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionConfidence;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
index fd8b365175..b1697b680c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
index 204a30d456..a218d653d2 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Coin;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
index 9becfe67af..56f57c96e8 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
@@ -21,8 +21,8 @@ import io.bitsquare.trade.Contract;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,8 +44,8 @@ public class VerifyAndSignContract extends Task<BuyerAsOffererModel> {
                 model.getTakeOfferFeeTxId(),
                 model.getAccountId(),
                 model.getTakerAccountId(),
-                model.getBankAccount(),
-                model.getTakerBankAccount(),
+                model.getFiatAccount(),
+                model.getTakerFiatAccount(),
                 model.getNetworkPubKey(),
                 model.getTakerMessagePublicKey());
         String contractAsJson = Utilities.objectToJson(contract);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
index b4c88cfa8d..68323fb016 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
index 79269edc34..18b25a3abe 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAsOffererModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ public class VerifyTakerAccount extends Task<BuyerAsOffererModel> {
     protected void doRun() {
         //TODO mocked yet
         if (model.getBlockChainService().verifyAccountRegistration()) {
-            if (model.getBlockChainService().isAccountBlackListed(model.getTakerAccountId(), model.getTakerBankAccount())) {
+            if (model.getBlockChainService().isAccountBlackListed(model.getTakerAccountId(), model.getTakerFiatAccount())) {
                 log.error("Taker is blacklisted");
                 failed("Taker is blacklisted");
             }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
index 4498d4b732..af080bbe5b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerModel.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade.taker;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.crypto.SignatureService;
@@ -61,7 +61,7 @@ public class SellerAsTakerModel extends OfferSharedModel {
     private List<TransactionOutput> takerOutputs;
     private Transaction takerDepositTx;
     private Transaction publishedDepositTx;
-    private BankAccount takerBankAccount;
+    private FiatAccount takerFiatAccount;
     private String takerAccountId;
     private ECKey.ECDSASignature offererSignature;
 
@@ -195,12 +195,12 @@ public class SellerAsTakerModel extends OfferSharedModel {
         return publishedDepositTx;
     }
 
-    public void setTakerBankAccount(BankAccount takerBankAccount) {
-        this.takerBankAccount = takerBankAccount;
+    public void setTakerFiatAccount(FiatAccount takerFiatAccount) {
+        this.takerFiatAccount = takerFiatAccount;
     }
 
-    public BankAccount getTakerBankAccount() {
-        return takerBankAccount;
+    public FiatAccount getTakerFiatAccount() {
+        return takerFiatAccount;
     }
 
     public void setTakerAccountId(String takerAccountId) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java
index f5ac602ea8..9fcd6da563 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerTaskRunner.java
@@ -17,9 +17,9 @@
 
 package io.bitsquare.trade.protocol.trade.taker;
 
-import io.bitsquare.util.handlers.ErrorMessageHandler;
-import io.bitsquare.util.handlers.ResultHandler;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.handlers.ErrorMessageHandler;
+import io.bitsquare.common.handlers.ResultHandler;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
index 35128793d5..aa4f827352 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/messages/RequestOffererPublishDepositTxMessage.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.trade.protocol.trade.taker.messages;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.trade.protocol.trade.TradeMessage;
 
 import org.bitcoinj.core.Transaction;
@@ -33,7 +33,7 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
     private static final long serialVersionUID = 2179683654379803071L;
 
     private final String tradeId;
-    private final BankAccount bankAccount;
+    private final FiatAccount fiatAccount;
     private final String accountID;
     private final PublicKey takerMessagePublicKey;
     private final String contractAsJson;
@@ -44,7 +44,7 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
     private final List<TransactionOutput> takerOutputs;
 
     public RequestOffererPublishDepositTxMessage(String tradeId,
-                                                 BankAccount bankAccount,
+                                                 FiatAccount fiatAccount,
                                                  String accountID,
                                                  PublicKey takerMessagePublicKey,
                                                  String contractAsJson,
@@ -54,7 +54,7 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
                                                  List<TransactionOutput> takerConnectedOutputsForAllInputs,
                                                  List<TransactionOutput> takerOutputs) {
         this.tradeId = tradeId;
-        this.bankAccount = bankAccount;
+        this.fiatAccount = fiatAccount;
         this.accountID = accountID;
         this.takerMessagePublicKey = takerMessagePublicKey;
         this.contractAsJson = contractAsJson;
@@ -71,8 +71,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
         return tradeId;
     }
 
-    public BankAccount getTakerBankAccount() {
-        return bankAccount;
+    public FiatAccount getTakerBankAccount() {
+        return fiatAccount;
     }
 
     public String getTakerAccountId() {
@@ -95,8 +95,8 @@ public class RequestOffererPublishDepositTxMessage implements Serializable, Trad
         return takerOutputs;
     }
 
-    public BankAccount getBankAccount() {
-        return bankAccount;
+    public FiatAccount getFiatAccount() {
+        return fiatAccount;
     }
 
     public String getAccountID() {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
index 7cc61092c8..b3d07fcf99 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
@@ -21,8 +21,8 @@ import io.bitsquare.trade.Contract;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,8 +43,8 @@ public class CreateAndSignContract extends Task<SellerAsTakerModel> {
                 trade.getTakeOfferFeeTxId(),
                 model.getTakerAccountId(),
                 model.getAccountId(),
-                model.getTakerBankAccount(),
-                model.getBankAccount(),
+                model.getTakerFiatAccount(),
+                model.getFiatAccount(),
                 model.getOffer().getMessagePublicKey(),
                 model.getNetworkPubKey());
         String contractAsJson = Utilities.objectToJson(contract);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
index 83e9a4cc1c..5c11011125 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
@@ -21,8 +21,8 @@ import io.bitsquare.network.Peer;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.listeners.GetPeerAddressListener;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
index 11b9ba1e88..8c1118853d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java
index 353146fdd7..90fedc8941 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.ECKey;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
index 23c3c9a744..4f7c058527 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java
index b93a51c781..4bd1214200 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestDepositPaymentMessage.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.messages.RequestDepositPaymentMessage;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@ public class ProcessRequestDepositPaymentMessage extends Task<SellerAsTakerModel
             model.setOffererOutputs(checkNotNull(message.getOffererOutputs()));
             model.setOffererPubKey(checkNotNull(message.getOffererPubKey()));
 
-            model.setTakerBankAccount(checkNotNull(message.getBankAccount()));
+            model.setTakerFiatAccount(checkNotNull(message.getFiatAccount()));
             model.setTakerAccountId(nonEmptyStringOf(message.getAccountId()));
 
             complete();
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
index a6eb94c88a..633f7b592e 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRespondToTakeOfferRequestMessage.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
index c07f1a25b3..cc4629963a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
@@ -21,8 +21,8 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
index cbe3e366fc..3a55b111ee 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
index 5e14d5ca1f..ddfa941644 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +37,7 @@ public class SendSignedTakerDepositTx extends Task<SellerAsTakerModel> {
     protected void doRun() {
         RequestOffererPublishDepositTxMessage tradeMessage = new RequestOffererPublishDepositTxMessage(
                 model.getId(),
-                model.getBankAccount(),
+                model.getFiatAccount(),
                 model.getAccountId(),
                 model.getNetworkPubKey(),
                 model.getTrade().getContractAsJson(),
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java
index 7f12f5ba3f..c667d7a5bb 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedMessage.java
@@ -21,8 +21,8 @@ import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.listeners.SendMessageListener;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
 import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
index 07dd5b3b1f..43636f214f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
index b5ef574ee0..e8ba2da18f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java
index 4f40b659c7..43d0584f33 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java
@@ -21,8 +21,8 @@ import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.TradeWalletService;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.bitcoinj.core.Coin;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
index 5d8b9705d4..c4d335dc86 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
index eb32d60d9d..781116f459 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.trade.protocol.trade.taker.SellerAsTakerModel;
-import io.bitsquare.util.taskrunner.Task;
-import io.bitsquare.util.taskrunner.TaskRunner;
+import io.bitsquare.common.taskrunner.Task;
+import io.bitsquare.common.taskrunner.TaskRunner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ public class VerifyOffererAccount extends Task<SellerAsTakerModel> {
     @Override
     protected void doRun() {
         if (model.getBlockChainService().verifyAccountRegistration()) {
-            if (model.getBlockChainService().isAccountBlackListed(model.getTakerAccountId(), model.getTakerBankAccount())) {
+            if (model.getBlockChainService().isAccountBlackListed(model.getTakerAccountId(), model.getTakerFiatAccount())) {
                 failed("Taker is blacklisted.");
             }
             else {
diff --git a/core/src/main/java/io/bitsquare/account/AccountSettings.java b/core/src/main/java/io/bitsquare/user/AccountSettings.java
similarity index 98%
rename from core/src/main/java/io/bitsquare/account/AccountSettings.java
rename to core/src/main/java/io/bitsquare/user/AccountSettings.java
index 0851b806c3..8f720595b3 100644
--- a/core/src/main/java/io/bitsquare/account/AccountSettings.java
+++ b/core/src/main/java/io/bitsquare/user/AccountSettings.java
@@ -15,9 +15,9 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.account;
+package io.bitsquare.user;
 
-import io.bitsquare.arbitrator.Arbitrator;
+import io.bitsquare.arbitration.Arbitrator;
 import io.bitsquare.locale.Country;
 
 import org.bitcoinj.core.Coin;
diff --git a/core/src/main/java/io/bitsquare/settings/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java
similarity index 99%
rename from core/src/main/java/io/bitsquare/settings/Preferences.java
rename to core/src/main/java/io/bitsquare/user/Preferences.java
index caa8957771..cdc2548a86 100644
--- a/core/src/main/java/io/bitsquare/settings/Preferences.java
+++ b/core/src/main/java/io/bitsquare/user/Preferences.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.settings;
+package io.bitsquare.user;
 
 import io.bitsquare.persistence.Persistence;
 
diff --git a/core/src/main/java/io/bitsquare/user/User.java b/core/src/main/java/io/bitsquare/user/User.java
index 312d094d9d..e52718930d 100644
--- a/core/src/main/java/io/bitsquare/user/User.java
+++ b/core/src/main/java/io/bitsquare/user/User.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.user;
 
-import io.bitsquare.bank.BankAccount;
+import io.bitsquare.fiat.FiatAccount;
 import io.bitsquare.util.DSAKeyUtil;
 
 import java.io.Serializable;
@@ -48,18 +48,18 @@ public class User implements Serializable {
 
     // Used for serialisation (ObservableList cannot be serialized) -> serialisation will change anyway so that is
     // only temporary
-    private List<BankAccount> _bankAccounts = new ArrayList<>();
-    private BankAccount _currentBankAccount;
+    private List<FiatAccount> _fiatAccounts = new ArrayList<>();
+    private FiatAccount _currentFiatAccount;
 
-    private final transient ObservableList<BankAccount> bankAccounts = FXCollections.observableArrayList();
-    private final transient ObjectProperty<BankAccount> currentBankAccount = new SimpleObjectProperty<>();
+    private final transient ObservableList<FiatAccount> fiatAccounts = FXCollections.observableArrayList();
+    private final transient ObjectProperty<FiatAccount> currentBankAccount = new SimpleObjectProperty<>();
 
     public User() {
         // Used for serialisation (ObservableList cannot be serialized) -> serialisation will change anyway so that is
         // only temporary
-        bankAccounts.addListener((ListChangeListener<BankAccount>) change -> _bankAccounts = new ArrayList<>(bankAccounts));
+        fiatAccounts.addListener((ListChangeListener<FiatAccount>) change -> _fiatAccounts = new ArrayList<>(fiatAccounts));
 
-        currentBankAccount.addListener((ov) -> _currentBankAccount = currentBankAccount.get());
+        currentBankAccount.addListener((ov) -> _currentFiatAccount = currentBankAccount.get());
     }
 
 
@@ -69,7 +69,7 @@ public class User implements Serializable {
 
     public void applyPersistedUser(User persistedUser) {
         if (persistedUser != null) {
-            bankAccounts.setAll(persistedUser.getSerializedBankAccounts());
+            fiatAccounts.setAll(persistedUser.getSerializedBankAccounts());
             setCurrentBankAccount(persistedUser.getSerializedCurrentBankAccount());
             networkKeyPair = persistedUser.getNetworkKeyPair();
             accountID = persistedUser.getAccountId();
@@ -81,24 +81,24 @@ public class User implements Serializable {
         }
     }
 
-    public void setBankAccount(BankAccount bankAccount) {
+    public void setBankAccount(FiatAccount fiatAccount) {
         // We use the account title as hashCode
         // In case we edit an existing we replace it in the list
-        if (bankAccounts.contains(bankAccount))
-            bankAccounts.remove(bankAccount);
+        if (fiatAccounts.contains(fiatAccount))
+            fiatAccounts.remove(fiatAccount);
 
-        bankAccounts.add(bankAccount);
-        setCurrentBankAccount(bankAccount);
+        fiatAccounts.add(fiatAccount);
+        setCurrentBankAccount(fiatAccount);
     }
 
     public void removeCurrentBankAccount() {
         if (currentBankAccount.get() != null)
-            bankAccounts.remove(currentBankAccount.get());
+            fiatAccounts.remove(currentBankAccount.get());
 
-        if (bankAccounts.isEmpty())
+        if (fiatAccounts.isEmpty())
             setCurrentBankAccount(null);
         else
-            setCurrentBankAccount(bankAccounts.get(0));
+            setCurrentBankAccount(fiatAccounts.get(0));
     }
 
 
@@ -112,8 +112,8 @@ public class User implements Serializable {
         this.accountID = accountID;
     }
 
-    public void setCurrentBankAccount(@Nullable BankAccount bankAccount) {
-        currentBankAccount.set(bankAccount);
+    public void setCurrentBankAccount(@Nullable FiatAccount fiatAccount) {
+        currentBankAccount.set(fiatAccount);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -124,11 +124,11 @@ public class User implements Serializable {
     public String getStringifiedBankAccounts() {
         // TODO use steam API
         String bankAccountUIDs = "";
-        for (int i = 0; i < bankAccounts.size(); i++) {
-            BankAccount bankAccount = bankAccounts.get(i);
-            bankAccountUIDs += bankAccount.toString();
+        for (int i = 0; i < fiatAccounts.size(); i++) {
+            FiatAccount fiatAccount = fiatAccounts.get(i);
+            bankAccountUIDs += fiatAccount.toString();
 
-            if (i < bankAccounts.size() - 1) {
+            if (i < fiatAccounts.size() - 1) {
                 bankAccountUIDs += ", ";
             }
         }
@@ -143,18 +143,18 @@ public class User implements Serializable {
         return getAccountId() != null;
     }
 
-    public ObservableList<BankAccount> getBankAccounts() {
-        return bankAccounts;
+    public ObservableList<FiatAccount> getFiatAccounts() {
+        return fiatAccounts;
     }
 
-    public ObjectProperty<BankAccount> getCurrentBankAccount() {
+    public ObjectProperty<FiatAccount> getCurrentBankAccount() {
         return currentBankAccount;
     }
 
-    public BankAccount getBankAccount(String bankAccountId) {
-        for (final BankAccount bankAccount : bankAccounts) {
-            if (bankAccount.getUid().equals(bankAccountId)) {
-                return bankAccount;
+    public FiatAccount getBankAccount(String bankAccountId) {
+        for (final FiatAccount fiatAccount : fiatAccounts) {
+            if (fiatAccount.getUid().equals(bankAccountId)) {
+                return fiatAccount;
             }
         }
         return null;
@@ -168,17 +168,17 @@ public class User implements Serializable {
         return networkKeyPair.getPublic();
     }
 
-    public ObjectProperty<BankAccount> currentBankAccountProperty() {
+    public ObjectProperty<FiatAccount> currentBankAccountProperty() {
         return currentBankAccount;
     }
 
     // Used for serialisation (ObservableList cannot be serialized) 
-    List<BankAccount> getSerializedBankAccounts() {
-        return _bankAccounts;
+    List<FiatAccount> getSerializedBankAccounts() {
+        return _fiatAccounts;
     }
 
-    BankAccount getSerializedCurrentBankAccount() {
-        return _currentBankAccount;
+    FiatAccount getSerializedCurrentBankAccount() {
+        return _currentFiatAccount;
     }
 
 }
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
similarity index 100%
rename from core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
rename to core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$Malformed.fxml
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
similarity index 100%
rename from core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
rename to core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxController.fxml
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
similarity index 86%
rename from core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
rename to core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
index 6c81c9b81a..a6220a6cad 100644
--- a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
+++ b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$MissingFxmlViewAnnotation.fxml
@@ -16,6 +16,6 @@
   -->
 
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.viewfx.view.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.common.viewfx.view.fxml.FxmlViewLoaderTests$MissingFxmlViewAnnotation"
             xmlns:fx="http://javafx.com/fxml">
 </AnchorPane>
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
similarity index 88%
rename from core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
rename to core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
index 4748300d8c..23a8b4b06a 100644
--- a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
+++ b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests$WellFormed.fxml
@@ -16,6 +16,6 @@
   -->
 
 <?import javafx.scene.layout.*?>
-<AnchorPane fx:id="root" fx:controller="io.bitsquare.viewfx.view.fxml.FxmlViewLoaderTests$WellFormed"
+<AnchorPane fx:id="root" fx:controller="io.bitsquare.common.viewfx.view.fxml.FxmlViewLoaderTests$WellFormed"
             xmlns:fx="http://javafx.com/fxml">
 </AnchorPane>
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests.java
similarity index 91%
rename from core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
rename to core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests.java
index b9cc37a6a2..cdf7c81959 100644
--- a/core/src/test/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoaderTests.java
+++ b/core/src/test/java/io/bitsquare/common/viewfx/view/fxml/FxmlViewLoaderTests.java
@@ -15,14 +15,14 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view.fxml;
+package io.bitsquare.common.viewfx.view.fxml;
 
-import io.bitsquare.viewfx.ViewfxException;
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.FxmlView;
-import io.bitsquare.viewfx.view.View;
-import io.bitsquare.viewfx.view.ViewFactory;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.ViewfxException;
+import io.bitsquare.common.viewfx.view.AbstractView;
+import io.bitsquare.common.viewfx.view.FxmlView;
+import io.bitsquare.common.viewfx.view.View;
+import io.bitsquare.common.viewfx.view.ViewFactory;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import java.util.ResourceBundle;
 
diff --git a/core/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java b/core/src/test/java/io/bitsquare/common/viewfx/view/support/CachingViewLoaderTests.java
similarity index 88%
rename from core/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java
rename to core/src/test/java/io/bitsquare/common/viewfx/view/support/CachingViewLoaderTests.java
index 9a98544e39..40e04bc56d 100644
--- a/core/src/test/java/io/bitsquare/viewfx/view/support/CachingViewLoaderTests.java
+++ b/core/src/test/java/io/bitsquare/common/viewfx/view/support/CachingViewLoaderTests.java
@@ -15,11 +15,11 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.viewfx.view.support;
+package io.bitsquare.common.viewfx.view.support;
 
-import io.bitsquare.viewfx.view.AbstractView;
-import io.bitsquare.viewfx.view.CachingViewLoader;
-import io.bitsquare.viewfx.view.ViewLoader;
+import io.bitsquare.common.viewfx.view.AbstractView;
+import io.bitsquare.common.viewfx.view.CachingViewLoader;
+import io.bitsquare.common.viewfx.view.ViewLoader;
 
 import org.junit.Test;
 
diff --git a/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java b/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
index 5adee48ac5..9d118b5f44 100644
--- a/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
+++ b/core/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui.main.trade.createoffer;
 
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.gui.util.validation.BtcValidator;
 import io.bitsquare.gui.util.validation.FiatValidator;
@@ -97,10 +97,10 @@ public class CreateOfferViewModelTest {
         assertEquals(Fiat.valueOf("USD", 9999900), model.volumeAsFiat.get());
 
 
-        model.bankAccountType.set(BankAccountType.SEPA.toString());
+        model.bankAccountType.set(FiatAccountType.SEPA.toString());
         assertEquals("Sepa", presenter.bankAccountType.get());
 
-        model.bankAccountType.set(BankAccountType.WIRE.toString());
+        model.bankAccountType.set(FiatAccountType.WIRE.toString());
         assertEquals("Wire", presenter.bankAccountType.get());
 
 
diff --git a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
index 91b86e6d79..a599513746 100644
--- a/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
+++ b/core/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.trade.protocol.placeoffer;
 
-import io.bitsquare.arbitrator.Arbitrator;
-import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.arbitration.Arbitrator;
+import io.bitsquare.fiat.FiatAccountType;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.FeePolicy;
 import io.bitsquare.btc.UserAgent;
@@ -301,7 +301,7 @@ public class PlaceOfferProtocolTest {
                 100L,
                 Coin.CENT,
                 Coin.CENT,
-                BankAccountType.INTERNATIONAL,
+                FiatAccountType.INTERNATIONAL,
                 Currency.getInstance("EUR"),
                 CountryUtil.getDefaultCountry(),
                 "bankAccountUID",