diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 41b4a7f..33f6880 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -162,7 +162,7 @@ final class BackendController extends Controller
 
         $view->addData('interface', $interface);
 
-        $lang = include __DIR__ . '/../Interfaces/' . $interface->getInterfacePath() . '/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php';
+        $lang = include __DIR__ . '/../Interfaces/' . $interface->getInterfacePath() . '/Lang/' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php';
         $view->addData('lang', $lang);
 
         return $view;
diff --git a/Interfaces/GSD/Lang/de.lang.php b/Interfaces/GSD/Lang/de.lang.php
new file mode 100644
index 0000000..339dd0b
--- /dev/null
+++ b/Interfaces/GSD/Lang/de.lang.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.4
+ *
+ * @package   Modules\Exchange
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://orange-management.org
+ */
+declare(strict_types=1);
+
+return [
+    'Assets'      => 'Anlagevermögen',
+    'Accounts'    => 'Konten',
+    'Articles'    => 'Artikel',
+    'CostCenters' => 'Kostenstellen',
+    'CostObjects' => 'Kostenträger',
+    'Customers'   => 'Kunden',
+    'Invoices'    => 'Rechnungen',
+    'Options'     => 'Optionen',
+    'Postings'    => 'Buchungen',
+    'Stocks'      => 'Lager',
+    'Suppliers'   => 'Lieferanten',
+];
diff --git a/Interfaces/GSD/en.lang.php b/Interfaces/GSD/Lang/en.lang.php
similarity index 100%
rename from Interfaces/GSD/en.lang.php
rename to Interfaces/GSD/Lang/en.lang.php
diff --git a/Interfaces/GSD/import.tpl.php b/Interfaces/GSD/import.tpl.php
index 6ba0cc2..3a04db2 100755
--- a/Interfaces/GSD/import.tpl.php
+++ b/Interfaces/GSD/import.tpl.php
@@ -1,10 +1,9 @@
 <div class="row">
     <div class="col-xs-12 col-md-6">
-        <section class="box wf-100">
-            <header><h1><?= $this->getHtml('Import') ?> - GSD</h1></header>
-
-            <div class="inner">
-                <form id="fImport" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/exchange/import/profile?{?}&exchange=GSD&csrf={$CSRF}'); ?>">
+        <section class="portlet">
+            <form id="fImport" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/exchange/import/profile?{?}&exchange=GSD&csrf={$CSRF}'); ?>">
+                <div class="portlet-head"><?= $this->getHtml('Import') ?> - GSD</div>
+                <div class="portlet-body">
                     <table class="layout wf-100" style="table-layout: fixed">
                         <tbody>
                         <tr><td><label for="iHost"><?= $this->getHtml('Host') ?></label>
@@ -74,11 +73,12 @@
                                 <label for="iArticles"><?= $lang['Articles']; ?></label>
                             </span>
                         </table>
-                        <tr><td>
-                            <input type="submit" value="<?= $this->getHtml('Import'); ?>">
                     </table>
-                </form>
-            </div>
+                </div>
+                <div class="portlet-foot">
+                    <input type="submit" value="<?= $this->getHtml('Import'); ?>">
+                </div>
+            </form>
         </section>
     </div>
 </div>
\ No newline at end of file
diff --git a/Interfaces/Intrexx/Lang/en.lang.php b/Interfaces/Intrexx/Lang/en.lang.php
new file mode 100644
index 0000000..79c39ab
--- /dev/null
+++ b/Interfaces/Intrexx/Lang/en.lang.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Orange Management
+ *
+ * PHP Version 7.4
+ *
+ * @package   Modules\Exchange
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://orange-management.org
+ */
+return [
+
+];
diff --git a/Interfaces/Intrexx/import.tpl.php b/Interfaces/Intrexx/import.tpl.php
new file mode 100644
index 0000000..e69de29
diff --git a/Interfaces/OMS/en.lang.php b/Interfaces/OMS/Lang/en.lang.php
similarity index 100%
rename from Interfaces/OMS/en.lang.php
rename to Interfaces/OMS/Lang/en.lang.php
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
new file mode 100644
index 0000000..a5e9cf8
--- /dev/null
+++ b/Theme/Backend/Lang/Navigation.de.lang.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.4
+ *
+ * @package   Modules\Exchange
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://orange-management.org
+ */
+declare(strict_types=1);
+
+return ['Navigation' => [
+    'Dashboard' => 'Dashboard',
+    'Exchange'  => 'Exchange',
+    'Export'    => 'Export',
+    'Import'    => 'Import',
+]];
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
new file mode 100644
index 0000000..48a1c56
--- /dev/null
+++ b/Theme/Backend/Lang/de.lang.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.4
+ *
+ * @package   Modules\Exchange
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://orange-management.org
+ */
+declare(strict_types=1);
+
+return ['Exchange' => [
+    'Database' => 'Datenbank',
+    'End'      => 'Ende',
+    'Exchange' => 'Exchange',
+    'Export'   => 'Export',
+    'Exports'  => 'Exporte',
+    'File'     => 'Dateien',
+    'Host'     => 'Host',
+    'Import'   => 'Import',
+    'Imports'  => 'Importe',
+    'Login'    => 'Login',
+    'Options'  => 'Optionen',
+    'Password' => 'Passwort',
+    'Port'     => 'Port',
+    'Start'    => 'Start',
+    'Title'    => 'Titel',
+    'Website'  => 'Webseite',
+]];
diff --git a/Theme/Backend/exchange-export-list.tpl.php b/Theme/Backend/exchange-export-list.tpl.php
index 3173feb..f94a9dd 100755
--- a/Theme/Backend/exchange-export-list.tpl.php
+++ b/Theme/Backend/exchange-export-list.tpl.php
@@ -12,19 +12,16 @@
  */
 declare(strict_types=1);
 
-
- /**
- * @var \phpOMS\Views\View $this
- */
+/** @var \phpOMS\Views\View $this */
 $interfaces = $this->getData('interfaces');
 
 echo $this->getData('nav')->render();
 ?>
 <div class="row">
     <div class="col-xs-12">
-        <div class="box wf-100">
+        <section class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Exports') ?><i class="fa fa-download floatRight download btn"></i></div>
             <table class="default">
-                <caption><?= $this->getHtml('Exports') ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td class="wf-100"><?= $this->getHtml('Title') ?>
@@ -38,6 +35,6 @@ echo $this->getData('nav')->render();
                     <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
             </table>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/exchange-import-list.tpl.php b/Theme/Backend/exchange-import-list.tpl.php
index 66a5ba6..e093e86 100755
--- a/Theme/Backend/exchange-import-list.tpl.php
+++ b/Theme/Backend/exchange-import-list.tpl.php
@@ -12,19 +12,16 @@
  */
 declare(strict_types=1);
 
-
- /**
- * @var \phpOMS\Views\View $this
- */
+ /** @var \phpOMS\Views\View $this */
 $interfaces = $this->getData('interfaces');
 
 echo $this->getData('nav')->render();
 ?>
 <div class="row">
     <div class="col-xs-12">
-        <div class="box wf-100">
+        <section class="portlet">
+            <div class="portlet-head"><?= $this->getHtml('Imports') ?><i class="fa fa-download floatRight download btn"></i></div>
             <table class="default">
-                <caption><?= $this->getHtml('Imports') ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td class="wf-100"><?= $this->getHtml('Title') ?>
@@ -38,6 +35,6 @@ echo $this->getData('nav')->render();
                     <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                 <?php endif; ?>
             </table>
-        </div>
+        </section>
     </div>
 </div>