Imported Upstream version 0.6.2upstream/0.6.2

9 files changed, 1083 insertions, 1089 deletions

diff --git a/resources/locale/de/LC_MESSAGES/de.po b/resources/locale/de/LC_MESSAGES/de.po
index 74e4175..b942915 100644
--- a/resources/locale/de/LC_MESSAGES/de.po
+++ b/resources/locale/de/LC_MESSAGES/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnomepie 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-07 08:55+0200\n"
+"POT-Creation-Date: 2015-05-02 14:39+0200\n"
 "PO-Revision-Date: 2011-08-25 21:04+0200\n"
 "Last-Translator: Simon Schneegans <code@simonschneegans.de>\n"
 "Language-Team: German\n"
@@ -17,6 +17,235 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../ui/pie_options.ui:53
+msgid "Activation Settings"
+msgstr "Aktivierungsoptionen"
+
+#: ../ui/pie_options.ui:153
+msgid "Unamed Pie"
+msgstr "Neuer Pie"
+
+#: ../ui/pie_options.ui:216
+msgid "ID:"
+msgstr "ID:"
+
+#: ../ui/pie_options.ui:234
+msgid "It's possible to bind mouse buttons as well!"
+msgstr "Es ist auch möglich, Maustasten zu binden!"
+
+#: ../ui/pie_options.ui:274
+msgid "Turbo mode"
+msgstr "Turbo-Mode"
+
+#: ../ui/pie_options.ui:280 ../ui/pie_options.ui:281
+msgid "If checked, the Pie will close when you release the chosen hot key."
+msgstr ""
+"Falls aktiviert schließt sich der Pie wieder automatisch, wenn der Hotkey "
+"losgelassen wird."
+
+#: ../ui/pie_options.ui:293
+msgid "Long press for activation"
+msgstr "Verzögerte Aktivierung"
+
+#: ../ui/pie_options.ui:299 ../ui/pie_options.ui:300
+msgid ""
+"If checked, the Pie will only open if you press this hot key a bit longer."
+msgstr ""
+"Falls aktiviert, wird sich der Pie erst öffnen, wenn der Hotkey länger "
+"gedrückt gehalten wird."
+
+#: ../ui/pie_options.ui:312
+msgid "Open Pie centered on the screen"
+msgstr "Zentriert auf dem Bildschirm öffnen"
+
+#: ../ui/pie_options.ui:318 ../ui/pie_options.ui:319
+msgid ""
+"If checked, the Pie will open in the middle of your screen. Else it will pop "
+"up at your pointer."
+msgstr ""
+"Falls aktiviert, wird sich der Pie nicht an der Maus, sondern in der Mitte "
+"des Bildschirms öffnen."
+
+#: ../ui/pie_options.ui:331
+msgid "Warp mouse pointer to center of Pie"
+msgstr "Bewege den Mauszeiger zur Mitte des Pies"
+
+#: ../ui/pie_options.ui:337 ../ui/pie_options.ui:338
+msgid ""
+"If checked, the mouse pointer will be warped to the center of the Pie. This "
+"allows for quick selections even if the Pie is opened at the screen's "
+"boundary."
+msgstr ""
+"Falls aktiviert, wird der Mauszeiger nach dem dem Öffenen des Pies zu dessen "
+"Mitte bewegt. Dadurch kann auch an den Seiten des Bildschirms schnell "
+"selektiert werden."
+
+#: ../ui/pie_options.ui:356
+msgid "Activation options"
+msgstr "Aktivierungsoptionen"
+
+#: ../ui/pie_options.ui:547
+msgid "Automatically select the best pie shape"
+msgstr "Wähle die Anordnung automatisch"
+
+#: ../ui/pie_options.ui:551
+msgid ""
+"If checked, the shape will be automatically selected to minimize mouse "
+"travelling."
+msgstr ""
+"Falls aktiviert, wird je nach Position auf dem Bildschirm eine passende "
+"Anordnung gweählt."
+
+#: ../ui/pie_options.ui:571
+msgid "Pie shape"
+msgstr "Anordnung"
+
+#: ../ui/slice_select.ui:8
+msgid "Slice Options"
+msgstr "Slice-Optionen"
+
+#: ../ui/slice_select.ui:140
+msgid "There are no options for this Slice type."
+msgstr "Es gibt keine Otionen für diesen Slice-Typ."
+
+#: ../ui/slice_select.ui:166
+msgid "Name of the Slice "
+msgstr "Name"
+
+#: ../ui/slice_select.ui:204
+msgid "URI to open"
+msgstr "URI"
+
+#: ../ui/slice_select.ui:242
+msgid "Command to execute"
+msgstr "Befehl"
+
+#: ../ui/slice_select.ui:280
+msgid "Hotkey to press"
+msgstr "Tastenkomination"
+
+#: ../ui/slice_select.ui:309
+msgid "Pie to open"
+msgstr "Pie"
+
+#: ../ui/slice_select.ui:338
+msgid "Is Quick Action"
+msgstr "Ist Quick Action"
+
+#: ../ui/slice_select.ui:353 ../ui/slice_select.ui:354
+msgid "This Slice will be executed when you click in the middle of the Pie."
+msgstr "Diese Slice wird aktiviert, falls du in die Mitte des Pies klickst."
+
+#: ../ui/slice_select.ui:386
+msgid "Slice options"
+msgstr "Slice-Optionen"
+
+#: ../ui/icon_select.ui:9
+msgid "Select an icon"
+msgstr "Wähle ein Symbol"
+
+#: ../ui/icon_select.ui:103
+msgid "Icon Theme"
+msgstr "Symbolthema"
+
+#: ../ui/icon_select.ui:123
+msgid "Custom Icon"
+msgstr "Benutzerdefiniertes Symbol"
+
+#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:76
+msgid "Gnome-Pie Settings"
+msgstr "Gnome-Pie - Einstellungen"
+
+#: ../ui/preferences.ui:73
+msgid "Start Gnome-Pie on login"
+msgstr "Beim Anmelden automatisch ausführen"
+
+#: ../ui/preferences.ui:79 ../ui/preferences.ui:80
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr "Wenn aktiviert, startet Gnome-Pie im Hintergrund beim Anmelden."
+
+#: ../ui/preferences.ui:92
+msgid "Display panel icon "
+msgstr "Zeige ein Symbol im Panel"
+
+#: ../ui/preferences.ui:98 ../ui/preferences.ui:99
+msgid ""
+"If not checked, you can access this menu by launching Gnome-Pie a second "
+"time."
+msgstr ""
+"Falls nicht aktiviert, kann dieses Menü durch ein nochmaliges starten von "
+"Gnome-Pie geöffnet werden."
+
+#: ../ui/preferences.ui:119
+msgid "Activation radius"
+msgstr "Aktivierungsentfernung"
+
+#: ../ui/preferences.ui:157
+msgid "Behavior"
+msgstr "Verhalten"
+
+#: ../ui/preferences.ui:192
+msgid "Display Slice labels"
+msgstr "Zeige Namen der Slices"
+
+#: ../ui/preferences.ui:198 ../ui/preferences.ui:199
+msgid ""
+"Displays the name of each Slice next to it. Only available if supported by "
+"the theme."
+msgstr ""
+"Zeigt den Name jeder Slice an. Nur möglich, wenn durch das aktuelle Thema "
+"unterstützt."
+
+#: ../ui/preferences.ui:219
+msgid "Global scale"
+msgstr "Skalierungsfaktor"
+
+#: ../ui/preferences.ui:259
+msgid "Maximum slices per pie"
+msgstr "Maximale Zahl von Einträgen pro Pie"
+
+#: ../ui/preferences.ui:297
+msgid "Appearance"
+msgstr "Erscheinungsbild"
+
+#: ../ui/preferences.ui:326 ../../src/gui/preferencesWindow.vala:107
+msgid "General Settings"
+msgstr "Allgemeine Einstellungen"
+
+#: ../ui/preferences.ui:518
+msgid ""
+"<b><big>This Pie is empty!</big>\n"
+"\n"
+"Start adding Slices to it!</b> This can be done by dragging stuff to the "
+"plus sign below. You can try a lot! For example application launchers or "
+"folders. Even URLs from your browser are possible...\n"
+"\n"
+"For manual and advanced configuration click on the plus sign."
+msgstr ""
+"<b><big>Der Pie ist leer!</big>\n"
+"\n"
+"Füge Slices hinzu!</b> Du kannst viele verschieden Dinge zu dem Pluszeichen "
+"ziehen! Zum Beispiel Anwendungsstarter aus deinem Menü, Dateien oder sogar "
+"URLs aus dem  Browser... \n"
+"\n"
+"Zur manuellen und fortgeschrittenen Konfiguration klicke auf das Symbol."
+
+#: ../ui/preferences.ui:539
+msgid ""
+"<b><big>You have no Pies!</big>\n"
+"\n"
+"Start by creating one! </b> This can be done by clicking on the tiny little "
+"plus sign in the lower left corner."
+msgstr ""
+"<b><big>Du hast keine Pies!</big>\n"
+"\n"
+"Erstelle einen neuen! </b> Klicke dazu einfach auf das kleine Pluszeichen "
+"unter der leeren Liste auf der linken Seite."
+
+#: ../ui/preferences.ui:606 ../../src/gui/preferencesWindow.vala:108
+msgid "Pie Settings"
+msgstr "Pie-Einstellungen"
+
 #: ../../src/actions/keyAction.vala:34
 msgid "Press hotkey"
 msgstr "Tastenkombination"
@@ -54,28 +283,19 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
 msgstr ""
 "Öffnet einen anderen Pie. Auf diese Art können Submenüs erstellt werden."
 
-#: ../../src/gui/preferencesWindow.vala:166
-msgid "No Pie selected."
-msgstr "Kein Pie gewählt."
+#: ../../src/gui/preferencesWindow.vala:77
+msgid "bake your pies!"
+msgstr "mach schöne Kuchen!"
 
-#: ../../src/gui/preferencesWindow.vala:206
+#: ../../src/gui/preferencesWindow.vala:350
 msgid "New Pie"
 msgstr "Neuer Pie"
 
-#: ../../src/gui/preferencesWindow.vala:219
+#: ../../src/gui/preferencesWindow.vala:365
 msgid ""
 "Do you really want to delete the selected Pie with all contained Slices?"
 msgstr "Soll dieser Pie wirklich mit allen Slices gelöscht werden?"
 
-#: ../../src/gui/triggerSelectWindow.vala:226
-msgid ""
-"This hotkey is already assigned to the pie \"%s\"! \n"
-"\n"
-"Please select another one or cancel your selection."
-msgstr ""
-"Dieser Hotkey ist schon dem Pie \"%s\" zugeordnet!\n"
-" Bitte wähle einen anderen!"
-
 #: ../../src/gui/piePreview.vala:148
 msgid "Do you really want to delete this Slice?"
 msgstr "Soll die ausgewählte Slice wirklich gelöscht werden?"
@@ -109,6 +329,10 @@ msgstr "Slice verschieben"
 msgid "Click to delete"
 msgstr "Löschen durch klicken"
 
+#: ../../src/gui/pieList.vala:77
+msgid "Pies"
+msgstr "Pie-Menüs"
+
 #: ../../src/gui/iconSelectWindow.vala:182
 msgid "All icons"
 msgstr "Alle Symbole"
@@ -142,15 +366,24 @@ msgstr "Sonstige"
 msgid "All supported image formats"
 msgstr "Alle unterstützten Bildformate"
 
-#: ../../src/gui/newSliceWindow.vala:291
+#: ../../src/gui/newSliceWindow.vala:292
 msgid "Rename me!"
 msgstr "Benenne mich!"
 
+#: ../../src/gui/pieOptionsWindow.vala:274
+msgid ""
+"This hotkey is already assigned to the pie \"%s\"! \n"
+"\n"
+"Please select another one or cancel your selection."
+msgstr ""
+"Dieser Hotkey ist schon dem Pie \"%s\" zugeordnet!\n"
+" Bitte wähle einen anderen!"
+
 #: ../../src/gui/themeList.vala:62
 msgid "Themes"
 msgstr "Themen"
 
-#: ../../src/gui/themeList.vala:99
+#: ../../src/gui/themeList.vala:102
 msgid "By"
 msgstr "Von"
 
@@ -174,7 +407,7 @@ msgstr "Schließen"
 msgid "Press a hotkey ..."
 msgstr "Wählen..."
 
-#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:177
+#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:186
 #: ../../src/utilities/trigger.vala:195 ../../src/utilities/trigger.vala:280
 #: ../../src/utilities/trigger.vala:281
 msgid "Not bound"
@@ -261,6 +494,14 @@ msgstr "Gruppe: Hauptmenü"
 msgid "Displays your main menu structure."
 msgstr "Zeigt das Hauptmenü an."
 
+#: ../../src/actionGroups/workspaceWindowListGroup.vala:35
+msgid "Group: Window List for current workspace"
+msgstr "Gruppe: Fensterliste für aktive Arbeitsfläche"
+
+#: ../../src/actionGroups/workspaceWindowListGroup.vala:37
+msgid "Shows a Slice for each of your opened windows on the current workspace."
+msgstr "Zeigt eine Slice für jedes geöffnete Fenster der aktiven Arbeitsfläche an."
+
 #: ../../src/actionGroups/sessionGroup.vala:35
 msgid "Group: Session Control"
 msgstr "Gruppe: Sitzung"
@@ -346,221 +587,5 @@ msgstr "Maximieren"
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: ../ui/trigger_select.ui:53
-msgid "Activation Settings"
-msgstr "Aktivierungsoptionen"
-
-#: ../ui/trigger_select.ui:132
-msgid "It's possible to bind mouse buttons as well!"
-msgstr "Es ist auch möglich, Maustasten zu binden!"
-
-#: ../ui/trigger_select.ui:165
-msgid "Turbo mode"
-msgstr "Turbo-Mode"
-
-#: ../ui/trigger_select.ui:171 ../ui/trigger_select.ui:172
-msgid "If checked, the Pie will close when you release the chosen hot key."
-msgstr ""
-"Falls aktiviert schließt sich der Pie wieder automatisch, wenn der Hotkey "
-"losgelassen wird."
-
-#: ../ui/trigger_select.ui:184
-msgid "Long press for activation"
-msgstr "Verzögerte Aktivierung"
-
-#: ../ui/trigger_select.ui:190 ../ui/trigger_select.ui:191
-msgid ""
-"If checked, the Pie will only open if you press this hot key a bit longer."
-msgstr ""
-"Falls aktiviert, wird sich der Pie erst öffnen, wenn der Hotkey länger "
-"gedrückt gehalten wird."
-
-#: ../ui/trigger_select.ui:203
-msgid "Open Pie centered on the screen"
-msgstr "Zentriert auf dem Bildschirm öffnen"
-
-#: ../ui/trigger_select.ui:209 ../ui/trigger_select.ui:210
-msgid ""
-"If checked, the Pie will open in the middle of your screen. Else it will pop "
-"up at your pointer."
-msgstr ""
-"Falls aktiviert, wird sich der Pie nicht an der Maus, sondern in der Mitte "
-"des Bildschirms öffnen."
-
-#: ../ui/trigger_select.ui:222
-msgid "Warp mouse pointer to center of Pie"
-msgstr "Bewege den Mauszeiger zur Mitte des Pies"
-
-#: ../ui/trigger_select.ui:228 ../ui/trigger_select.ui:229
-msgid ""
-"If checked, the mouse pointer will be warped to the center of the Pie. This "
-"allows for quick selections even if the Pie is opened at the screen's "
-"boundary."
-msgstr "Falls aktiviert, wird der Mauszeiger nach dem dem Öffenen des Pies zu "
-"dessen Mitte bewegt. Dadurch kann auch an den Seiten des Bildschirms schnell "
-"selektiert werden."
-
-#: ../ui/trigger_select.ui:247
-msgid "Activation options"
-msgstr "Aktivierungsoptionen"
-
-#: ../ui/trigger_select.ui:438
-msgid "Automatically select the best pie shape"
-msgstr "Wähle die Anordnung automatisch"
-
-#: ../ui/trigger_select.ui:442
-msgid ""
-"If checked, the shape will be automatically selected to minimize mouse "
-"travelling."
-msgstr "Falls aktiviert, wird je nach Position auf dem Bildschirm eine "
-"passende Anordnung gweählt."
-
-#: ../ui/trigger_select.ui:462
-msgid "Pie shape"
-msgstr "Anordnung"
-
-#: ../ui/slice_select.ui:8
-msgid "Slice Options"
-msgstr "Slice-Optionen"
-
-#: ../ui/slice_select.ui:141
-msgid "There are no options for this Slice type."
-msgstr "Es gibt keine Otionen für diesen Slice-Typ."
-
-#: ../ui/slice_select.ui:167
-msgid "Name of the Slice "
-msgstr "Name"
-
-#: ../ui/slice_select.ui:205
-msgid "URI to open"
-msgstr "URI"
-
-#: ../ui/slice_select.ui:243
-msgid "Command to execute"
-msgstr "Befehl"
-
-#: ../ui/slice_select.ui:281
-msgid "Hotkey to press"
-msgstr "Tastenkomination"
-
-#: ../ui/slice_select.ui:310
-msgid "Pie to open"
-msgstr "Pie"
-
-#: ../ui/slice_select.ui:339
-msgid "Is Quick Action"
-msgstr "Ist Quick Action"
-
-#: ../ui/slice_select.ui:354 ../ui/slice_select.ui:355
-msgid "This Slice will be executed when you click in the middle of the Pie."
-msgstr "Diese Slice wird aktiviert, falls du in die Mitte des Pies klickst."
-
-#: ../ui/slice_select.ui:387
-msgid "Slice options"
-msgstr "Slice-Optionen"
-
-#: ../ui/icon_select.ui:9
-msgid "Select an icon"
-msgstr "Wähle ein Symbol"
-
-#: ../ui/icon_select.ui:103
-msgid "Icon Theme"
-msgstr "Symbolthema"
-
-#: ../ui/icon_select.ui:123
-msgid "Custom Icon"
-msgstr "Benutzerdefiniertes Symbol"
-
-#: ../ui/rename_pie.ui:8
-msgid "Rename a Pie"
-msgstr "Pie umbenennen"
-
-#: ../ui/preferences.ui:7
-msgid "Gnome-Pie Settings"
-msgstr "Gnome-Pie - Einstellungen"
-
-#: ../ui/preferences.ui:27 ../ui/settings.ui:8
-msgid "General Settings"
-msgstr "Allgemeine Einstellungen"
-
-#: ../ui/preferences.ui:266
-msgid ""
-"<b><big>This Pie is empty!</big>\n"
-"\n"
-"Start adding Slices to it!</b> This can be done by dragging stuff to the "
-"plus sign below. You can try a lot! For example application launchers or "
-"folders. Even URLs from your browser are possible...\n"
-"\n"
-"For manual and advanced configuration click on the plus sign."
-msgstr ""
-"<b><big>Der Pie ist leer!</big>\n"
-"\n"
-"Füge Slices hinzu!</b> Du kannst viele verschieden Dinge zu dem Pluszeichen "
-"ziehen! Zum Beispiel Anwendungsstarter aus deinem Menü, Dateien oder sogar "
-"URLs aus dem  Browser... \n"
-"\n"
-"Zur manuellen und fortgeschrittenen Konfiguration klicke auf das Symbol."
-
-#: ../ui/preferences.ui:287
-msgid ""
-"<b><big>You have no Pies!</big>\n"
-"\n"
-"Start by creating one! </b> This can be done by clicking on the tiny little "
-"plus sign in the lower left corner."
-msgstr ""
-"<b><big>Du hast keine Pies!</big>\n"
-"\n"
-"Erstelle einen neuen! </b> Klicke dazu einfach auf das kleine Pluszeichen "
-"unter der leeren Liste auf der linken Seite."
-
-#: ../ui/settings.ui:75
-msgid "Start Gnome-Pie on login"
-msgstr "Beim Anmelden automatisch ausführen"
-
-#: ../ui/settings.ui:81 ../ui/settings.ui:82
-msgid "If checked, Gnome-Pie will start silently everytime you log in."
-msgstr "Wenn aktiviert, startet Gnome-Pie im Hintergrund beim Anmelden."
-
-#: ../ui/settings.ui:94
-msgid "Display panel icon "
-msgstr "Zeige ein Symbol im Panel"
-
-#: ../ui/settings.ui:100 ../ui/settings.ui:101
-msgid ""
-"If not checked, you can access this menu by launching Gnome-Pie a second "
-"time."
-msgstr ""
-"Falls nicht aktiviert, kann dieses Menü durch ein nochmaliges starten von "
-"Gnome-Pie geöffnet werden."
-
-#: ../ui/settings.ui:119
-msgid "Behavior"
-msgstr "Verhalten"
-
-#: ../ui/settings.ui:178
-msgid "Global scale"
-msgstr "Skalierungsfaktor"
-
-#: ../ui/settings.ui:217
-msgid "Maximum slices per pie"
-msgstr "Maximale Zahl von Einträgen pro Pie"
-
-#: ../ui/settings.ui:256
-msgid "Maximum activation radius"
-msgstr "Maximale Aktivierungsentfernung"
-
-#: ../ui/settings.ui:287
-msgid "Display Slice labels"
-msgstr "Zeige Namen der Slices"
-
-#: ../ui/settings.ui:293 ../ui/settings.ui:294
-msgid ""
-"Displays the name of each Slice next to it. Only available if supported by "
-"the theme."
-msgstr ""
-"Zeigt den Name jeder Slice an. Nur möglich, wenn durch das aktuelle Thema "
-"unterstützt."
-
-#: ../ui/settings.ui:312
-msgid "Appearance"
-msgstr "Erscheinungsbild"
+#~ msgid "No Pie selected."
+#~ msgstr "Kein Pie gewählt."
diff --git a/resources/locale/de/LC_MESSAGES/gnomepie.mo b/resources/locale/de/LC_MESSAGES/gnomepie.mo
index b888b32..cfdb11f 100644
--- a/resources/locale/de/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/de/LC_MESSAGES/gnomepie.mo
diff --git a/resources/locale/gen-pot.sh b/resources/locale/gen-pot.sh
index 3938b63..67b0b2c 100755
--- a/resources/locale/gen-pot.sh
+++ b/resources/locale/gen-pot.sh
@@ -7,30 +7,29 @@ domain="gnomepie"
 version="0.4"
 copyright="Simon Schneegans <code@simonschneegans.de>"
 
+rm $domain.pot
+
 filelist=$( find ../ui/ -name '*.ui' -printf "%h/%f " )
 xgettext --package-name $domain \
          --package-version $version \
          --default-domain $domain \
-         --output $domain.pot.tmp \
+         --output $domain.pot \
          --copyright-holder="$copyright" \
          --from-code utf-8 \
          -k_ \
          -L Glade \
          $filelist
 
-filelist=$( find ../../src/ -name '*.vala' -printf "%h/%f " )         
+filelist=$( find ../../src/ -name '*.vala' -printf "%h/%f " )
 xgettext --package-name $domain \
          --package-version $version \
          --default-domain $domain \
          --output $domain.pot \
          --copyright-holder="$copyright" \
          --from-code utf-8 \
+         --join-existing \
          -k_ \
          -L C# \
          $filelist
-         
-awk 'NR>18' $domain.pot.tmp >> $domain.pot
-
-sed --in-place $domain.pot --expression='s/CHARSET/UTF-8/'      
 
-rm $domain.pot.tmp
+sed --in-place $domain.pot --expression='s/CHARSET/UTF-8/'
diff --git a/resources/locale/gnomepie.pot b/resources/locale/gnomepie.pot
index b87c651..f3231ac 100644
--- a/resources/locale/gnomepie.pot
+++ b/resources/locale/gnomepie.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnomepie 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-07 08:55+0200\n"
+"POT-Creation-Date: 2015-05-02 14:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,209 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../ui/pie_options.ui:53
+msgid "Activation Settings"
+msgstr ""
+
+#: ../ui/pie_options.ui:153
+msgid "Unamed Pie"
+msgstr ""
+
+#: ../ui/pie_options.ui:216
+msgid "ID:"
+msgstr ""
+
+#: ../ui/pie_options.ui:234
+msgid "It's possible to bind mouse buttons as well!"
+msgstr ""
+
+#: ../ui/pie_options.ui:274
+msgid "Turbo mode"
+msgstr ""
+
+#: ../ui/pie_options.ui:280 ../ui/pie_options.ui:281
+msgid "If checked, the Pie will close when you release the chosen hot key."
+msgstr ""
+
+#: ../ui/pie_options.ui:293
+msgid "Long press for activation"
+msgstr ""
+
+#: ../ui/pie_options.ui:299 ../ui/pie_options.ui:300
+msgid ""
+"If checked, the Pie will only open if you press this hot key a bit longer."
+msgstr ""
+
+#: ../ui/pie_options.ui:312
+msgid "Open Pie centered on the screen"
+msgstr ""
+
+#: ../ui/pie_options.ui:318 ../ui/pie_options.ui:319
+msgid ""
+"If checked, the Pie will open in the middle of your screen. Else it will pop "
+"up at your pointer."
+msgstr ""
+
+#: ../ui/pie_options.ui:331
+msgid "Warp mouse pointer to center of Pie"
+msgstr ""
+
+#: ../ui/pie_options.ui:337 ../ui/pie_options.ui:338
+msgid ""
+"If checked, the mouse pointer will be warped to the center of the Pie. This "
+"allows for quick selections even if the Pie is opened at the screen's "
+"boundary."
+msgstr ""
+
+#: ../ui/pie_options.ui:356
+msgid "Activation options"
+msgstr ""
+
+#: ../ui/pie_options.ui:547
+msgid "Automatically select the best pie shape"
+msgstr ""
+
+#: ../ui/pie_options.ui:551
+msgid ""
+"If checked, the shape will be automatically selected to minimize mouse "
+"travelling."
+msgstr ""
+
+#: ../ui/pie_options.ui:571
+msgid "Pie shape"
+msgstr ""
+
+#: ../ui/slice_select.ui:8
+msgid "Slice Options"
+msgstr ""
+
+#: ../ui/slice_select.ui:140
+msgid "There are no options for this Slice type."
+msgstr ""
+
+#: ../ui/slice_select.ui:166
+msgid "Name of the Slice "
+msgstr ""
+
+#: ../ui/slice_select.ui:204
+msgid "URI to open"
+msgstr ""
+
+#: ../ui/slice_select.ui:242
+msgid "Command to execute"
+msgstr ""
+
+#: ../ui/slice_select.ui:280
+msgid "Hotkey to press"
+msgstr ""
+
+#: ../ui/slice_select.ui:309
+msgid "Pie to open"
+msgstr ""
+
+#: ../ui/slice_select.ui:338
+msgid "Is Quick Action"
+msgstr ""
+
+#: ../ui/slice_select.ui:353 ../ui/slice_select.ui:354
+msgid "This Slice will be executed when you click in the middle of the Pie."
+msgstr ""
+
+#: ../ui/slice_select.ui:386
+msgid "Slice options"
+msgstr ""
+
+#: ../ui/icon_select.ui:9
+msgid "Select an icon"
+msgstr ""
+
+#: ../ui/icon_select.ui:103
+msgid "Icon Theme"
+msgstr ""
+
+#: ../ui/icon_select.ui:123
+msgid "Custom Icon"
+msgstr ""
+
+#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:76
+msgid "Gnome-Pie Settings"
+msgstr ""
+
+#: ../ui/preferences.ui:73
+msgid "Start Gnome-Pie on login"
+msgstr ""
+
+#: ../ui/preferences.ui:79 ../ui/preferences.ui:80
+msgid "If checked, Gnome-Pie will start silently everytime you log in."
+msgstr ""
+
+#: ../ui/preferences.ui:92
+msgid "Display panel icon "
+msgstr ""
+
+#: ../ui/preferences.ui:98 ../ui/preferences.ui:99
+msgid ""
+"If not checked, you can access this menu by launching Gnome-Pie a second "
+"time."
+msgstr ""
+
+#: ../ui/preferences.ui:119
+msgid "Activation radius"
+msgstr ""
+
+#: ../ui/preferences.ui:157
+msgid "Behavior"
+msgstr ""
+
+#: ../ui/preferences.ui:192
+msgid "Display Slice labels"
+msgstr ""
+
+#: ../ui/preferences.ui:198 ../ui/preferences.ui:199
+msgid ""
+"Displays the name of each Slice next to it. Only available if supported by "
+"the theme."
+msgstr ""
+
+#: ../ui/preferences.ui:219
+msgid "Global scale"
+msgstr ""
+
+#: ../ui/preferences.ui:259
+msgid "Maximum slices per pie"
+msgstr ""
+
+#: ../ui/preferences.ui:297
+msgid "Appearance"
+msgstr ""
+
+#: ../ui/preferences.ui:326 ../../src/gui/preferencesWindow.vala:107
+msgid "General Settings"
+msgstr ""
+
+#: ../ui/preferences.ui:518
+msgid ""
+"<b><big>This Pie is empty!</big>\n"
+"\n"
+"Start adding Slices to it!</b> This can be done by dragging stuff to the "
+"plus sign below. You can try a lot! For example application launchers or "
+"folders. Even URLs from your browser are possible...\n"
+"\n"
+"For manual and advanced configuration click on the plus sign."
+msgstr ""
+
+#: ../ui/preferences.ui:539
+msgid ""
+"<b><big>You have no Pies!</big>\n"
+"\n"
+"Start by creating one! </b> This can be done by clicking on the tiny little "
+"plus sign in the lower left corner."
+msgstr ""
+
+#: ../ui/preferences.ui:606 ../../src/gui/preferencesWindow.vala:108
+msgid "Pie Settings"
+msgstr ""
+
 #: ../../src/actions/keyAction.vala:34
 msgid "Press hotkey"
 msgstr ""
@@ -53,26 +256,19 @@ msgstr ""
 msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way."
 msgstr ""
 
-#: ../../src/gui/preferencesWindow.vala:166
-msgid "No Pie selected."
+#: ../../src/gui/preferencesWindow.vala:77
+msgid "bake your pies!"
 msgstr ""
 
-#: ../../src/gui/preferencesWindow.vala:206
+#: ../../src/gui/preferencesWindow.vala:350
 msgid "New Pie"
 msgstr ""
 
-#: ../../src/gui/preferencesWindow.vala:219
+#: ../../src/gui/preferencesWindow.vala:365
 msgid ""
 "Do you really want to delete the selected Pie with all contained Slices?"
 msgstr ""
 
-#: ../../src/gui/triggerSelectWindow.vala:226
-msgid ""
-"This hotkey is already assigned to the pie \"%s\"! \n"
-"\n"
-"Please select another one or cancel your selection."
-msgstr ""
-
 #: ../../src/gui/piePreview.vala:148
 msgid "Do you really want to delete this Slice?"
 msgstr ""
@@ -106,6 +302,10 @@ msgstr ""
 msgid "Click to delete"
 msgstr ""
 
+#: ../../src/gui/pieList.vala:77
+msgid "Pies"
+msgstr ""
+
 #: ../../src/gui/iconSelectWindow.vala:182
 msgid "All icons"
 msgstr ""
@@ -139,15 +339,22 @@ msgstr ""
 msgid "All supported image formats"
 msgstr ""
 
-#: ../../src/gui/newSliceWindow.vala:291
+#: ../../src/gui/newSliceWindow.vala:292
 msgid "Rename me!"
 msgstr ""
 
+#: ../../src/gui/pieOptionsWindow.vala:274
+msgid ""
+"This hotkey is already assigned to the pie \"%s\"! \n"
+"\n"
+"Please select another one or cancel your selection."
+msgstr ""
+
 #: ../../src/gui/themeList.vala:62
 msgid "Themes"
 msgstr ""
 
-#: ../../src/gui/themeList.vala:99
+#: ../../src/gui/themeList.vala:102
 msgid "By"
 msgstr ""
 
@@ -171,7 +378,7 @@ msgstr ""
 msgid "Press a hotkey ..."
 msgstr ""
 
-#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:177
+#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:186
 #: ../../src/utilities/trigger.vala:195 ../../src/utilities/trigger.vala:280
 #: ../../src/utilities/trigger.vala:281
 msgid "Not bound"
@@ -257,6 +464,14 @@ msgstr ""
 msgid "Displays your main menu structure."
 msgstr ""
 
+#: ../../src/actionGroups/workspaceWindowListGroup.vala:35
+msgid "Group: Window List for current workspace"
+msgstr ""
+
+#: ../../src/actionGroups/workspaceWindowListGroup.vala:37
+msgid "Shows a Slice for each of your opened windows on the current workspace."
+msgstr ""
+
 #: ../../src/actionGroups/sessionGroup.vala:35
 msgid "Group: Session Control"
 msgstr ""
@@ -340,198 +555,3 @@ msgstr ""
 #: ../../src/pies/defaultConfig.vala:63
 msgid "Restore"
 msgstr ""
-
-#: ../ui/trigger_select.ui:53
-msgid "Activation Settings"
-msgstr ""
-
-#: ../ui/trigger_select.ui:132
-msgid "It's possible to bind mouse buttons as well!"
-msgstr ""
-
-#: ../ui/trigger_select.ui:165
-msgid "Turbo mode"
-msgstr ""
-
-#: ../ui/trigger_select.ui:171 ../ui/trigger_select.ui:172
-msgid "If checked, the Pie will close when you release the chosen hot key."
-msgstr ""
-
-#: ../ui/trigger_select.ui:184
-msgid "Long press for activation"
-msgstr ""
-
-#: ../ui/trigger_select.ui:190 ../ui/trigger_select.ui:191
-msgid ""
-"If checked, the Pie will only open if you press this hot key a bit longer."
-msgstr ""
-
-#: ../ui/trigger_select.ui:203
-msgid "Open Pie centered on the screen"
-msgstr ""
-
-#: ../ui/trigger_select.ui:209 ../ui/trigger_select.ui:210
-msgid ""
-"If checked, the Pie will open in the middle of your screen. Else it will pop "
-"up at your pointer."
-msgstr ""
-
-#: ../ui/trigger_select.ui:222
-msgid "Warp mouse pointer to center of Pie"
-msgstr ""
-
-#: ../ui/trigger_select.ui:228 ../ui/trigger_select.ui:229
-msgid ""
-"If checked, the mouse pointer will be warped to the center of the Pie. This "
-"allows for quick selections even if the Pie is opened at the screen's "
-"boundary."
-msgstr ""
-
-#: ../ui/trigger_select.ui:247
-msgid "Activation options"
-msgstr ""
-
-#: ../ui/trigger_select.ui:438
-msgid "Automatically select the best pie shape"
-msgstr ""
-
-#: ../ui/trigger_select.ui:442
-msgid ""
-"If checked, the shape will be automatically selected to minimize mouse "
-"travelling."
-msgstr ""
-
-#: ../ui/trigger_select.ui:462
-msgid "Pie shape"
-msgstr ""
-
-#: ../ui/slice_select.ui:8
-msgid "Slice Options"
-msgstr ""
-
-#: ../ui/slice_select.ui:141
-msgid "There are no options for this Slice type."
-msgstr ""
-
-#: ../ui/slice_select.ui:167
-msgid "Name of the Slice "
-msgstr ""
-
-#: ../ui/slice_select.ui:205
-msgid "URI to open"
-msgstr ""
-
-#: ../ui/slice_select.ui:243
-msgid "Command to execute"
-msgstr ""
-
-#: ../ui/slice_select.ui:281
-msgid "Hotkey to press"
-msgstr ""
-
-#: ../ui/slice_select.ui:310
-msgid "Pie to open"
-msgstr ""
-
-#: ../ui/slice_select.ui:339
-msgid "Is Quick Action"
-msgstr ""
-
-#: ../ui/slice_select.ui:354 ../ui/slice_select.ui:355
-msgid "This Slice will be executed when you click in the middle of the Pie."
-msgstr ""
-
-#: ../ui/slice_select.ui:387
-msgid "Slice options"
-msgstr ""
-
-#: ../ui/icon_select.ui:9
-msgid "Select an icon"
-msgstr ""
-
-#: ../ui/icon_select.ui:103
-msgid "Icon Theme"
-msgstr ""
-
-#: ../ui/icon_select.ui:123
-msgid "Custom Icon"
-msgstr ""
-
-#: ../ui/rename_pie.ui:8
-msgid "Rename a Pie"
-msgstr ""
-
-#: ../ui/preferences.ui:7
-msgid "Gnome-Pie Settings"
-msgstr ""
-
-#: ../ui/preferences.ui:27 ../ui/settings.ui:8
-msgid "General Settings"
-msgstr ""
-
-#: ../ui/preferences.ui:266
-msgid ""
-"<b><big>This Pie is empty!</big>\n"
-"\n"
-"Start adding Slices to it!</b> This can be done by dragging stuff to the "
-"plus sign below. You can try a lot! For example application launchers or "
-"folders. Even URLs from your browser are possible...\n"
-"\n"
-"For manual and advanced configuration click on the plus sign."
-msgstr ""
-
-#: ../ui/preferences.ui:287
-msgid ""
-"<b><big>You have no Pies!</big>\n"
-"\n"
-"Start by creating one! </b> This can be done by clicking on the tiny little "
-"plus sign in the lower left corner."
-msgstr ""
-
-#: ../ui/settings.ui:75
-msgid "Start Gnome-Pie on login"
-msgstr ""
-
-#: ../ui/settings.ui:81 ../ui/settings.ui:82
-msgid "If checked, Gnome-Pie will start silently everytime you log in."
-msgstr ""
-
-#: ../ui/settings.ui:94
-msgid "Display panel icon "
-msgstr ""
-
-#: ../ui/settings.ui:100 ../ui/settings.ui:101
-msgid ""
-"If not checked, you can access this menu by launching Gnome-Pie a second "
-"time."
-msgstr ""
-
-#: ../ui/settings.ui:119
-msgid "Behavior"
-msgstr ""
-
-#: ../ui/settings.ui:178
-msgid "Global scale"
-msgstr ""
-
-#: ../ui/settings.ui:217
-msgid "Maximum slices per pie"
-msgstr ""
-
-#: ../ui/settings.ui:256
-msgid "Maximum activation radius"
-msgstr ""
-
-#: ../ui/settings.ui:287
-msgid "Display Slice labels"
-msgstr ""
-
-#: ../ui/settings.ui:293 ../ui/settings.ui:294
-msgid ""
-"Displays the name of each Slice next to it. Only available if supported by "
-"the theme."
-msgstr ""
-
-#: ../ui/settings.ui:312
-msgid "Appearance"
-msgstr ""
diff --git a/resources/ui/trigger_select.ui b/resources/ui/pie_options.ui
index ab12270..cc95f8f 100644
--- a/resources/ui/trigger_select.ui
+++ b/resources/ui/pie_options.ui
@@ -63,6 +63,8 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="homogeneous">True</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel-button">
@@ -71,12 +73,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="hexpand">True</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -91,12 +94,12 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
@@ -110,34 +113,140 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkBox" id="trigger-box">
+              <object class="GtkBox" id="hbox2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkButton" id="icon-button">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="focus_on_click">False</property>
+                    <child>
+                      <object class="GtkImage" id="icon">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="pixel_size">48</property>
+                        <property name="icon_name">preferences-desktop-wallpaper</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="pie-box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">6</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkEntry" id="name-entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="has_focus">True</property>
+                        <property name="text" translatable="yes">Unamed Pie</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="trigger-box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="id-label">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.11999999731779099</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">It's possible to bind mouse buttons as well!</property>
-                <attributes>
-                  <attribute name="weight" value="light"/>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
+                <property name="margin_bottom">6</property>
+                <child>
+                  <object class="GtkLabel" id="pie-id">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">ID:</property>
+                    <property name="ellipsize">middle</property>
+                    <attributes>
+                      <attribute name="weight" value="light"/>
+                      <attribute name="scale" value="0.80000000000000004"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">It's possible to bind mouse buttons as well!</property>
+                    <attributes>
+                      <attribute name="weight" value="light"/>
+                      <attribute name="scale" value="0.80000000000000004"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/resources/ui/preferences.ui b/resources/ui/preferences.ui
index 7712566..4ef781d 100644
--- a/resources/ui/preferences.ui
+++ b/resources/ui/preferences.ui
@@ -7,107 +7,301 @@
     <property name="title" translatable="yes">Gnome-Pie Settings</property>
     <property name="window_position">center</property>
     <child>
-      <object class="GtkBox" id="vbox2">
-        <property name="width_request">625</property>
+      <object class="GtkBox" id="main-box">
+        <property name="width_request">650</property>
         <property name="height_request">500</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkToolbar" id="toolbar">
+          <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="toolbar_style">both-horiz</property>
+            <property name="can_focus">True</property>
+            <property name="show_border">False</property>
             <child>
-              <object class="GtkToolButton" id="settings-button">
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="is_important">True</property>
-                <property name="label" translatable="yes">General Settings</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-preferences</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="main-vbox1">
-            <property name="can_focus">False</property>
-            <property name="border_width">10</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">10</property>
-            <child>
-              <object class="GtkBox" id="hbox1">
+              <object class="GtkBox" id="general-settings">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox" id="pie-list-box">
+                  <object class="GtkScrolledWindow" id="theme-scrolledwindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <property name="homogeneous">True</property>
                     <child>
-                      <object class="GtkScrolledWindow" id="pies-scrolledwindow">
-                        <property name="width_request">170</property>
+                      <object class="GtkFrame" id="frame2">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <placeholder/>
+                          <object class="GtkAlignment" id="alignment2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
+                            <property name="left_padding">6</property>
+                            <property name="right_padding">6</property>
+                            <child>
+                              <object class="GtkBox" id="vbox5">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="autostart-checkbox">
+                                    <property name="label" translatable="yes">Start Gnome-Pie on login</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_markup" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property>
+                                    <property name="tooltip_text" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="indicator-checkbox">
+                                    <property name="label" translatable="yes">Display panel icon </property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_markup" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property>
+                                    <property name="tooltip_text" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox4">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="halign">start</property>
+                                        <property name="label" translatable="yes">Activation radius</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="range-hscale">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="fill_level">2000</property>
+                                        <property name="round_digits">0</property>
+                                        <property name="digits">0</property>
+                                        <property name="value_pos">right</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Behavior</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
+                          </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolbar" id="pies-toolbar">
+                      <object class="GtkFrame" id="frame3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="toolbar_style">icons</property>
-                        <property name="icon_size">1</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkToolButton" id="add-pie-button">
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkAlignment" id="alignment3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">list-add-symbolic</property>
+                            <property name="top_padding">6</property>
+                            <property name="bottom_padding">6</property>
+                            <property name="left_padding">6</property>
+                            <property name="right_padding">6</property>
+                            <child>
+                              <object class="GtkBox" id="vbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="captions-checkbox">
+                                    <property name="label" translatable="yes">Display Slice labels</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_markup" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property>
+                                    <property name="tooltip_text" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label6">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="halign">start</property>
+                                        <property name="label" translatable="yes">Global scale</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="scale-hscale">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="fill_level">2</property>
+                                        <property name="round_digits">2</property>
+                                        <property name="digits">2</property>
+                                        <property name="value_pos">right</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="hbox3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <object class="GtkLabel" id="label7">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="halign">start</property>
+                                        <property name="label" translatable="yes">Maximum slices per pie</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkScale" id="range-slices">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="fill_level">2000</property>
+                                        <property name="round_digits">0</property>
+                                        <property name="digits">0</property>
+                                        <property name="value_pos">right</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkToolButton" id="remove-pie-button">
-                            <property name="use_action_appearance">False</property>
+                        <child type="label">
+                          <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="icon_name">list-remove-symbolic</property>
+                            <property name="label" translatable="yes">Appearance</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
@@ -116,124 +310,175 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="tab_expand">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">General Settings</property>
+              </object>
+              <packing>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="pie-settings">
+                <property name="can_focus">False</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">10</property>
                 <child>
-                  <object class="GtkBox" id="pie-box">
+                  <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
-                      <object class="GtkBox" id="hbox2">
+                      <object class="GtkBox" id="pie-list-box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
+                        <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkButton" id="icon-button">
-                            <property name="use_action_appearance">False</property>
+                          <object class="GtkScrolledWindow" id="pies-scrolledwindow">
+                            <property name="width_request">170</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="relief">none</property>
-                            <property name="focus_on_click">False</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkImage" id="icon">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="pixel_size">48</property>
-                                <property name="icon_name">preferences-desktop-wallpaper</property>
-                              </object>
+                              <placeholder/>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="pie-box1">
+                          <object class="GtkToolbar" id="pies-toolbar">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
+                            <property name="toolbar_style">icons</property>
+                            <property name="icon_size">1</property>
                             <child>
-                              <object class="GtkButton" id="rename-button">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkToolItem" id="add-remove-item">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="relief">none</property>
-                                <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkLabel" id="pie-name-label">
+                                  <object class="GtkBox" id="add-remove-box">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xpad">2</property>
-                                    <property name="ellipsize">end</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="scale" value="1.2"/>
-                                    </attributes>
+                                    <child>
+                                      <object class="GtkButton" id="add-pie-button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <child>
+                                          <object class="GtkImage" id="up_image">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">list-add-symbolic</property>
+                                            <property name="icon_size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="remove-pie-button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <child>
+                                          <object class="GtkImage" id="down_image">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">list-remove-symbolic</property>
+                                            <property name="icon_size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSeparatorToolItem" id="sep1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="draw">False</property>
+                              </object>
+                              <packing>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="key-button">
-                                <property name="use_action_appearance">False</property>
+                              <object class="GtkToolItem" id="edit-item">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="relief">none</property>
-                                <property name="use_underline">True</property>
-                                <property name="focus_on_click">False</property>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkLabel" id="hotkey-label">
+                                  <object class="GtkBox" id="edit-box">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="xpad">2</property>
-                                    <property name="ellipsize">end</property>
-                                    <attributes>
-                                      <attribute name="weight" value="light"/>
-                                    </attributes>
+                                    <child>
+                                      <object class="GtkButton" id="edit-pie-button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <child>
+                                          <object class="GtkImage" id="settings_image">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">emblem-system-symbolic</property>
+                                            <property name="icon_size">1</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
                               </packing>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="id-label">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.11999999731779099</property>
+                            <style>
+                              <class name="inline-toolbar"/>
+                            </style>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -244,81 +489,94 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="preview-frame">
+                      <object class="GtkBox" id="pie-box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label_xalign">0</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkEventBox" id="preview-background">
+                          <object class="GtkFrame" id="preview-frame">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="label_xalign">0</property>
                             <child>
-                              <object class="GtkBox" id="pie-edit-box">
+                              <object class="GtkEventBox" id="preview-background">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="border_width">2</property>
-                                <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkLabel" id="no-slice-label">
+                                  <object class="GtkBox" id="pie-edit-box">
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xpad">6</property>
-                                    <property name="ypad">6</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;This Pie is empty!&lt;/big&gt;
+                                    <property name="border_width">2</property>
+                                    <property name="orientation">vertical</property>
+                                    <child>
+                                      <object class="GtkLabel" id="no-slice-label">
+                                        <property name="can_focus">False</property>
+                                        <property name="xpad">6</property>
+                                        <property name="ypad">6</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;This Pie is empty!&lt;/big&gt;
 
 Start adding Slices to it!&lt;/b&gt; This can be done by dragging stuff to the plus sign below. You can try a lot! For example application launchers or folders. Even URLs from your browser are possible...
 
 For manual and advanced configuration click on the plus sign.</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="justify">fill</property>
-                                    <property name="wrap">True</property>
-                                    <property name="max_width_chars">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="no-pie-label">
-                                    <property name="can_focus">False</property>
-                                    <property name="xpad">6</property>
-                                    <property name="ypad">6</property>
-                                    <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;You have no Pies!&lt;/big&gt;
+                                        <property name="use_markup">True</property>
+                                        <property name="justify">fill</property>
+                                        <property name="wrap">True</property>
+                                        <property name="max_width_chars">0</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="no-pie-label">
+                                        <property name="can_focus">False</property>
+                                        <property name="xpad">6</property>
+                                        <property name="ypad">6</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;You have no Pies!&lt;/big&gt;
 
 Start by creating one! &lt;/b&gt; This can be done by clicking on the tiny little plus sign in the lower left corner.</property>
-                                    <property name="use_markup">True</property>
-                                    <property name="justify">fill</property>
-                                    <property name="wrap">True</property>
-                                    <property name="max_width_chars">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="preview-box">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
+                                        <property name="use_markup">True</property>
+                                        <property name="justify">fill</property>
+                                        <property name="wrap">True</property>
+                                        <property name="max_width_chars">0</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                     <child>
-                                      <placeholder/>
+                                      <object class="GtkBox" id="preview-box">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
                           </object>
-                        </child>
-                        <child type="label_item">
-                          <placeholder/>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -331,16 +589,33 @@ Start by creating one! &lt;/b&gt; This can be done by clicking on the tiny littl
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
+                <property name="tab_expand">True</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Pie Settings</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_expand">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/resources/ui/rename_pie.ui b/resources/ui/rename_pie.ui
deleted file mode 100644
index fca075c..0000000
--- a/resources/ui/rename_pie.ui
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface>
-  <requires lib="gtk+" version="3.8"/>
-  <object class="GtkDialog" id="window">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Rename a Pie</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel-button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ok-button">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkEntry" id="name-entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">cancel-button</action-widget>
-      <action-widget response="0">ok-button</action-widget>
-    </action-widgets>
-  </object>
-</interface>
diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui
deleted file mode 100644
index b2d2776..0000000
--- a/resources/ui/settings.ui
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface>
-  <requires lib="gtk+" version="3.8"/>
-  <object class="GtkDialog" id="window">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">General Settings</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="width_request">550</property>
-        <property name="height_request">450</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="close-button">
-                <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="vbox4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkFrame" id="frame2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="bottom_padding">6</property>
-                    <property name="left_padding">6</property>
-                    <property name="right_padding">6</property>
-                    <child>
-                      <object class="GtkBox" id="vbox5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkCheckButton" id="autostart-checkbox">
-                            <property name="label" translatable="yes">Start Gnome-Pie on login</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property>
-                            <property name="tooltip_text" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="indicator-checkbox">
-                            <property name="label" translatable="yes">Display panel icon </property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property>
-                            <property name="tooltip_text" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Behavior</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="bottom_padding">6</property>
-                    <property name="left_padding">6</property>
-                    <property name="right_padding">6</property>
-                    <child>
-                      <object class="GtkBox" id="vbox1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="theme-scrolledwindow">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="hbox1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <object class="GtkLabel" id="label1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Global scale</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScale" id="scale-hscale">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="fill_level">2</property>
-                                <property name="round_digits">2</property>
-                                <property name="digits">2</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="hbox2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <object class="GtkLabel" id="label2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Maximum slices per pie</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScale" id="range-slices">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="fill_level">2000</property>
-                                <property name="round_digits">0</property>
-                                <property name="digits">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="hbox3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <object class="GtkLabel" id="label4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">Maximum activation radius</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkScale" id="range-hscale">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="fill_level">2000</property>
-                                <property name="round_digits">0</property>
-                                <property name="digits">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="captions-checkbox">
-                            <property name="label" translatable="yes">Display Slice labels</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property>
-                            <property name="tooltip_text" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Appearance</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">close-button</action-widget>
-    </action-widgets>
-  </object>
-</interface>
diff --git a/resources/ui/slice_select.ui b/resources/ui/slice_select.ui
index e3bab16..27559ad 100644
--- a/resources/ui/slice_select.ui
+++ b/resources/ui/slice_select.ui
@@ -106,7 +106,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="relief">none</property>
                             <child>
                               <object class="GtkImage" id="icon">
                                 <property name="visible">True</property>