diff --git a/dialogs/aboutmedialog.ui b/dialogs/aboutmedialog.ui
index ee78f65..b06751a 100644
--- a/dialogs/aboutmedialog.ui
+++ b/dialogs/aboutmedialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>About me</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
    <item>
diff --git a/dialogs/authenticationdialog.ui b/dialogs/authenticationdialog.ui
index 722b301..5def3d0 100644
--- a/dialogs/authenticationdialog.ui
+++ b/dialogs/authenticationdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Authentication</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/dialogs/buchungdialog.ui b/dialogs/buchungdialog.ui
index ecc8705..985a5e2 100644
--- a/dialogs/buchungdialog.ui
+++ b/dialogs/buchungdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Buchung</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
    <item>
diff --git a/dialogs/settingsdialog.cpp b/dialogs/settingsdialog.cpp
index 9fd177c..5b6f3bc 100644
--- a/dialogs/settingsdialog.cpp
+++ b/dialogs/settingsdialog.cpp
@@ -10,8 +10,8 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent)
 {
     ui->setupUi(this);
 
-    ui->lineEditBuchungKommenBackgroundColor->setText(settings.buchungKommenBackgroundColor());
-    ui->lineEditBuchungGehenBackgroundColor->setText(settings.buchungGehenBackgroundColor());
+    ui->lineEditBuchungStartBackgroundColor->setText(settings.buchungStartBackgroundColor());
+    ui->lineEditBuchungEndBackgroundColor->setText(settings.buchungEndBackgroundColor());
     ui->lineEditBuchungOtherBackgroundColor->setText(settings.buchungOtherBackgroundColor());
     ui->lineEditTimeAssignmentBackgroundColor->setText(settings.timeAssignmentBackgroundColor());
 
@@ -25,10 +25,10 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::submit()
 {
-    if(ui->lineEditBuchungKommenBackgroundColor->text() != m_settings.buchungKommenBackgroundColor())
-        m_settings.setBuchungKommenBackgroundColor(ui->lineEditBuchungKommenBackgroundColor->text());
-    if(ui->lineEditBuchungGehenBackgroundColor->text() != m_settings.buchungGehenBackgroundColor())
-        m_settings.setBuchungGehenBackgroundColor(ui->lineEditBuchungGehenBackgroundColor->text());
+    if(ui->lineEditBuchungStartBackgroundColor->text() != m_settings.buchungStartBackgroundColor())
+        m_settings.setBuchungStartBackgroundColor(ui->lineEditBuchungStartBackgroundColor->text());
+    if(ui->lineEditBuchungEndBackgroundColor->text() != m_settings.buchungEndBackgroundColor())
+        m_settings.setBuchungEndBackgroundColor(ui->lineEditBuchungEndBackgroundColor->text());
     if(ui->lineEditBuchungOtherBackgroundColor->text() != m_settings.buchungOtherBackgroundColor())
         m_settings.setBuchungOtherBackgroundColor(ui->lineEditBuchungOtherBackgroundColor->text());
     if(ui->lineEditTimeAssignmentBackgroundColor->text() != m_settings.timeAssignmentBackgroundColor())
diff --git a/dialogs/settingsdialog.ui b/dialogs/settingsdialog.ui
index cc0a5db..e4c48f9 100644
--- a/dialogs/settingsdialog.ui
+++ b/dialogs/settingsdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
    <item>
@@ -30,22 +30,22 @@
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="labelbuchungKommenBackgroundColor">
+      <widget class="QLabel" name="labelbuchungStartBackgroundColor">
        <property name="text">
-        <string>buchungKommenBackgroundColor</string>
+        <string>buchungStartBackgroundColor</string>
        </property>
        <property name="buddy">
-        <cstring>lineEditBuchungKommenBackgroundColor</cstring>
+        <cstring>lineEditBuchungStartBackgroundColor</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="labelbuchungGehenBackgroundColor">
+      <widget class="QLabel" name="labelbuchungEndBackgroundColor">
        <property name="text">
-        <string>buchungGehenBackgroundColor</string>
+        <string>buchungEndBackgroundColor</string>
        </property>
        <property name="buddy">
-        <cstring>lineEditBuchungGehenBackgroundColor</cstring>
+        <cstring>lineEditBuchungEndBackgroundColor</cstring>
        </property>
       </widget>
      </item>
@@ -70,10 +70,10 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEditBuchungKommenBackgroundColor"/>
+      <widget class="QLineEdit" name="lineEditBuchungStartBackgroundColor"/>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="lineEditBuchungGehenBackgroundColor"/>
+      <widget class="QLineEdit" name="lineEditBuchungEndBackgroundColor"/>
      </item>
      <item row="2" column="1">
       <widget class="QLineEdit" name="lineEditBuchungOtherBackgroundColor"/>
diff --git a/dialogs/timeassignmentdialog.ui b/dialogs/timeassignmentdialog.ui
index 49daa76..017efdb 100644
--- a/dialogs/timeassignmentdialog.ui
+++ b/dialogs/timeassignmentdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Time assignment</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
    <item>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b414abd..68d8177 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -862,7 +862,7 @@ void MainWindow::validateEntries()
         auto startBuchung = *buchungenIter++;
         if(startBuchung.type != QStringLiteral("K"))
         {
-            errorMessage = tr("Expected Buchung for Kommen, instead got type %0\nBuchung ID: %1")
+            errorMessage = tr("Expected start Buchung, instead got type %0\nBuchung ID: %1")
                     .arg(startBuchung.type)
                     .arg(startBuchung.id);
             goto after;
@@ -940,7 +940,7 @@ void MainWindow::validateEntries()
                 {
                     if(timeAssignmentsIter == m_timeAssignmentsModel->constEnd())
                     {
-                        errorMessage = tr("The last time assignment is finished without Gehen-Buchung\nTime assignment ID: %0")
+                        errorMessage = tr("The last time assignment is finished without end Buchung\nTime assignment ID: %0")
                                 .arg(timeAssignment.id);
                         goto after;
                     }
@@ -989,7 +989,7 @@ void MainWindow::validateEntries()
                 auto endBuchung = *buchungenIter++;
                 if(endBuchung.type != QStringLiteral("G"))
                 {
-                    errorMessage = tr("Expected Buchung for Gehen, instead got type %0\nBuchung ID: %1")
+                    errorMessage = tr("Expected end Buchung, instead got type %0\nBuchung ID: %1")
                             .arg(endBuchung.type)
                             .arg(endBuchung.id);
                     goto after;
diff --git a/mainwindow.ui b/mainwindow.ui
index 68cf16a..43590c5 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -10,9 +10,6 @@
     <height>581</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
   <property name="windowIcon">
    <iconset resource="resources.qrc">
     <normaloff>:/zeiterfassung/images/icon.png</normaloff>:/zeiterfassung/images/icon.png</iconset>
diff --git a/strips/buchungstrip.cpp b/strips/buchungstrip.cpp
index 07d1058..29106b5 100644
--- a/strips/buchungstrip.cpp
+++ b/strips/buchungstrip.cpp
@@ -18,13 +18,13 @@ BuchungStrip::BuchungStrip(int id, const QTime &time, const QString &type, const
     ui->labelTime->setText(time.toString(QStringLiteral("HH:mm")));
     if(type == QStringLiteral("K"))
     {
-        setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungKommenBackgroundColor()));
-        ui->labelType->setText(tr("KOMMEN"));
+        setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungStartBackgroundColor()));
+        ui->labelType->setText(tr("START"));
     }
     else if(type == QStringLiteral("G"))
     {
-        setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungGehenBackgroundColor()));
-        ui->labelType->setText(tr("GEHEN"));
+        setStyleSheet(QStringLiteral("%0 { background-color: %1; }").arg(staticMetaObject.className()).arg(settings.buchungEndBackgroundColor()));
+        ui->labelType->setText(tr("END"));
     }
     else
     {
diff --git a/strips/buchungstrip.ui b/strips/buchungstrip.ui
index 2ea348b..f381e60 100644
--- a/strips/buchungstrip.ui
+++ b/strips/buchungstrip.ui
@@ -10,9 +10,6 @@
     <height>52</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <property name="frameShape">
    <enum>QFrame::WinPanel</enum>
   </property>
diff --git a/strips/timeassignmentstrip.ui b/strips/timeassignmentstrip.ui
index c665ad7..effb0a0 100644
--- a/strips/timeassignmentstrip.ui
+++ b/strips/timeassignmentstrip.ui
@@ -10,9 +10,6 @@
     <height>80</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <property name="frameShape">
    <enum>QFrame::WinPanel</enum>
   </property>
diff --git a/zeiterfassungsettings.cpp b/zeiterfassungsettings.cpp
index 48dd0cd..f1cf9b2 100644
--- a/zeiterfassungsettings.cpp
+++ b/zeiterfassungsettings.cpp
@@ -132,24 +132,24 @@ void ZeiterfassungSettings::prependText(const QString &text)
     prepentItem("texte", text);
 }
 
-QString ZeiterfassungSettings::buchungKommenBackgroundColor() const
+QString ZeiterfassungSettings::buchungStartBackgroundColor() const
 {
-    return value("buchungKommenBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #7FFF7F, stop:1 #6FBF6F)")).toString();
+    return value("buchungStartBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #7FFF7F, stop:1 #6FBF6F)")).toString();
 }
 
-void ZeiterfassungSettings::setBuchungKommenBackgroundColor(const QString &buchungKommenBackgroundColor)
+void ZeiterfassungSettings::setBuchungStartBackgroundColor(const QString &buchungStartBackgroundColor)
 {
-    setValue("buchungKommenBackgroundColor", buchungKommenBackgroundColor);
+    setValue("buchungStartBackgroundColor", buchungStartBackgroundColor);
 }
 
-QString ZeiterfassungSettings::buchungGehenBackgroundColor() const
+QString ZeiterfassungSettings::buchungEndBackgroundColor() const
 {
-    return value("buchungGehenBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #FF7F7F, stop:1 #BF6F6F)")).toString();
+    return value("buchungEndBackgroundColor", QStringLiteral("qlineargradient( x1:0 y1:0, x2:0 y2:1, stop:0 #FF7F7F, stop:1 #BF6F6F)")).toString();
 }
 
-void ZeiterfassungSettings::setBuchungGehenBackgroundColor(const QString &buchungGehenBackgroundColor)
+void ZeiterfassungSettings::setBuchungEndBackgroundColor(const QString &buchungEndBackgroundColor)
 {
-    setValue("buchungGehenBackgroundColor", buchungGehenBackgroundColor);
+    setValue("buchungEndBackgroundColor", buchungEndBackgroundColor);
 }
 
 QString ZeiterfassungSettings::buchungOtherBackgroundColor() const
diff --git a/zeiterfassungsettings.h b/zeiterfassungsettings.h
index 0955427..9b6c9be 100644
--- a/zeiterfassungsettings.h
+++ b/zeiterfassungsettings.h
@@ -46,11 +46,11 @@ public:
     void setTexte(const QStringList &texte);
     void prependText(const QString &text);
 
-    QString buchungKommenBackgroundColor() const;
-    void setBuchungKommenBackgroundColor(const QString &buchungKommenBackgroundColor);
+    QString buchungStartBackgroundColor() const;
+    void setBuchungStartBackgroundColor(const QString &buchungStartBackgroundColor);
 
-    QString buchungGehenBackgroundColor() const;
-    void setBuchungGehenBackgroundColor(const QString &buchungGehenBackgroundColor);
+    QString buchungEndBackgroundColor() const;
+    void setBuchungEndBackgroundColor(const QString &buchungEndBackgroundColor);
 
     QString buchungOtherBackgroundColor() const;
     void setBuchungOtherBackgroundColor(const QString &buchungOtherBackgroundColor);