diff --git a/stickynotes/stickynotes.glade b/stickynotes/stickynotes.glade
index 8fc5075..a375445 100644
--- a/stickynotes/stickynotes.glade
+++ b/stickynotes/stickynotes.glade
@@ -54,112 +54,78 @@
12
6
-
+
True
- True
- Choose a font to use for all sticky notes
- 0
- Pick a default sticky note font
+ 0
+ _Width:
+ True
+ width_spin
- 1
- 2
- 6
- 7
GTK_FILL
-
+
True
- 16
-
-
- True
- 0
- _Font:
- True
- default_font
-
-
+ 0
+ H_eight:
+ True
+ height_spin
- 6
- 7
+ 1
+ 2
GTK_FILL
+
-
+
True
True
- Use fo_nt from the system theme
- True
- 0
- True
+ Specify the default width (in pixels) of new notes
+ 1 1 500 10 100 0
+ 1
+ True
+ 1
2
- 5
- 6
- GTK_FILL
-
- True
- 16
-
-
- True
- 0
- Note C_olor:
- True
- default_color
-
-
-
-
- 4
- 5
- GTK_FILL
- GTK_FILL
-
-
-
-
+
True
- 16
-
-
- True
- 0
- Font Co_lor:
- True
- font_color
-
-
+ True
+ Specify the default height (in pixels) of new notes
+ 1 1 500 10 100 0
+ 1
+ True
- 3
- 4
- GTK_FILL
- GTK_FILL
+ 1
+ 2
+ 1
+ 2
+
-
+
True
True
+ Use co_lor from the system theme
+ True
0
+ True
- 1
2
- 3
- 4
+ 2
+ 3
GTK_FILL
@@ -181,78 +147,112 @@
-
+
True
True
- Use co_lor from the system theme
- True
0
- True
+ 1
2
- 2
- 3
+ 3
+ 4
GTK_FILL
-
+
True
- True
- Specify the default height (in pixels) of new notes
- 1 1 500 10 100 0
- 1
- True
+ 16
+
+
+ True
+ 0
+ Font Co_lor:
+ True
+ font_color
+
+
- 1
- 2
- 1
- 2
-
+ 3
+ 4
+ GTK_FILL
+ GTK_FILL
-
+
+ True
+ 16
+
+
+ True
+ 0
+ Note C_olor:
+ True
+ default_color
+
+
+
+
+ 4
+ 5
+ GTK_FILL
+ GTK_FILL
+
+
+
+
True
True
- Specify the default width (in pixels) of new notes
- 1 1 500 10 100 0
- 1
- True
+ Use fo_nt from the system theme
+ True
+ 0
+ True
- 1
2
+ 5
+ 6
+ GTK_FILL
-
+
True
- 0
- H_eight:
- True
- height_spin
+ 16
+
+
+ True
+ 0
+ _Font:
+ True
+ default_font
+
+
- 1
- 2
+ 6
+ 7
GTK_FILL
-
-
+
True
- 0
- _Width:
- True
- width_spin
+ True
+ Choose a font to use for all sticky notes
+ 0
+ Pick a default sticky note font
+ 1
+ 2
+ 6
+ 7
GTK_FILL
@@ -316,36 +316,36 @@
-
+
True
True
- Choose if the default style is forced on all notes
- Force _default color and font on notes
+ Choose if notes are visible on all workspaces
+ _Put notes on all workspaces
True
0
True
2
- 2
- 3
+ 1
+ 2
-
+
True
True
- Choose if notes are visible on all workspaces
- _Put notes on all workspaces
+ Choose if the default style is forced on all notes
+ Force _default color and font on notes
True
0
True
2
- 1
- 2
+ 2
+ 3
@@ -386,6 +386,10 @@
True
-11
+
+ False
+ False
+
@@ -397,6 +401,8 @@
-7
+ False
+ False
1
@@ -467,6 +473,10 @@ This cannot be undone.
True
-6
+
+ False
+ False
+
@@ -478,6 +488,8 @@ This cannot be undone.
-5
+ False
+ False
1
@@ -551,6 +563,10 @@ This cannot be undone.
True
-6
+
+ False
+ False
+
@@ -595,6 +611,8 @@ This cannot be undone.
+ False
+ False
1
@@ -838,98 +856,68 @@ This cannot be undone.
12
6
-
+
True
- True
- Choose a font for the note
- 0
- Pick a font for the sticky note
+ 0
+ _Title:
+ True
+ title_entry
- 1
- 2
- 5
- 6
GTK_FILL
-
- True
- 16
-
-
- True
- 0
- _Font:
- True
- note_color
-
-
-
-
- 5
- 6
- GTK_FILL
-
-
-
-
+
True
True
- Use default fo_nt
- True
- 0
- True
+ Specify a title for the note
+ 1
2
- 4
- 5
- GTK_FILL
-
+
True
True
- Choose a color for the note
+ Use default co_lor
+ True
0
- Pick a color for the sticky note
+ True
- 1
2
- 3
- 4
- GTK_FILL
+ 1
+ 2
-
+
True
16
-
+
True
0
- Note _Color:
+ Font C_olor:
True
- note_color
+ font_color
- 3
- 4
+ 2
+ 3
GTK_FILL
-
+
True
True
0
@@ -944,63 +932,92 @@ This cannot be undone.
-
+
True
16
-
+
True
0
- Font C_olor:
+ Note _Color:
True
- font_color
+ note_color
- 2
- 3
+ 3
+ 4
GTK_FILL
-
+
True
True
- Use default co_lor
- True
+ Choose a color for the note
0
- True
+ Pick a color for the sticky note
+ 1
2
- 1
- 2
+ 3
+ 4
+ GTK_FILL
-
+
True
True
- Specify a title for the note
- *
+ Use default fo_nt
+ True
+ 0
+ True
- 1
2
+ 4
+ 5
+ GTK_FILL
-
+
True
- 0
- _Title:
- True
- title_entry
+ 16
+
+
+ True
+ 0
+ _Font:
+ True
+ note_color
+
+
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ True
+ Choose a font for the note
+ 0
+ Pick a font for the sticky note
+
+
+ 1
+ 2
+ 5
+ 6
GTK_FILL
@@ -1041,6 +1058,10 @@ This cannot be undone.
True
-11
+
+ False
+ False
+
@@ -1052,6 +1073,8 @@ This cannot be undone.
-7
+ False
+ False
1