diff --git a/po/en_AU.po b/po/en_AU.po
index 2dc9be9..610b0cb 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -3,350 +3,351 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# k3lt01 <keltoiboy@gmail.com>, 2013
+# Michael Findlay <keltoiboy@gmail.com>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-03 20:41+0200\n"
-"PO-Revision-Date: 2013-07-29 09:13+0000\n"
-"Last-Translator: k3lt01 <keltoiboy@gmail.com>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce/language/en_AU/)\n"
+"POT-Creation-Date: 2014-12-20 00:31+0100\n"
+"PO-Revision-Date: 2015-01-13 07:22+0000\n"
+"Last-Translator: Michael Findlay <keltoiboy@gmail.com>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce-apps/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89
-#: ../src/exec-tool-button.c:134 ../src/main.c:156
-#: ../src/process-tree-view.c:355 ../src/process-tree-view.c:370
-#: ../src/process-tree-view.c:398 ../src/process-window.c:304
-#: ../src/process-window.ui.h:1
+#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:106
+#: ../src/exec-tool-button.c:151 ../src/main.c:186
+#: ../src/process-tree-view.c:372 ../src/process-tree-view.c:387
+#: ../src/process-tree-view.c:415 ../src/process-window.c:389
+#: ../src/process-window.ui.h:1 ../src/process-window-gtk3.ui.h:1
 msgid "Task Manager"
 msgstr "Task Manager"
 
-#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309
+#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:396
 msgid "Easy to use task manager"
 msgstr "Easy to use task manager"
 
-#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131
+#: ../src/exec-tool-button.c:104 ../src/exec-tool-button.c:148
 msgid "Execution error"
 msgstr "Execution error"
 
-#: ../src/exec-tool-button.c:133
+#: ../src/exec-tool-button.c:150
 msgid "Couldn't find any default command to run."
 msgstr "Couldn't find any default command to run."
 
-#: ../src/exec-tool-button.c:164
+#: ../src/exec-tool-button.c:181
 msgid "Run Task Manager as root"
 msgstr "Run Task Manager as root"
 
-#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177
-#: ../src/exec-tool-button.c:179
+#: ../src/exec-tool-button.c:192 ../src/exec-tool-button.c:194
+#: ../src/exec-tool-button.c:196
 msgid "Run Program..."
 msgstr "Run Program..."
 
-#: ../src/exec-tool-button.c:182
+#: ../src/exec-tool-button.c:199
 msgid "Application Finder"
 msgstr "Application Finder"
 
-#: ../src/exec-tool-button.c:185
+#: ../src/exec-tool-button.c:202
 msgid "Terminal emulator"
 msgstr "Terminal emulator"
 
-#: ../src/exec-tool-button.c:187
+#: ../src/exec-tool-button.c:204
 msgid "XTerm"
 msgstr "XTerm"
 
-#: ../src/main.c:100
+#: ../src/main.c:126
 #, c-format
 msgid ""
 "<b>Processes:</b> %u\n"
 "<b>CPU:</b> %.0f%%\n"
-"<b>Memory:</b> %.0f%%\n"
-"<b>Swap:</b> %.0f%%"
-msgstr "<b>Processes:</b> %u\n<b>CPU:</b> %.0f%%\n<b>Memory:</b> %.0f%%\n<b>Swap:</b> %.0f%%"
+"<b>Memory:</b> %s\n"
+"<b>Swap:</b> %s"
+msgstr "<b>Processes:</b> %u\n<b>CPU:</b> %.0f%%\n<b>Memory:</b> %s\n<b>Swap:</b> %s"
 
-#: ../src/main.c:108
+#: ../src/main.c:134
 #, c-format
 msgid ""
 "Processes: %u\n"
 "CPU: %.0f%%\n"
-"Memory: %.0f%%\n"
-"Swap: %.0f%%"
-msgstr "Processes: %u\nCPU: %.0f%%\nMemory: %.0f%%\nSwap: %.0f%%"
+"Memory: %s\n"
+"Swap: %s"
+msgstr "Processes: %u\nCPU: %.0f%%\nMemory: %s\nSwap: %s"
 
-#: ../src/process-statusbar.c:148 ../src/process-window.c:374
+#: ../src/process-statusbar.c:147 ../src/process-window.c:461
 #, c-format
 msgid "CPU: %s%%"
 msgstr "CPU: %s%%"
 
-#: ../src/process-statusbar.c:157 ../src/process-window.c:379
+#: ../src/process-statusbar.c:162 ../src/process-window.c:465
 #, c-format
-msgid "Memory: %s%%"
-msgstr "Memory: %s%%"
+msgid "Memory: %s"
+msgstr "Memory: %s"
 
-#: ../src/process-statusbar.c:166
+#: ../src/process-statusbar.c:176
 #, c-format
-msgid "Swap: %s%%"
-msgstr "Swap: %s%%"
+msgid "Swap: %s"
+msgstr "Swap: %s"
 
-#: ../src/process-statusbar.c:181
+#: ../src/process-statusbar.c:190
 #, c-format
 msgid "Processes: %d"
 msgstr "Processes: %d"
 
-#: ../src/process-tree-view.c:125
+#: ../src/process-tree-view.c:136
 msgid "Task"
 msgstr "Task"
 
-#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174
+#: ../src/process-tree-view.c:147 ../src/settings-tool-button.c:175
 msgid "PID"
 msgstr "PID"
 
-#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175
+#: ../src/process-tree-view.c:155 ../src/settings-tool-button.c:176
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176
+#: ../src/process-tree-view.c:163 ../src/settings-tool-button.c:177
 msgid "State"
 msgstr "State"
 
-#: ../src/process-tree-view.c:161
+#: ../src/process-tree-view.c:172
 msgid "VSZ"
 msgstr "VSZ"
 
-#: ../src/process-tree-view.c:169
+#: ../src/process-tree-view.c:180
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179
+#: ../src/process-tree-view.c:188 ../src/settings-tool-button.c:180
 msgid "UID"
 msgstr "UID"
 
-#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180
+#: ../src/process-tree-view.c:196 ../src/settings-tool-button.c:181
 msgid "CPU"
 msgstr "CPU"
 
 #. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view
 #. header.
-#: ../src/process-tree-view.c:194
+#: ../src/process-tree-view.c:205
 msgid "Prio."
 msgstr "Prio."
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:369
 msgid "Terminate task"
 msgstr "Terminate task"
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:369
 msgid "Kill task"
 msgstr "Kill task"
 
-#: ../src/process-tree-view.c:354
+#: ../src/process-tree-view.c:371
 #, c-format
 msgid "Are you sure you want to send a signal to the PID %d?"
 msgstr "Are you sure you want to send a signal to the PID %d?"
 
-#: ../src/process-tree-view.c:366
+#: ../src/process-tree-view.c:383
 msgid "Error sending signal"
 msgstr "Error sending signal"
 
-#: ../src/process-tree-view.c:368
+#: ../src/process-tree-view.c:385
 #, c-format
 msgid ""
 "An error was encountered by sending a signal to the PID %d. It is likely you"
 " don't have the required privileges."
 msgstr "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges."
 
-#: ../src/process-tree-view.c:395
+#: ../src/process-tree-view.c:412
 msgid "Error setting priority"
 msgstr "Error setting priority"
 
-#: ../src/process-tree-view.c:396
+#: ../src/process-tree-view.c:413
 #, c-format
 msgid ""
 "An error was encountered by setting a priority to the PID %d. It is likely "
 "you don't have the required privileges."
 msgstr "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges."
 
-#: ../src/process-tree-view.c:412
+#: ../src/process-tree-view.c:429
 msgid "Terminate"
 msgstr "Terminate"
 
-#: ../src/process-tree-view.c:420
+#: ../src/process-tree-view.c:437
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/process-tree-view.c:427
+#: ../src/process-tree-view.c:444
 msgid "Continue"
 msgstr "Continue"
 
-#: ../src/process-tree-view.c:433
+#: ../src/process-tree-view.c:450
 msgid "Kill"
 msgstr "Kill"
 
-#: ../src/process-tree-view.c:440
+#: ../src/process-tree-view.c:457
 msgid "Very low"
 msgstr "Very low"
 
-#: ../src/process-tree-view.c:445
+#: ../src/process-tree-view.c:462
 msgid "Low"
 msgstr "Low"
 
-#: ../src/process-tree-view.c:450
+#: ../src/process-tree-view.c:467
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/process-tree-view.c:455
+#: ../src/process-tree-view.c:472
 msgid "High"
 msgstr "High"
 
-#: ../src/process-tree-view.c:460
+#: ../src/process-tree-view.c:477
 msgid "Very high"
 msgstr "Very high"
 
-#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181
+#: ../src/process-tree-view.c:482 ../src/settings-tool-button.c:182
 msgid "Priority"
 msgstr "Priority"
 
-#: ../src/process-window.c:312
+#: ../src/process-window.c:205
+#, c-format
+msgid ""
+"<span foreground='#000000' background='#aed581'>    </span> Starting task\n"
+"<span foreground='#000000' background='#fff176'>    </span> Changing task\n"
+"<span foreground='#000000' background='#e57373'>    </span> Terminating task"
+msgstr "<span foreground='#000000' background='#aed581'>    </span> Starting task\n<span foreground='#000000' background='#fff176'>    </span> Changing task\n<span foreground='#000000' background='#e57373'>    </span> Terminating task"
+
+#: ../src/process-window.c:215
+msgid "Filter on process name"
+msgstr "Filter on process name"
+
+#: ../src/process-window.c:399
 msgid "translator-credits"
 msgstr "translator-credits"
 
-#: ../src/process-window.ui.h:2
+#: ../src/process-window.ui.h:2 ../src/process-window-gtk3.ui.h:2
 msgid "Warning, you are using the root account, you may harm your system."
 msgstr "Warning, you are using the root account, you may harm your system."
 
-#: ../src/settings.c:378
+#: ../src/settings.c:387
 msgid "Default"
 msgstr "Default"
 
-#: ../src/settings.c:379
+#: ../src/settings.c:388
 msgid "Small"
 msgstr "Small"
 
-#: ../src/settings.c:380
+#: ../src/settings.c:389
 msgid "Large"
 msgstr "Large"
 
-#: ../src/settings.c:381
+#: ../src/settings.c:390
 msgid "Text"
 msgstr "Text"
 
-#: ../src/settings-dialog.ui.h:1
+#: ../src/settings-dialog.ui.h:1 ../src/settings-dialog-gtk3.ui.h:1
 msgid "Settings for Task Manager"
 msgstr "Settings for Task Manager"
 
-#: ../src/settings-dialog.ui.h:2
+#: ../src/settings-dialog.ui.h:2 ../src/settings-dialog-gtk3.ui.h:2
 msgid "Show application icons"
 msgstr "Show application icons"
 
-#: ../src/settings-dialog.ui.h:3
+#: ../src/settings-dialog.ui.h:3 ../src/settings-dialog-gtk3.ui.h:3
 msgid "Show full command lines"
 msgstr "Show full command lines"
 
-#: ../src/settings-dialog.ui.h:4
+#: ../src/settings-dialog.ui.h:4 ../src/settings-dialog-gtk3.ui.h:4
 msgid "Show values with more precision"
 msgstr "Show values with more precision"
 
-#: ../src/settings-dialog.ui.h:5
-msgid "Draw borders around monitors"
-msgstr "Draw borders around monitors"
+#: ../src/settings-dialog.ui.h:5 ../src/settings-dialog-gtk3.ui.h:5
+msgid "Show processes as tree"
+msgstr "Show processes as tree"
 
-#: ../src/settings-dialog.ui.h:6
+#: ../src/settings-dialog.ui.h:6 ../src/settings-dialog-gtk3.ui.h:6
+msgid "Show memory usage in bytes"
+msgstr "Show memory usage in bytes"
+
+#: ../src/settings-dialog.ui.h:7 ../src/settings-dialog-gtk3.ui.h:7
 msgid "Toolbar style:"
 msgstr "Toolbar style:"
 
-#: ../src/settings-dialog.ui.h:7
+#: ../src/settings-dialog.ui.h:8 ../src/settings-dialog-gtk3.ui.h:8
 msgid "<b>Interface style</b>"
 msgstr "<b>Interface style</b>"
 
-#: ../src/settings-dialog.ui.h:8
+#: ../src/settings-dialog.ui.h:9 ../src/settings-dialog-gtk3.ui.h:9
 msgid "Prompt for terminating tasks"
 msgstr "Prompt for terminating tasks"
 
-#: ../src/settings-dialog.ui.h:9
+#: ../src/settings-dialog.ui.h:10 ../src/settings-dialog-gtk3.ui.h:10
 msgid "Hide into the notification area"
 msgstr "Hide into the notification area"
 
-#: ../src/settings-dialog.ui.h:10
+#: ../src/settings-dialog.ui.h:11 ../src/settings-dialog-gtk3.ui.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscellaneous</b>"
 
-#: ../src/settings-dialog.ui.h:11
+#: ../src/settings-dialog.ui.h:12 ../src/settings-dialog-gtk3.ui.h:12
 msgid "Refresh rate:"
 msgstr "Refresh rate:"
 
-#: ../src/settings-dialog.ui.h:12
+#: ../src/settings-dialog.ui.h:13 ../src/settings-dialog-gtk3.ui.h:13
 msgid "Columns:"
 msgstr "Columns:"
 
-#: ../src/settings-dialog.ui.h:13
+#: ../src/settings-dialog.ui.h:14 ../src/settings-dialog-gtk3.ui.h:14
 msgid "<b>Information</b>"
 msgstr "<b>Information</b>"
 
-#: ../src/settings-dialog.ui.h:14
+#: ../src/settings-dialog.ui.h:15 ../src/settings-dialog-gtk3.ui.h:15
 msgid "Settings"
 msgstr "Settings"
 
 #. TRANSLATORS: The next values are in seconds or milliseconds
-#: ../src/settings-tool-button.c:110
+#: ../src/settings-tool-button.c:111
 msgid "500ms"
 msgstr "500ms"
 
-#: ../src/settings-tool-button.c:111
+#: ../src/settings-tool-button.c:112
 msgid "750ms"
 msgstr "750ms"
 
-#: ../src/settings-tool-button.c:112
+#: ../src/settings-tool-button.c:113
 msgid "1s"
 msgstr "1s"
 
-#: ../src/settings-tool-button.c:113
+#: ../src/settings-tool-button.c:114
 msgid "2s"
 msgstr "2s"
 
-#: ../src/settings-tool-button.c:114
+#: ../src/settings-tool-button.c:115
 msgid "5s"
 msgstr "5s"
 
-#: ../src/settings-tool-button.c:115
+#: ../src/settings-tool-button.c:116
 msgid "10s"
 msgstr "10s"
 
-#: ../src/settings-tool-button.c:164
+#: ../src/settings-tool-button.c:165
 msgid "Show all processes"
 msgstr "Show all processes"
 
-#: ../src/settings-tool-button.c:167
+#: ../src/settings-tool-button.c:168
 msgid "Refresh rate"
 msgstr "Refresh rate"
 
-#: ../src/settings-tool-button.c:177
+#: ../src/settings-tool-button.c:178
 msgid "Virtual Bytes"
 msgstr "Virtual Bytes"
 
-#: ../src/settings-tool-button.c:178
+#: ../src/settings-tool-button.c:179
 msgid "Private Bytes"
 msgstr "Private Bytes"
 
-#: ../src/task-manager.c:229
-#, c-format
-msgid "%lu MiB"
-msgstr "%lu MiB"
-
-#: ../src/task-manager.c:236
-#, c-format
-msgid "%lu KiB"
-msgstr "%lu KiB"
-
-#: ../src/task-manager.c:240
-#, c-format
-msgid "%lu B"
-msgstr "%lu B"
-
-#: ../src/task-manager.c:263
+#: ../src/task-manager.c:241
 #, c-format
 msgid "%s%%"
 msgstr "%s%%"