diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 89777b0..e018b63 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -1,302 +1,320 @@
 /*
     SPDX-FileCopyrightText: 2014-2023 Anne Jan Brouwer <brouwer@annejan.com>
     SPDX-FileCopyrightText: 2018 Claudio Maradonna <penguyman@stronzi.org>
     SPDX-FileCopyrightText: 2023 g10 Code GmbH
     SPDX-FileContributor: Sune Stolborg Vuorela <sune@vuorela.dk>
 
     SPDX-License-Identifier: GPL-3.0-or-later
 */
 
 #include "configdialog.h"
 #include "mainwindow.h"
 #include "settings.h"
 #include "ui_configdialog.h"
 #include "util.h"
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QTableWidgetItem>
 #include <gpgpass_version.h>
 #include <KI18n/KLocalizedString>
 
 /**
  * @brief ConfigDialog::ConfigDialog this sets up the configuration screen.
  * @param parent
  */
 ConfigDialog::ConfigDialog(MainWindow *parent)
     : QDialog(parent)
     , ui(new Ui::ConfigDialog)
 {
     mainWindow = parent;
     ui->setupUi(this);
 
-    ui->storePath->setText(Settings::getPassStore());
+    ui->profileStorePath->setText(Settings::getPassStore());
+    ui->currentPathLineEdit->setText(Settings::getPassStore());
 
     ui->spinBoxAutoclearSeconds->setValue(Settings::getAutoclearSeconds());
     ui->spinBoxAutoclearPanelSeconds->setValue(Settings::getAutoclearPanelSeconds());
     ui->checkBoxHideContent->setChecked(Settings::isHideContent());
     ui->checkBoxDisplayAsIs->setChecked(Settings::isDisplayAsIs());
     ui->checkBoxNoLineWrapping->setChecked(Settings::isNoLineWrapping());
 
     ui->plainTextEditTemplate->setPlainText(Settings::getPassTemplate());
     ui->checkBoxTemplateAllFields->setChecked(Settings::isTemplateAllFields());
 
     setProfiles(Settings::getProfiles(), Settings::getProfile());
     setPasswordConfiguration(Settings::getPasswordConfiguration());
 
     useAutoclear(Settings::isUseAutoclear());
     useAutoclearPanel(Settings::isUseAutoclearPanel());
 
+    validateNewProfile();
+
     useTemplate(Settings::isUseTemplate());
 
     ui->profileTable->verticalHeader()->hide();
     ui->profileTable->horizontalHeader()->setStretchLastSection(true);
     ui->label->setText(ui->label->text() + QString::fromUtf8(GPGPASS_VERSION_STRING));
 
-    connect(ui->profileTable, &QTableWidget::itemChanged, this, &ConfigDialog::onProfileTableItemChanged);
+    // Generic setup
     connect(this, &ConfigDialog::accepted, this, &ConfigDialog::on_accepted);
+
+    // General tab
     connect(ui->toolButtonStore, &QAbstractButton::clicked, this, &ConfigDialog::selectStoreFolder);
-    connect(ui->checkBoxUseTemplate, &QAbstractButton::toggled, this, &ConfigDialog::toggleTemplateSubentries);
     connect(ui->checkBoxAutoclearPanel, &QAbstractButton::toggled, this, &ConfigDialog::toggleAutoClearPanelSubentries);
+
+    // Profiles tab
     connect(ui->addButton, &QAbstractButton::clicked, this, &ConfigDialog::addProfile);
     connect(ui->deleteButton, &QAbstractButton::clicked, this, &ConfigDialog::deleteSelectedProfile);
+    connect(ui->createNewProfileFolder, &QAbstractButton::toggled, this, &ConfigDialog::validateNewProfile);
+    connect(ui->newProfileNameEdit, &QLineEdit::textChanged, this, &ConfigDialog::validateNewProfile);
+    connect(ui->profileStorePath, &QLineEdit::textChanged, this, &ConfigDialog::validateNewProfile);
+    connect(ui->profileTable, &QTableWidget::itemSelectionChanged, this, [this]() {
+        ui->deleteButton->setEnabled(!ui->profileTable->selectedItems().isEmpty());
+    });
+
+    // template tab
+    connect(ui->checkBoxUseTemplate, &QAbstractButton::toggled, this, &ConfigDialog::toggleTemplateSubentries);
 }
 
-ConfigDialog::~ConfigDialog() = default;
-
-void ConfigDialog::validate(QTableWidgetItem *item)
+bool ConfigDialog::checkNewProfileData()
 {
-    bool status = true;
-
-    if (item == nullptr) {
-        for (int i = 0; i < ui->profileTable->rowCount(); i++) {
-            for (int j = 0; j < ui->profileTable->columnCount(); j++) {
-                QTableWidgetItem *_item = ui->profileTable->item(i, j);
-
-                if (_item->text().isEmpty()) {
-                    _item->setBackground(Qt::red);
-                    status = false;
-                    break;
-                }
-            }
-
-            if (!status)
-                break;
-        }
+    QString name = ui->newProfileNameEdit->text();
+    if (name.isEmpty()) {
+        return false;
+    }
+    QString path = ui->profileStorePath->text();
+    if (path.isEmpty()) {
+        return false;
+    }
+    auto nameItem = ui->profileTable->findItems(name, Qt::MatchExactly);
+    if (!nameItem.empty()) {
+        return false;
+    }
+    auto pathItem = ui->profileTable->findItems(path, Qt::MatchExactly);
+    if (!pathItem.empty()) {
+        return false;
+    }
+    QFileInfo fi(path);
+    if (fi.exists()) {
+        return fi.isDir();
     } else {
-        if (item->text().isEmpty()) {
-            item->setBackground(Qt::red);
-            status = false;
-        }
+        return ui->createNewProfileFolder->isChecked();
     }
+}
 
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(status);
+void ConfigDialog::validateNewProfile()
+{
+    ui->addButton->setEnabled(checkNewProfileData());
 }
 
+ConfigDialog::~ConfigDialog() = default;
+
 void ConfigDialog::on_accepted()
 {
-    Settings::setPassStore(Util::normalizeFolderPath(ui->storePath->text()));
+    Settings::setPassStore(Util::normalizeFolderPath(ui->currentPathLineEdit->text()));
     Settings::setUseAutoclear(ui->checkBoxAutoclear->isChecked());
     Settings::setAutoclearSeconds(ui->spinBoxAutoclearSeconds->value());
     Settings::setUseAutoclearPanel(ui->checkBoxAutoclearPanel->isChecked());
     Settings::setAutoclearPanelSeconds(ui->spinBoxAutoclearPanelSeconds->value());
     Settings::setHideContent(ui->checkBoxHideContent->isChecked());
     Settings::setDisplayAsIs(ui->checkBoxDisplayAsIs->isChecked());
     Settings::setNoLineWrapping(ui->checkBoxNoLineWrapping->isChecked());
     Settings::setProfiles(getProfiles());
     Settings::setPasswordConfiguration(getPasswordConfiguration());
     Settings::setUseTemplate(ui->checkBoxUseTemplate->isChecked());
     Settings::setPassTemplate(ui->plainTextEditTemplate->toPlainText());
     Settings::setTemplateAllFields(ui->checkBoxTemplateAllFields->isChecked());
 
     Settings::setVersion(QString::fromUtf8(GPGPASS_VERSION_STRING));
 }
 
 /**
  * @brief ConfigDialog::selectFolder pop-up to choose a folder.
  * @return
  */
 QString ConfigDialog::selectFolder()
 {
     QFileDialog dialog(this);
     dialog.setFileMode(QFileDialog::Directory);
     dialog.setFilter(QDir::NoFilter);
     dialog.setOption(QFileDialog::ShowDirsOnly);
     if (dialog.exec())
         return dialog.selectedFiles().constFirst();
 
     return QString();
 }
 
 /**
  * @brief ConfigDialog::on_toolButtonStore_clicked get .password-store
  * location.s
  */
 void ConfigDialog::selectStoreFolder()
 {
     QString store = selectFolder();
-    if (!store.isEmpty()) // TODO(annejan) call check
-        ui->storePath->setText(store);
+    if (!store.isEmpty())
+        ui->profileStorePath->setText(store);
 }
 
 /**
  * @brief ConfigDialog::on_checkBoxAutoclearPanel_clicked enable and disable
  * options based on autoclear use.
  */
 void ConfigDialog::toggleAutoClearPanelSubentries(bool state)
 {
     ui->spinBoxAutoclearPanelSeconds->setEnabled(state);
     ui->labelPanelSeconds->setEnabled(state);
 }
 
 /**
  * @brief ConfigDialog::useAutoclear set the clipboard autoclear use from
  * MainWindow.
  * @param useAutoclear
  */
 void ConfigDialog::useAutoclear(bool useAutoclear)
 {
     ui->checkBoxAutoclear->setChecked(useAutoclear);
 }
 
 /**
  * @brief ConfigDialog::useAutoclearPanel set the panel autoclear use from
  * MainWindow.
  * @param useAutoclearPanel
  */
 void ConfigDialog::useAutoclearPanel(bool useAutoclearPanel)
 {
     ui->checkBoxAutoclearPanel->setChecked(useAutoclearPanel);
     toggleAutoClearPanelSubentries(useAutoclearPanel);
 }
 
+static std::unique_ptr<QTableWidgetItem> createTableWidgetItem(const QString &str)
+{
+    auto item = std::make_unique<QTableWidgetItem>(str);
+    item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+    return item;
+}
+
 /**
  * @brief ConfigDialog::setProfiles set the profiles and chosen profile from
  * MainWindow.
  * @param profiles
  * @param profile
  */
 void ConfigDialog::setProfiles(const QHash<QString, QString>& profiles, const QString& profile)
 {
     ui->profileTable->clear();
     ui->profileTable->setSortingEnabled(false);
     QHashIterator<QString, QString> i(profiles);
     while (i.hasNext()) {
         i.next();
         if (!i.value().isEmpty() && !i.key().isEmpty()) {
             ui->profileTable->insertRow(0);
-            ui->profileTable->setItem(0, 0, new QTableWidgetItem(i.key()));
-            ui->profileTable->setItem(0, 1, new QTableWidgetItem(i.value()));
+            ui->profileTable->setItem(0, 0, createTableWidgetItem(i.key()).release());
+            ui->profileTable->setItem(0, 1, createTableWidgetItem(i.value()).release());
         }
     }
     auto selected = ui->profileTable->findItems(profile, Qt::MatchExactly);
     if (!selected.empty()) {
         ui->profileTable->selectRow(selected.front()->row());
     }
     ui->profileTable->setSortingEnabled(true);
 }
 
 /**
  * @brief ConfigDialog::getProfiles return profile list.
  * @return
  */
 QHash<QString, QString> ConfigDialog::getProfiles()
 {
     QHash<QString, QString> profiles;
     // Check?
     for (int i = 0; i < ui->profileTable->rowCount(); ++i) {
         QTableWidgetItem *pathItem = ui->profileTable->item(i, 1);
         if (nullptr != pathItem) {
             QTableWidgetItem *item = ui->profileTable->item(i, 0);
             if (item == nullptr) {
                 continue;
             }
             profiles.insert(item->text(), pathItem->text());
         }
     }
     return profiles;
 }
 
 /**
  * @brief ConfigDialog::on_addButton_clicked add a profile row.
  */
 void ConfigDialog::addProfile()
 {
+    if (!checkNewProfileData()) {
+        return;
+    }
     ui->profileTable->setSortingEnabled(false);
     int n = ui->profileTable->rowCount();
     ui->profileTable->insertRow(n);
-    ui->profileTable->setItem(n, 0, new QTableWidgetItem());
-    ui->profileTable->setItem(n, 1, new QTableWidgetItem(ui->storePath->text()));
+    ui->profileTable->setItem(n, 0, createTableWidgetItem(ui->newProfileNameEdit->text()).release());
+    ui->profileTable->setItem(n, 1, createTableWidgetItem(ui->profileStorePath->text()).release());
     ui->profileTable->selectRow(n);
     ui->deleteButton->setEnabled(true);
     ui->profileTable->setSortingEnabled(true);
-
-    validate();
 }
 
 /**
  * @brief ConfigDialog::on_deleteButton_clicked remove a profile row.
  */
 void ConfigDialog::deleteSelectedProfile()
 {
     QSet<int> selectedRows; // we use a set to prevent doubles
     const QList<QTableWidgetItem *> itemList = ui->profileTable->selectedItems();
     if (itemList.count() == 0) {
         QMessageBox::warning(this, i18n("No profile selected"), i18n("No profile selected to delete"));
         return;
     }
     ui->profileTable->setSortingEnabled(false);
     for (const auto *item : itemList)
         selectedRows.insert(item->row());
     // get a list, and sort it big to small
     QList<int> rows = selectedRows.values();
     std::sort(rows.begin(), rows.end());
     // now actually do the removing:
     for (int row : qAsConst(rows))
         ui->profileTable->removeRow(row);
     if (ui->profileTable->rowCount() < 1)
         ui->deleteButton->setEnabled(false);
     ui->profileTable->setSortingEnabled(true);
-
-    validate();
 }
 
 void ConfigDialog::setPasswordConfiguration(const PasswordConfiguration &config)
 {
     ui->spinBoxPasswordLength->setValue(config.length);
     ui->passwordCharTemplateSelector->setCurrentIndex(config.selected);
 }
 
 PasswordConfiguration ConfigDialog::getPasswordConfiguration()
 {
     PasswordConfiguration config;
     config.length = ui->spinBoxPasswordLength->value();
     config.selected = static_cast<PasswordConfiguration::characterSet>(ui->passwordCharTemplateSelector->currentIndex());
     return config;
 }
 
 /**
  * @brief ConfigDialog::on_checkBoxUseTemplate_clicked enable or disable the
  * template field and options.
  */
 void ConfigDialog::toggleTemplateSubentries(bool enable)
 {
     ui->plainTextEditTemplate->setEnabled(enable);
     ui->checkBoxTemplateAllFields->setEnabled(enable);
 }
 
-void ConfigDialog::onProfileTableItemChanged(QTableWidgetItem *item)
-{
-    validate(item);
-}
-
 /**
  * @brief ConfigDialog::useTemplate set preference for using templates.
  * @param useTemplate
  */
 void ConfigDialog::useTemplate(bool useTemplate)
 {
     ui->checkBoxUseTemplate->setChecked(useTemplate);
     toggleTemplateSubentries(useTemplate);
 }
diff --git a/src/configdialog.h b/src/configdialog.h
index c85d18c..819a840 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -1,68 +1,66 @@
 /*
     SPDX-FileCopyrightText: 2014-2023 Anne Jan Brouwer <brouwer@annejan.com>
     SPDX-FileCopyrightText: 2018 Claudio Maradonna <penguyman@stronzi.org>
     SPDX-FileCopyrightText: 2023 g10 Code GmbH
     SPDX-FileContributor: Sune Stolborg Vuorela <sune@vuorela.dk>
 
     SPDX-License-Identifier: GPL-3.0-or-later
 */
 #ifndef CONFIGDIALOG_H_
 #define CONFIGDIALOG_H_
 
 #include "passwordconfiguration.h"
 #include <QDialog>
 
 namespace Ui
 {
 struct UserInfo;
 
 class ConfigDialog;
 } // namespace Ui
 
 /*!
     \class ConfigDialog
     \brief The ConfigDialog handles the configuration interface.
 
     This class should also take the handling from the MainWindow class.
 */
 class MainWindow;
 class QCloseEvent;
 class QTableWidgetItem;
 class ConfigDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     explicit ConfigDialog(MainWindow *parent);
     ~ConfigDialog();
 
-    void useAutoclear(bool useAutoclear);
-    void useAutoclearPanel(bool useAutoclearPanel);
-    QHash<QString, QString> getProfiles();
-    void setPasswordConfiguration(const PasswordConfiguration &config);
-    PasswordConfiguration getPasswordConfiguration();
-    void useTemplate(bool useTemplate);
-
 private Q_SLOTS:
     void on_accepted();
     void selectStoreFolder();
     void addProfile();
     void deleteSelectedProfile();
     void toggleAutoClearPanelSubentries(bool enable);
     void toggleTemplateSubentries(bool enable);
-
-    void onProfileTableItemChanged(QTableWidgetItem *item);
+    void validateNewProfile();
 
 private:
+    void useAutoclear(bool useAutoclear);
+    void useAutoclearPanel(bool useAutoclearPanel);
+    QHash<QString, QString> getProfiles();
+    void setPasswordConfiguration(const PasswordConfiguration &config);
+    PasswordConfiguration getPasswordConfiguration();
+    void useTemplate(bool useTemplate);
     QScopedPointer<Ui::ConfigDialog> ui;
 
     void setProfiles(const QHash<QString, QString>&, const QString&);
 
     QString selectFolder();
 
-    void validate(QTableWidgetItem *item = nullptr);
+    bool checkNewProfileData();
 
     MainWindow *mainWindow;
 };
 
 #endif // CONFIGDIALOG_H_
diff --git a/src/configdialog.ui b/src/configdialog.ui
index 86eb08e..bc4499f 100644
--- a/src/configdialog.ui
+++ b/src/configdialog.ui
@@ -1,647 +1,690 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfigDialog</class>
  <widget class="QDialog" name="ConfigDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>659</width>
     <height>728</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Configuration</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>6</number>
    </property>
    <property name="topMargin">
     <number>6</number>
    </property>
    <property name="rightMargin">
     <number>6</number>
    </property>
    <property name="bottomMargin">
     <number>6</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="Tab_Settings">
       <attribute name="title">
        <string>Settings</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="leftMargin">
         <number>6</number>
        </property>
        <property name="topMargin">
         <number>6</number>
        </property>
        <property name="rightMargin">
         <number>6</number>
        </property>
        <property name="bottomMargin">
         <number>6</number>
        </property>
        <item>
         <layout class="QVBoxLayout" name="Layout_Clipboard">
          <item>
           <widget class="QLabel" name="label_8">
            <property name="font">
             <font>
              <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
            <property name="text">
             <string>Clipboard behaviour:</string>
            </property>
           </widget>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="QCheckBox" name="checkBoxAutoclear">
              <property name="text">
               <string>Autoclear after:</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QSpinBox" name="spinBoxAutoclearSeconds">
              <property name="minimum">
               <number>5</number>
              </property>
              <property name="value">
               <number>10</number>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QLabel" name="labelSeconds">
              <property name="text">
               <string>Seconds</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer name="horizontalSpacer_4">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QVBoxLayout" name="Layout_PasswordBehaviour">
          <item>
           <widget class="QLabel" name="label_6">
            <property name="font">
             <font>
              <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
            <property name="text">
             <string>Content panel behaviour:</string>
            </property>
           </widget>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_6">
            <property name="topMargin">
             <number>0</number>
            </property>
            <item>
             <widget class="QCheckBox" name="checkBoxHideContent">
              <property name="text">
               <string>Hide content</string>
              </property>
             </widget>
            </item>
            <item>
             <layout class="QHBoxLayout" name="horizontalLayout_7">
              <item>
               <widget class="QCheckBox" name="checkBoxAutoclearPanel">
                <property name="text">
                 <string>Autoclear panel after:</string>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QSpinBox" name="spinBoxAutoclearPanelSeconds">
                <property name="minimum">
                 <number>5</number>
                </property>
                <property name="value">
                 <number>10</number>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QLabel" name="labelPanelSeconds">
                <property name="minimumSize">
                 <size>
                  <width>55</width>
                  <height>0</height>
                 </size>
                </property>
                <property name="text">
                 <string>Seconds</string>
                </property>
               </widget>
              </item>
             </layout>
            </item>
            <item>
             <spacer name="horizontalSpacer_5">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_19">
            <item>
             <widget class="QCheckBox" name="checkBoxDisplayAsIs">
              <property name="text">
               <string>Display the files content as-is</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QCheckBox" name="checkBoxNoLineWrapping">
              <property name="text">
               <string>No line wrapping</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer name="horizontalSpacer_9">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
                <height>20</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QVBoxLayout" name="Layout_PasswordGeneration">
          <item>
           <widget class="QLabel" name="label_4">
            <property name="font">
             <font>
              <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
            <property name="text">
             <string>Password Generation:</string>
            </property>
           </widget>
          </item>
          <item>
           <layout class="QFormLayout" name="formLayout_2">
            <property name="topMargin">
             <number>0</number>
            </property>
            <item row="0" column="0">
             <widget class="QLabel" name="label_7">
              <property name="text">
               <string>Password Length:</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_13">
              <item>
               <widget class="QSpinBox" name="spinBoxPasswordLength">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="minimumSize">
                 <size>
                  <width>50</width>
                  <height>0</height>
                 </size>
                </property>
                <property name="minimum">
                 <number>8</number>
                </property>
                <property name="maximum">
                 <number>255</number>
                </property>
                <property name="value">
                 <number>16</number>
                </property>
               </widget>
              </item>
              <item>
               <widget class="QLabel" name="labelLength">
                <property name="enabled">
                 <bool>true</bool>
                </property>
                <property name="text">
                 <string>Characters</string>
                </property>
               </widget>
              </item>
              <item>
               <spacer name="horizontalSpacer_2">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeType">
                 <enum>QSizePolicy::Expanding</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
                 </size>
                </property>
               </spacer>
              </item>
             </layout>
            </item>
            <item row="1" column="0">
             <widget class="QLabel" name="labelPasswordChars">
              <property name="enabled">
               <bool>true</bool>
              </property>
              <property name="text">
               <string>Use characters:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
             <layout class="QHBoxLayout" name="horizontalLayout_10">
              <property name="topMargin">
               <number>0</number>
              </property>
              <item>
               <widget class="QComboBox" name="passwordCharTemplateSelector">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
                <property name="toolTip">
                 <string>Select character set for password generation</string>
                </property>
                <item>
                 <property name="text">
                  <string>All Characters</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Alphabetical</string>
                 </property>
                </item>
                <item>
                 <property name="text">
                  <string>Alphanumerical</string>
                 </property>
                </item>
               </widget>
              </item>
              <item>
               <spacer name="horizontalSpacer_3">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>40</width>
                  <height>20</height>
                 </size>
                </property>
               </spacer>
              </item>
             </layout>
            </item>
           </layout>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QVBoxLayout" name="Layout_System">
          <property name="topMargin">
           <number>0</number>
          </property>
         </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Tab_Profiles">
       <attribute name="title">
        <string>Profiles</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <property name="leftMargin">
-        <number>6</number>
-       </property>
-       <property name="topMargin">
-        <number>6</number>
-       </property>
-       <property name="rightMargin">
-        <number>6</number>
-       </property>
-       <property name="bottomMargin">
-        <number>6</number>
-       </property>
+      <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,0">
        <item>
         <widget class="QTableWidget" name="profileTable">
          <property name="sizePolicy">
           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Plain</enum>
          </property>
          <property name="lineWidth">
           <number>0</number>
          </property>
          <property name="editTriggers">
           <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
          </property>
          <property name="alternatingRowColors">
           <bool>true</bool>
          </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::SingleSelection</enum>
          </property>
          <property name="selectionBehavior">
           <enum>QAbstractItemView::SelectRows</enum>
          </property>
          <property name="sortingEnabled">
           <bool>true</bool>
          </property>
          <column>
           <property name="text">
            <string>Name</string>
           </property>
          </column>
          <column>
           <property name="text">
            <string>Path</string>
           </property>
          </column>
         </widget>
        </item>
        <item>
-        <layout class="QGridLayout" name="gridLayout_11">
-         <item row="0" column="0">
-          <widget class="QToolButton" name="addButton">
-           <property name="text">
-            <string>Add</string>
-           </property>
-           <property name="icon">
-            <iconset theme="list-add">
-             <normalon>document-new</normalon>
-            </iconset>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonFollowStyle</enum>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QToolButton" name="deleteButton">
-           <property name="text">
-            <string>Delete</string>
-           </property>
-           <property name="icon">
-            <iconset theme="list-remove">
-             <normalon>edit-delete</normalon>
-            </iconset>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonFollowStyle</enum>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QLabel" name="labelStorePath">
-           <property name="text">
-            <string>Current path</string>
-           </property>
-          </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout">
+           <item>
+            <widget class="QToolButton" name="deleteButton">
+             <property name="text">
+              <string>Delete selected profile</string>
+             </property>
+             <property name="icon">
+              <iconset theme="list-remove">
+               <normalon>edit-delete</normalon>
+              </iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonFollowStyle</enum>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
          </item>
-         <item row="0" column="4">
-          <widget class="QToolButton" name="toolButtonStore">
-           <property name="text">
-            <string>…</string>
+         <item>
+          <widget class="Line" name="line">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
            </property>
           </widget>
          </item>
-         <item row="0" column="3">
-          <widget class="QLineEdit" name="storePath"/>
+         <item>
+          <layout class="QFormLayout" name="formLayout">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_3">
+             <property name="text">
+              <string>Name:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="newProfileNameEdit"/>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
+              <string>Path:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <layout class="QHBoxLayout" name="horizontalLayout_2">
+             <item>
+              <widget class="QLineEdit" name="profileStorePath"/>
+             </item>
+             <item>
+              <widget class="QToolButton" name="toolButtonStore">
+               <property name="text">
+                <string>…</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="3" column="1">
+            <widget class="QToolButton" name="addButton">
+             <property name="text">
+              <string>Add profile</string>
+             </property>
+             <property name="icon">
+              <iconset theme="list-add">
+               <normalon>document-new</normalon>
+              </iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonFollowStyle</enum>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QCheckBox" name="createNewProfileFolder">
+             <property name="text">
+              <string>Create folder if not exists</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="currentPathLabel">
+             <property name="text">
+              <string>Current Path:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLineEdit" name="currentPathLineEdit"/>
+           </item>
+          </layout>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Tab_Template">
       <attribute name="title">
        <string>Template</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <property name="leftMargin">
         <number>6</number>
        </property>
        <property name="topMargin">
         <number>6</number>
        </property>
        <property name="rightMargin">
         <number>6</number>
        </property>
        <property name="bottomMargin">
         <number>6</number>
        </property>
        <item>
         <widget class="QLabel" name="label_2">
          <property name="locale">
           <locale language="German" country="Germany"/>
          </property>
          <property name="text">
           <string>Templates add extra fields in the password generation dialogue, and in the password view.</string>
          </property>
         </widget>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <item>
           <widget class="QCheckBox" name="checkBoxUseTemplate">
            <property name="text">
             <string>Use template</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QCheckBox" name="checkBoxTemplateAllFields">
            <property name="toolTip">
             <string>Show all lines beginning with a word followed by a colon as fields in password fields, not only the listed ones</string>
            </property>
            <property name="text">
             <string>Show all fields templated</string>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="QPlainTextEdit" name="plainTextEditTemplate">
          <property name="frameShadow">
           <enum>QFrame::Plain</enum>
          </property>
          <property name="plainText">
           <string>login
 URL
 e-mail</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>GnuPG Password Manager version</string>
        </property>
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="standardButtons">
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>profileTable</tabstop>
-  <tabstop>addButton</tabstop>
-  <tabstop>deleteButton</tabstop>
-  <tabstop>storePath</tabstop>
-  <tabstop>toolButtonStore</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ConfigDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>556</x>
      <y>518</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
      <y>214</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>ConfigDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>556</x>
      <y>518</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
      <y>214</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>