diff --git a/gradle.properties b/gradle.properties
index b3061ca1..117d4744 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -44,7 +44,7 @@ createIzPackInstaller=false
 izpackVersion=5.1.3
 lombokVersion=1.18.28
 modelDataVersion=2.1
-swingComponentsVersion=7.3
+swingComponentsVersion=8
 swingBaseComponentsVersion=2.5
 swingTreeComponentVersion=2.5
 swingRendererVersion=1.2
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/checksum/ChecksumPanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/checksum/ChecksumPanel.java
index 2c250536..eee63c97 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/checksum/ChecksumPanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/checksum/ChecksumPanel.java
@@ -49,7 +49,7 @@
 import io.github.astrapi69.model.BaseModel;
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.EnumComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.EnumComboBoxModel;
 import io.github.astrapi69.swing.listener.document.EnableButtonBehavior;
 
 @Getter
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/conversion/FileConversionPanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/conversion/FileConversionPanel.java
index f541cb6c..fea5b9ab 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/conversion/FileConversionPanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/conversion/FileConversionPanel.java
@@ -46,7 +46,7 @@
 import io.github.astrapi69.model.BaseModel;
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.EnumComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.EnumComboBoxModel;
 import io.github.astrapi69.throwable.ThrowableExtensions;
 
 @Getter
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/MysticCryptEntryTableModel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/MysticCryptEntryTableModel.java
index f660f8b5..494572f1 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/MysticCryptEntryTableModel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/MysticCryptEntryTableModel.java
@@ -47,7 +47,7 @@ public MysticCryptEntryTableModel()
 	 * Instantiates a new {@link ThreadsTableModel} object.
 	 *
 	 * @param columnsModel
-	 *            the columns model
+	 *            the column model
 	 */
 	public MysticCryptEntryTableModel(final TableColumnsModel columnsModel)
 	{
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/SecretKeyTreeWithContentPanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/SecretKeyTreeWithContentPanel.java
index d1d154d1..1b27e9b7 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/SecretKeyTreeWithContentPanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/dbtree/SecretKeyTreeWithContentPanel.java
@@ -335,9 +335,12 @@ protected void onInitializeMigLayout()
 
 					BaseTreeNodeFactory.newDefaultMutableTreeNode(clonedTreeNode, parent, false);
 
-					try {
+					try
+					{
 						TimeUnit.MILLISECONDS.sleep(200);
-					} catch (InterruptedException e) {
+					}
+					catch (InterruptedException e)
+					{
 						throw new RuntimeException(e);
 					}
 
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/keygen/CryptographyPanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/keygen/CryptographyPanel.java
index 4768dddb..dfda587e 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/keygen/CryptographyPanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/keygen/CryptographyPanel.java
@@ -44,15 +44,15 @@
 import io.github.astrapi69.crypt.api.key.KeySize;
 import io.github.astrapi69.crypt.data.factory.CertFactory;
 import io.github.astrapi69.crypt.data.key.writer.CertificateWriter;
-import io.github.astrapi69.layout.GridBagLayoutModel;
-import io.github.astrapi69.layout.InsetsModel;
+import io.github.astrapi69.swing.model.layout.GridBagLayoutModel;
+import io.github.astrapi69.swing.model.layout.InsetsModel;
 import io.github.astrapi69.layout.LayoutExtensions;
 import io.github.astrapi69.model.BaseModel;
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.mystic.crypt.MysticCryptApplicationFrame;
 import io.github.astrapi69.mystic.crypt.panel.certificate.NewCertificateInfoPanel;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.EnumComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.EnumComboBoxModel;
 import io.github.astrapi69.swing.dialog.factory.JDialogFactory;
 import io.github.astrapi69.swing.listener.RequestFocusListener;
 
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/obfuscate/character/ObfuscationOperationRulePanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/obfuscate/character/ObfuscationOperationRulePanel.java
index 7f2c944f..10be48cb 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/obfuscate/character/ObfuscationOperationRulePanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/obfuscate/character/ObfuscationOperationRulePanel.java
@@ -32,7 +32,7 @@
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.mystic.crypt.panel.obfuscate.ModeContext;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.EnumComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.EnumComboBoxModel;
 import io.github.astrapi69.swing.document.NumberValuesDocument;
 import io.github.astrapi69.swing.document.RangeDocument;
 
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/privatekey/NewPrivateKeyPanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/privatekey/NewPrivateKeyPanel.java
index eee7d7bb..e2fcff44 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/privatekey/NewPrivateKeyPanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/privatekey/NewPrivateKeyPanel.java
@@ -55,7 +55,7 @@
 import io.github.astrapi69.model.api.IModel;
 import io.github.astrapi69.mystic.crypt.MysticCryptApplicationFrame;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.EnumComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.EnumComboBoxModel;
 import io.github.astrapi69.swing.component.JMTextField;
 import io.github.astrapi69.swing.dialog.DialogExtensions;
 import io.github.astrapi69.swing.listener.document.DocumentListenerAdapter;
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/MasterPwWithApplicationFilePanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/MasterPwWithApplicationFilePanel.java
index dd1adbb9..1e9c02d3 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/MasterPwWithApplicationFilePanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/MasterPwWithApplicationFilePanel.java
@@ -57,7 +57,7 @@
 import io.github.astrapi69.mystic.crypt.panel.signin.button.state.ok.DocumentExtensions;
 import io.github.astrapi69.net.url.URLExtensions;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.GenericMutableComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.GenericMutableComboBoxModel;
 import io.github.astrapi69.swing.component.JMCheckBox;
 import io.github.astrapi69.swing.component.JMComboBox;
 import io.github.astrapi69.swing.component.JMPasswordField;
diff --git a/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/NewMasterPwFilePanel.java b/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/NewMasterPwFilePanel.java
index 43e732bb..2ccd8555 100644
--- a/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/NewMasterPwFilePanel.java
+++ b/src/main/java/io/github/astrapi69/mystic/crypt/panel/signin/NewMasterPwFilePanel.java
@@ -60,7 +60,7 @@
 import io.github.astrapi69.mystic.crypt.panel.signin.button.state.ok.BtnOkStateMachine;
 import io.github.astrapi69.net.url.URLExtensions;
 import io.github.astrapi69.swing.base.BasePanel;
-import io.github.astrapi69.swing.combobox.model.GenericMutableComboBoxModel;
+import io.github.astrapi69.swing.model.combobox.GenericMutableComboBoxModel;
 import io.github.astrapi69.swing.component.JMTextField;
 import io.github.astrapi69.swing.dialog.help.HelpDialog;
 import io.github.astrapi69.swing.listener.document.DocumentListenerAdapter;