diff --git a/CREDITS b/CREDITS
new file mode 100644
index 0000000..6359257
--- /dev/null
+++ b/CREDITS
@@ -0,0 +1,3 @@
+This module was started under the name of itask-ng based on itask 
+and using the zoom functions of the original 'engage' by Andrew Williams.
+
diff --git a/configure.ac b/configure.ac
index b8740c2..a753003 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT(itask-ng, 0.3.0, hannes.janetzek@gmail.com)
+AC_INIT(engage, 1.0.0, hannes.janetzek@gmail.com)
 AC_PREREQ(2.52)
 
 AC_CANONICAL_BUILD
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 1802a4e..d751684 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -4,7 +4,7 @@ EDJE_FLAGS = -v -id $(top_srcdir)/data/themes -fd $(top_srcdir)/data/themes
 
 filesdir = $(datadir)
 files_DATA = \
-itask-ng.edj
+engage.edj
 
 
 EXTRA_DIST = $(files_DATA)
diff --git a/data/themes/itask-ng.edc b/data/themes/engage.edc
similarity index 92%
rename from data/themes/itask-ng.edc
rename to data/themes/engage.edc
index 408556b..12b5717 100644
--- a/data/themes/itask-ng.edc
+++ b/data/themes/engage.edc
@@ -17,10 +17,10 @@ collections{
 group {
 	/* bg frame that keeps is not affected by 'Background
 	 * Transparency' setting */
-	name: "e/modules/itask-ng/frame_bottom";
-	alias: "e/modules/itask-ng/frame_top";
-	alias: "e/modules/itask-ng/frame_left";
-	alias: "e/modules/itask-ng/frame_right";
+	name: "e/modules/engage/frame_bottom";
+	alias: "e/modules/engage/frame_top";
+	alias: "e/modules/engage/frame_left";
+	alias: "e/modules/engage/frame_right";
 
 	data {
 		/* space between icons */
@@ -57,7 +57,7 @@ group {
 
 #if REFLECTION
 group {
-	name: "e/modules/itask-ng/frame_bottom";
+	name: "e/modules/engage/frame_bottom";
 
 	data {
 		item: "icon_spacing"    "2";
@@ -85,7 +85,7 @@ group {
 }
 
 group {
-	name: "e/modules/itask-ng/bg_bottom";
+	name: "e/modules/engage/bg_bottom";
 	parts {
 
 		part {
@@ -108,7 +108,7 @@ group {
 }
 #else
 group {
-	name: "e/modules/itask-ng/bg_bottom";
+	name: "e/modules/engage/bg_bottom";
 	parts {
 		part {
 			name: "bg";
@@ -132,7 +132,7 @@ group {
 #endif
 
 group {
-	name: "e/modules/itask-ng/bg_top";
+	name: "e/modules/engage/bg_top";
 	parts {
 		part {
 			name: "bg";
@@ -154,7 +154,7 @@ group {
 	}
 }
 group {
-	name: "e/modules/itask-ng/bg_left";
+	name: "e/modules/engage/bg_left";
 	parts {
 		part {
 			name: "bg";
@@ -176,7 +176,7 @@ group {
 }
 
 group {
-	name: "e/modules/itask-ng/bg_right";
+	name: "e/modules/engage/bg_right";
 	parts {
 		part {
 			name: "bg";
@@ -204,11 +204,11 @@ group {
 
 #if REFLECTION
 group {
-	name: "e/modules/itask-ng/separator_bottom";
+	name: "e/modules/engage/separator_bottom";
 }
 #else
 group {
-	name: "e/modules/itask-ng/separator_bottom";
+	name: "e/modules/engage/separator_bottom";
 
 	parts {
 		part {
@@ -231,7 +231,7 @@ group {
 #endif
 
 group {
-	name: "e/modules/itask-ng/separator_top";
+	name: "e/modules/engage/separator_top";
 
 	parts {
 		part {
@@ -253,8 +253,8 @@ group {
 }
 
 group {
-	name: "e/modules/itask-ng/separator_left";
-	alias: "e/modules/itask-ng/separator_right";
+	name: "e/modules/engage/separator_left";
+	alias: "e/modules/engage/separator_right";
 
 	parts {
 		part {
@@ -276,7 +276,7 @@ group {
 }
 
 group {
-	name: "e/modules/itask-ng/label_bottom";
+	name: "e/modules/engage/label_bottom";
 
 	parts {
 		part {
@@ -419,7 +419,7 @@ group {
 }
 
 group {
-	name: "e/modules/itask-ng/label_top";
+	name: "e/modules/engage/label_top";
 	parts {
 		part {
 			name: "label";
@@ -531,16 +531,16 @@ group {
 
 /* TODO needs to be supported in code */
 /* group {
- * 	name: "e/modules/itask-ng/label_left";
- * 	alias: "e/modules/itask-ng/label_right";
+ * 	name: "e/modules/engage/label_left";
+ * 	alias: "e/modules/engage/label_right";
  * } */
 
 group {
-	name: "e/modules/itask-ng/icon";
-	alias: "e/modules/itask-ng/icon_top";
-	alias: "e/modules/itask-ng/icon_left";
-	alias: "e/modules/itask-ng/icon_right";
-	alias: "e/modules/itask-ng/icon_bottom";
+	name: "e/modules/engage/icon";
+	alias: "e/modules/engage/icon_top";
+	alias: "e/modules/engage/icon_left";
+	alias: "e/modules/engage/icon_right";
+	alias: "e/modules/engage/icon_bottom";
 
 	min: 32 32;
 	max: 128 128;
@@ -764,10 +764,10 @@ group {
 }
 
 group {
-	name: "e/modules/itask-ng/icon_over_top";
-	alias: "e/modules/itask-ng/icon_over_left";
-	alias: "e/modules/itask-ng/icon_over_right";
-	alias: "e/modules/itask-ng/icon_over_bottom";
+	name: "e/modules/engage/icon_over_top";
+	alias: "e/modules/engage/icon_over_left";
+	alias: "e/modules/engage/icon_over_right";
+	alias: "e/modules/engage/icon_over_bottom";
 
 	parts {
 		part {
diff --git a/module.desktop.in b/module.desktop.in
index 107c2f7..9483c4d 100644
--- a/module.desktop.in
+++ b/module.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Link
-Name=Itask NG
-Name[de]=Itask-NG
+Name=Engage
+Name[de]=Engage
 Icon=e-module-ng
-Comment=A dock that holds a taskbar and application launcher<br>Add instances with: Config Panel > Extensions > Itask NG 
-Comment[ru]=Док содержащий панель задач и запуск приложений<br>Добавлять экземпляры через: Панель параметров → Расширения → Itask NG
+Comment=A dock that holds a taskbar and application launcher<br>Add instances with: Config Panel > Extensions > Engage 
+Comment[ru]=Док содержащий панель задач и запуск приложений<br>Добавлять экземпляры через: Панель параметров → Расширения → Engage
 Comment[de]=Ein Dock mit einer Taskbar und Anwendungsstartern<br>Instanzen können hinzugefügt werden über: Enlightenment-Einstellungen → Erweiterungen → Itask-NG
-Comment[it]=Contiene una taskbar ed un lanciatore di applicazioni<br>Per aggiungerne istanze: Pannello di configurazione → Estensioni → Itask NG
-Comment[fr]=Un dock contenant une barre des tâches et un lanceur.<br>Pour ajouter des instances : Panneau de contrôle → Extensions → Itask NG 
-Comment[pt]=Uma barra de tarefas e lançador de aplicações<br>Adicione instâncias em: Painel de configuração > Extensões > Itask NG
+Comment[it]=Contiene una taskbar ed un lanciatore di applicazioni<br>Per aggiungerne istanze: Pannello di configurazione → Estensioni → Engage
+Comment[fr]=Un dock contenant une barre des tâches et un lanceur.<br>Pour ajouter des instances : Panneau de contrôle → Extensions → Engage 
+Comment[pt]=Uma barra de tarefas e lançador de aplicações<br>Adicione instâncias em: Painel de configuração > Extensões > Engage
 X-Enlightenment-ModuleType=utils
diff --git a/po/cs.po b/po/cs.po
index 794af70..2ae68e6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Itask-ng\n"
-"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-01-04 18:31+0100\n"
+"Report-Msgid-Bugs-To: hannes.janetzek@gmail.com\n"
+"POT-Creation-Date: 2011-04-04 14:24+0200\n"
 "PO-Revision-Date: 2011-01-04 18:48+0100\n"
 "Last-Translator: quaker66 <quaker66@gmail.com>\n"
 "Language-Team: Czech <quaker66@gmail.com>\n"
@@ -14,297 +14,309 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/e_mod_main.c:398
-msgid "Itask-NG"
-msgstr "Itask-NG"
+#: src/e_mod_main.c:1695 src/e_mod_main.c:1786 src/e_mod_main.c:1810
+msgid "Engage"
+msgstr ""
 
-#: ../src/e_mod_main.c:477
-msgid "Itask NG"
-msgstr "Itask NG"
-
-#: ../src/ng_taskbar.c:731
+#: src/ng_taskbar.c:684
 msgid "No name!"
 msgstr "Beze jména!"
 
-#: ../src/ng_launcher.c:619
+#: src/ng_launcher.c:529
 msgid "Configure Bar"
 msgstr "Nastavit panel"
 
-#: ../src/ng_launcher.c:623
+#: src/ng_launcher.c:533
 msgid "Lock Dragging"
 msgstr "Uzamknout přesun"
 
-#: ../src/ng_launcher.c:632
+#: src/ng_launcher.c:542
 msgid "Applications"
 msgstr "Aplikace"
 
-#: ../src/ng_launcher.c:636
+#: src/ng_launcher.c:546
 msgid "Edit Icon"
 msgstr "Upravit ikonu"
 
-#: ../src/ng_border_menu.c:30
+#: src/ng_border_menu.c:30
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: ../src/ng_border_menu.c:45
+#: src/ng_border_menu.c:45
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../src/ng_border_menu.c:66
+#: src/ng_border_menu.c:66
 msgid "Maximized"
 msgstr "Maximalizováno"
 
-#: ../src/ng_border_menu.c:86
+#: src/ng_border_menu.c:86
 msgid "Uniconify"
 msgstr "Deminimalizovat"
 
-#: ../src/ng_border_menu.c:88
+#: src/ng_border_menu.c:88
 msgid "Iconify"
 msgstr "Minimalizovat"
 
-#: ../src/ng_gadcon.c:302
+#: src/ng_gadcon.c:299
 msgid "Available Gadgets"
 msgstr "Dostupné gadgety"
 
-#: ../src/ng_gadcon.c:309
+#: src/ng_gadcon.c:306
 msgid "Add Gadget"
 msgstr "Přidat gadget"
 
-#: ../src/ng_gadcon.c:315
+#: src/ng_gadcon.c:312
 msgid "Selected Gadgets"
 msgstr "Vybrané gadgety"
 
-#: ../src/ng_gadcon.c:322
+#: src/ng_gadcon.c:319
 msgid "Remove Gadget"
 msgstr "Odstranit gadget"
 
-#: ../src/ng_gadcon.c:330
-#: ../src/ng_gadcon.c:373
-#: ../src/ng_gadcon.c:397
+#: src/ng_gadcon.c:327 src/ng_gadcon.c:370 src/ng_gadcon.c:394
 msgid "Description: Unavailable"
 msgstr "Popis: nedostupný"
 
-#: ../src/ng_config.c:101
-msgid "Itask NG Configuration"
+#: src/ng_config.c:101
+#, fuzzy
+msgid "Engage Configuration"
 msgstr "Volby Itask NG"
 
-#: ../src/ng_config.c:168
-msgid "Bar Items"
-msgstr "Položky panelu"
-
-#: ../src/ng_config.c:177
-#: ../src/ng_config.c:634
-#: ../src/ng_config_instances.c:104
-msgid "Delete"
-msgstr "Odstranit"
-
-#: ../src/ng_config.c:179
-#: ../src/ng_config.c:636
-#: ../src/ng_config_instances.c:106
-msgid "Configure"
-msgstr "Konfigurovat"
-
-#: ../src/ng_config.c:181
-msgid "Up"
-msgstr "Nahoru"
-
-#: ../src/ng_config.c:183
-msgid "Down"
-msgstr "Dolů"
-
-#: ../src/ng_config.c:188
-#: ../src/ng_config.c:632
-#: ../src/ng_config_instances.c:102
-msgid "Add"
-msgstr "Přidat"
-
-#: ../src/ng_config.c:190
-msgid "Taskbar"
-msgstr "Správce úloh"
-
-#: ../src/ng_config.c:192
-msgid "Launcher"
-msgstr "Spouštěč"
-
-#: ../src/ng_config.c:194
-msgid "Gadcon"
-msgstr "Gadcon"
-
-#: ../src/ng_config.c:205
+#: src/ng_config.c:171 src/ng_config.c:229
 msgid "Appearance"
 msgstr "Vzhled"
 
-#: ../src/ng_config.c:206
-msgid "Show Icon Label"
-msgstr "Zobrazit text ikony"
-
-#: ../src/ng_config.c:209
-msgid "Show Background Box"
-msgstr "Zobrazit pozadí"
-
-#.
-#. ob = e_widget_check_add(evas, D_("Mouse-Over Animation"), &(cfdata->mouse_over_anim));
-#. e_widget_framelist_object_append(of, ob);
-#.
-#: ../src/ng_config.c:215
+#: src/ng_config.c:172
 msgid "Icon Size:"
 msgstr "Velikost ikon:"
 
-#: ../src/ng_config.c:217
+#: src/ng_config.c:174
 #, c-format
 msgid "%1.0f px"
 msgstr "%1.0f px"
 
-#: ../src/ng_config.c:224
-msgid "Background Transparency:"
+#: src/ng_config.c:179
+msgid "Reflection Opacity:"
+msgstr ""
+
+#: src/ng_config.c:181
+#, fuzzy, c-format
+msgid "%1.0f"
+msgstr "%1.0f px"
+
+#: src/ng_config.c:188
+#, fuzzy
+msgid "Background Opacity:"
 msgstr "Průhlednost pozadí:"
 
-#: ../src/ng_config.c:226
+#: src/ng_config.c:190
 msgid "%1.0f \\%"
 msgstr "%1.0f \\%"
 
-#: ../src/ng_config.c:234
-msgid "Stacking"
-msgstr "Skládání"
+#: src/ng_config.c:198
+msgid "Show Background Box"
+msgstr "Zobrazit pozadí"
 
-#: ../src/ng_config.c:237
-msgid "Above All"
-msgstr "Nad vším"
-
-#: ../src/ng_config.c:239
-msgid "Below Fullscreen"
-msgstr "Pod celoobrazovkovými"
-
-#: ../src/ng_config.c:244
+#: src/ng_config.c:203
 msgid "Orientation"
 msgstr "Orientace"
 
-#: ../src/ng_config.c:260
+#: src/ng_config.c:205
+msgid "Bottom Edge"
+msgstr ""
+
+#: src/ng_config.c:207
+msgid "Top Edge"
+msgstr ""
+
+#: src/ng_config.c:209
+msgid "Left Edge"
+msgstr ""
+
+#: src/ng_config.c:211
+msgid "Right Edge"
+msgstr ""
+
+#: src/ng_config.c:232 src/ng_config.c:251
 msgid "Zoom"
 msgstr "Přiblížení"
 
-#: ../src/ng_config.c:261
-msgid "Zoom only one icon"
-msgstr "Přiblížit pouze jednu ikonu"
-
-#: ../src/ng_config.c:263
+#: src/ng_config.c:233
 msgid "Factor:"
 msgstr "Faktor:"
 
-#: ../src/ng_config.c:269
+#: src/ng_config.c:239
 msgid "Range:"
 msgstr "Šířka:"
 
-#: ../src/ng_config.c:275
+#: src/ng_config.c:245
 msgid "Duration:"
 msgstr "Trvání:"
 
-#: ../src/ng_config.c:283
+#: src/ng_config.c:254 src/ng_config.c:282
+msgid "Bar Items"
+msgstr "Položky panelu"
+
+#: src/ng_config.c:262 src/ng_config.c:539 src/ng_config_instances.c:104
+msgid "Delete"
+msgstr "Odstranit"
+
+#: src/ng_config.c:264 src/ng_config.c:541 src/ng_config_instances.c:106
+msgid "Configure"
+msgstr "Konfigurovat"
+
+#: src/ng_config.c:266
+msgid "Up"
+msgstr "Nahoru"
+
+#: src/ng_config.c:268
+msgid "Down"
+msgstr "Dolů"
+
+#: src/ng_config.c:273 src/ng_config.c:537 src/ng_config_instances.c:102
+msgid "Add"
+msgstr "Přidat"
+
+#: src/ng_config.c:275
+msgid "Taskbar"
+msgstr "Správce úloh"
+
+#: src/ng_config.c:277
+msgid "Launcher"
+msgstr "Spouštěč"
+
+#: src/ng_config.c:279
+msgid "Gadcon"
+msgstr "Gadcon"
+
+#: src/ng_config.c:285 src/ng_config.c:301
 msgid "Auto Hide"
 msgstr "Automaticky skrýt"
 
-#: ../src/ng_config.c:307
+#: src/ng_config.c:299
 msgid "Show Bar when Urgent"
 msgstr "Zobrazit panel při naléhavé notifikaci"
 
-#. ob = e_widget_radio_add(evas, "Hide Below Windows", 2, rg);
-#. e_widget_framelist_object_append(of, ob);
-#. //  e_widget_on_change_hook_set(ob, _cb_check_if_launcher_source, cfdata);
-#.
-#: ../src/ng_config.c:314
-msgid "Hide Timeout:"
-msgstr "Časový limit skrytí:"
+#: src/ng_config.c:307
+msgid "Stacking"
+msgstr "Skládání"
 
-#: ../src/ng_config.c:322
+#: src/ng_config.c:309
+msgid "Above All"
+msgstr "Nad vším"
+
+#: src/ng_config.c:311
+msgid "Below Fullscreen"
+msgstr "Pod celoobrazovkovými"
+
+#: src/ng_config.c:315 src/ng_config.c:322
 msgid "Other"
 msgstr "Ostatní"
 
-#: ../src/ng_config.c:323
-msgid "Lock Deskflip on Edge"
-msgstr "Zamknout přepnutí plochy na okraji"
-
-#: ../src/ng_config.c:325
+#: src/ng_config.c:316
 msgid "Ecomorph Features"
 msgstr "Funkce Ecomorphu"
 
-#: ../src/ng_config.c:624
+#: src/ng_config.c:318
+msgid "Show Icon Label"
+msgstr "Zobrazit text ikony"
+
+#: src/ng_config.c:529
 msgid "Launcher Settings"
 msgstr "Nastavení spouštěče"
 
-#: ../src/ng_config.c:644
+#: src/ng_config.c:549
 msgid "Taskbar Settings"
 msgstr "Nastavení správce úloh"
 
-#: ../src/ng_config.c:646
+#: src/ng_config.c:551
 msgid "Dont Show Dialogs"
 msgstr "Nezobrazovat dialogy"
 
-#: ../src/ng_config.c:648
+#: src/ng_config.c:554
 msgid "Advanced Window Menu"
 msgstr "Pokročilé menu okna"
 
-#: ../src/ng_config.c:650
+#: src/ng_config.c:557
 msgid "Only Show Current Desk"
 msgstr "Zobrazit jen aktuální plochu"
 
-#: ../src/ng_config.c:652
+#: src/ng_config.c:560
 msgid "Group Applications by Window Class"
 msgstr "Seskupovat aplikace podle třídy okna"
 
-#: ../src/ng_config.c:654
+#: src/ng_config.c:563
 msgid "Append new Applications on the right Side"
 msgstr "Přidávat nové aplikace na pravém okraji"
 
-#: ../src/ng_config.c:659
+#: src/ng_config.c:569
 msgid "Iconified Applications"
 msgstr "Ikonifikované aplikace"
 
-#: ../src/ng_config.c:734
-#: ../src/ng_config.c:774
-msgid "Itask NG Bar Configuration"
+#: src/ng_config.c:644 src/ng_config.c:684
+#, fuzzy
+msgid "Engage Bar Configuration"
 msgstr "Itask NG Panel nastavení"
 
-#: ../src/ng_config.c:879
-msgid "Create new Itask NG source"
+#: src/ng_config.c:789
+#, fuzzy
+msgid "Create new source"
 msgstr "Vytvořit nový zdroj Itask NG"
 
-#: ../src/ng_config.c:880
+#: src/ng_config.c:790
 msgid "Enter a name for this new Application Launcher:"
 msgstr "Zadejte jméno pro tento nový spouštěč:"
 
-#: ../src/ng_config.c:889
-#, c-format
-msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this ng source?"
+#: src/ng_config.c:799
+#, fuzzy, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"source?"
 msgstr "Opravdu chcete smazat Itask NG zdroj \"%s\"?"
 
-#: ../src/ng_config.c:893
-msgid "Are you sure you want to delete this Itask NG source?"
-msgstr "Opravdu chcete smazat tento Itask NG zdroj?"
+#: src/ng_config.c:803
+#, fuzzy
+msgid "Are you sure you want to delete this source?"
+msgstr "Opravdu chcete smazat tuto Itask NG instanci?"
 
-#: ../src/ng_config_instances.c:64
-msgid "Itask NG Instances"
+#: src/ng_config_instances.c:64 src/ng_config_instances.c:94
+#, fuzzy
+msgid "Engage Instances"
 msgstr "Instance Itask NG"
 
-#: ../src/ng_config_instances.c:94
-msgid "Itask NG - Instances"
-msgstr "Itask NG - Instance"
-
-#. FIXME
-#. if(ci->launcher)
-#. label = D_("Launcher NG");
-#. else if(ci->taskbar)
-#. label = D_("Taskbar NG");
-#.
-#: ../src/ng_config_instances.c:164
+#: src/ng_config_instances.c:164
 msgid "Bar"
 msgstr "Panel"
 
-#: ../src/ng_config_instances.c:363
+#: src/ng_config_instances.c:338
 #, c-format
-msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this Instance?"
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"Instance?"
 msgstr "Opravdu chcete smazat Itask NG instanci \"%s\"?"
 
-#: ../src/ng_config_instances.c:367
+#: src/ng_config_instances.c:342
 msgid "Are you sure you want to delete this Instance?"
 msgstr "Opravdu chcete smazat tuto Itask NG instanci?"
 
+#~ msgid "Itask-NG"
+#~ msgstr "Itask-NG"
+
+#~ msgid "Itask NG"
+#~ msgstr "Itask NG"
+
+#~ msgid "Zoom only one icon"
+#~ msgstr "Přiblížit pouze jednu ikonu"
+
+#~ msgid "Hide Timeout:"
+#~ msgstr "Časový limit skrytí:"
+
+#~ msgid "Lock Deskflip on Edge"
+#~ msgstr "Zamknout přepnutí plochy na okraji"
+
+#~ msgid "Are you sure you want to delete this Itask NG source?"
+#~ msgstr "Opravdu chcete smazat tento Itask NG zdroj?"
+
+#~ msgid "Itask NG - Instances"
+#~ msgstr "Itask NG - Instance"
diff --git a/po/de.po b/po/de.po
index 8096abb..495e2de 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,12 +20,8 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: src/e_mod_main.c:398
-msgid "Itask-NG"
-msgstr "Itask-NG"
-
-#: src/e_mod_main.c:477
-msgid "Itask NG"
-msgstr "Itask-NG"
+msgid "Engage"
+msgstr "Engage"
 
 #: src/ng_taskbar.c:731
 msgid "No name!"
@@ -33,7 +29,7 @@ msgstr "Kein Name!"
 
 #: src/ng_launcher.c:619
 msgid "Configure Bar"
-msgstr "Itask-Leiste einstellen"
+msgstr "Engage Einstellungen"
 
 #: src/ng_launcher.c:623
 msgid "Lock Dragging"
@@ -88,8 +84,8 @@ msgid "Description: Unavailable"
 msgstr "Beschreibung: Nicht verfügbar"
 
 #: src/ng_config.c:101
-msgid "Itask NG Configuration"
-msgstr "Einstellungen für Itask-NG"
+msgid "Engage Configuration"
+msgstr "Einstellungen für Engage"
 
 #: src/ng_config.c:168
 msgid "Bar Items"
@@ -210,7 +206,7 @@ msgstr "Weitere Einstellungen"
 
 #: src/ng_config.c:323
 msgid "Lock Deskflip on Edge"
-msgstr "Arbeitsflächenwechsel an Itask-Kante verhindern"
+msgstr "Arbeitsflächenwechsel an Engage-Kante verhindern"
 
 #: src/ng_config.c:325
 msgid "Ecomorph Features"
@@ -249,8 +245,8 @@ msgid "Iconified Applications"
 msgstr "Zu Icon verkleinerte Anwendungen"
 
 #: src/ng_config.c:734 src/ng_config.c:774
-msgid "Itask NG Bar Configuration"
-msgstr "Einstellungen für Itask-NG-Taskbar"
+msgid "Engage Bar Configuration"
+msgstr "Einstellungen für Engage-Taskbar"
 
 #: src/ng_config.c:852
 #, c-format
@@ -268,8 +264,8 @@ msgid "%i Gadcon"
 msgstr "%i Bereich für Helfer"
 
 #: src/ng_config.c:879
-msgid "Create new Itask NG source"
-msgstr "Neue Itask-NG-Quelle erstellen"
+msgid "Create new source"
+msgstr "Neue Anwendungen-Liste erstellen"
 
 #: src/ng_config.c:880
 msgid "Enter a name for this new Application Launcher:"
@@ -279,20 +275,20 @@ msgstr "Geben Sie einen neuen Namen für diesen Anwendungsstarter an:"
 #, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
-"ng source?"
+"source?"
 msgstr "Sie möchten \"%s\" löschen.<br><br>Sind Sie wirklich sicher?"
 
 #: src/ng_config.c:893
-msgid "Are you sure you want to delete this Itask NG source?"
-msgstr "Möchten Sie diese Itask-NG-Quelle wirklich löschen?"
+msgid "Are you sure you want to delete this source?"
+msgstr "Möchten Sie diese Anwendungen-Liste wirklich löschen?"
 
 #: src/ng_config_instances.c:64
-msgid "Itask NG Instances"
-msgstr "Itask-NG-Instanzen"
+msgid "Engage Instances"
+msgstr "Engage-Instanzen"
 
 #: src/ng_config_instances.c:94
-msgid "Itask NG - Instances"
-msgstr "Itask-NG-Instanzen"
+msgid "Engage - Instances"
+msgstr "Engage-Instanzen"
 
 #: src/ng_config_instances.c:164
 msgid "Bar"
diff --git a/po/fr.po b/po/fr.po
index dd5d143..d5c2375 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Itask-ng\n"
 "Report-Msgid-Bugs-To: hannes.janetzek@gmail.com\n"
-"POT-Creation-Date: 2008-09-02 16:42+0200\n"
+"POT-Creation-Date: 2011-04-04 14:24+0200\n"
 "PO-Revision-Date: 2010-07-12 10:20+0400\n"
 "Last-Translator: batden <batden@orange.fr>\n"
 "Language-Team: French <pourunmondesansgourou@orange.fr>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,323 +19,374 @@ msgstr ""
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/e_mod_main.c:338
-msgid "Itask NG"
-msgstr "Itask NG"
+#: src/e_mod_main.c:1695 src/e_mod_main.c:1786 src/e_mod_main.c:1810
+msgid "Engage"
+msgstr ""
 
-#: src/ng_taskbar.c:851
+#: src/ng_taskbar.c:684
 msgid "No name!"
 msgstr "Pas de nom !"
 
-#: src/ng_launcher.c:726
+#: src/ng_launcher.c:529
 msgid "Configure Bar"
 msgstr "Configurer la barre"
 
-#: src/ng_launcher.c:733
-msgid "Configure Launcher"
-msgstr "Configurer le lanceur"
-
-#: src/ng_launcher.c:737
+#: src/ng_launcher.c:533
 msgid "Lock Dragging"
 msgstr "Verrouiller le glisser"
 
-#: src/ng_launcher.c:746
-msgid "Set Single Instance"
-msgstr "N'autoriser qu'une seule instance"
+#: src/ng_launcher.c:542
+msgid "Applications"
+msgstr ""
 
-#: src/ng_launcher.c:752
-#: src/ng_border_menu.c:307
+#: src/ng_launcher.c:546
 msgid "Edit Icon"
 msgstr "Éditer l'icone"
 
-#: src/ng_border_menu.c:154
-msgid "Window Locks"
-msgstr "Verrous de la fenêtre"
-
-#: src/ng_border_menu.c:161
-msgid "Remember"
-msgstr "Mémoriser"
-
-#: src/ng_border_menu.c:170
-msgid "Borders"
-msgstr "Bordures"
-
-#: src/ng_border_menu.c:184
-msgid "Send to Desktop"
-msgstr "Envoyer sur le bureau"
-
-#: src/ng_border_menu.c:196
-msgid "Pin to Desktop"
-msgstr "Épingler au bureau"
-
-#: src/ng_border_menu.c:208
-msgid "Unpin from Desktop"
-msgstr "Désépingler du bureau"
-
-#: src/ng_border_menu.c:241
-msgid "State"
-msgstr "État"
-
-#: src/ng_border_menu.c:255
-#: src/ng_border_menu.c:750
-msgid "Sticky"
-msgstr "Ancré"
-
-#: src/ng_border_menu.c:268
-#: src/ng_border_menu.c:763
+#: src/ng_border_menu.c:30
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/ng_border_menu.c:288
-msgid "Skip Window List"
-msgstr "Ne pas afficher dans la liste des fenêtres"
-
-#: src/ng_border_menu.c:312
-msgid "Add To Favorites Menu"
-msgstr "Ajouter au menu des favoris"
-
-#: src/ng_border_menu.c:317
-msgid "Add To Launcher"
-msgstr "Ajouter au lanceur"
-
-#: src/ng_border_menu.c:324
-msgid "Create Icon"
-msgstr "Créer un icone"
-
-#: src/ng_border_menu.c:334
-msgid "Window Properties"
-msgstr "Propriétés de la fenêtre"
-
-#: src/ng_border_menu.c:347
-msgid "Kill"
-msgstr "Tuer"
-
-#: src/ng_border_menu.c:357
-#: src/ng_border_menu.c:372
+#: src/ng_border_menu.c:45
 msgid "Close"
 msgstr "Fermer"
 
-#: src/ng_border_menu.c:395
+#: src/ng_border_menu.c:66
 msgid "Maximized"
 msgstr "Maximisée"
 
-#: src/ng_border_menu.c:419
+#: src/ng_border_menu.c:86
 msgid "Uniconify"
 msgstr "Restaurer"
 
-#: src/ng_border_menu.c:421
+#: src/ng_border_menu.c:88
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/ng_border_menu.c:737
-msgid "Shaded"
-msgstr "Enroulée"
-
-#: src/ng_gadcon.c:429
+#: src/ng_gadcon.c:299
 msgid "Available Gadgets"
 msgstr "Gadgets disponibles"
 
-#: src/ng_gadcon.c:436
+#: src/ng_gadcon.c:306
 msgid "Add Gadget"
 msgstr "Ajouter un gadget"
 
-#: src/ng_gadcon.c:442
+#: src/ng_gadcon.c:312
 msgid "Selected Gadgets"
 msgstr "Gadgets sélectionnés"
 
-#: src/ng_gadcon.c:449
+#: src/ng_gadcon.c:319
 msgid "Remove Gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/ng_gadcon.c:457
-#: src/ng_gadcon.c:492
-#: src/ng_gadcon.c:514
+#: src/ng_gadcon.c:327 src/ng_gadcon.c:370 src/ng_gadcon.c:394
 msgid "Description: Unavailable"
 msgstr "Description : non disponible"
 
-#: src/ng_config.c:83
-msgid "Itask NG Configuration"
+#: src/ng_config.c:101
+#, fuzzy
+msgid "Engage Configuration"
 msgstr "Configuration de Itask NG"
 
-#: src/ng_config.c:153
-msgid "Bar Items"
-msgstr "Éléments de la barre"
-
-#: src/ng_config.c:161
-#: src/ng_config.c:613
-#: src/ng_config_instances.c:92
-msgid "Delete"
-msgstr "Supprimer"
-
-#: src/ng_config.c:163
-#: src/ng_config.c:615
-#: src/ng_config_instances.c:94
-msgid "Configure"
-msgstr "Configurer"
-
-#: src/ng_config.c:165
-msgid "Up"
-msgstr "Monter"
-
-#: src/ng_config.c:167
-msgid "Down"
-msgstr "Descendre"
-
-#: src/ng_config.c:174
-#: src/ng_config.c:611
-#: src/ng_config_instances.c:90
-msgid "Add"
-msgstr "Ajouter"
-
-#: src/ng_config.c:176
-msgid "Taskbar"
-msgstr "Barre des tâches"
-
-#: src/ng_config.c:178
-msgid "Launcher"
-msgstr "Lanceur"
-
-#: src/ng_config.c:180
-msgid "Gadcon"
-msgstr "Gadcon"
-
-#: src/ng_config.c:187
-msgid "Zooming"
-msgstr "Zoom"
-
-#: src/ng_config.c:188
-msgid "Zoom only one icon"
-msgstr "Ne zoomer qu'un seul icone"
-
-#: src/ng_config.c:190
-msgid "Zoomfactor:"
-msgstr "Facteur de zoom :"
-
-#: src/ng_config.c:192
-#, c-format
-msgid "%0.01f"
-msgstr "%0.01f"
-
-#: src/ng_config.c:196
-msgid "Zoom Range:"
-msgstr "Étendue du zoom :"
-
-#: src/ng_config.c:198
-#: src/ng_config.c:204
-#: src/ng_config.c:284
-#, c-format
-msgid "%0.1f"
-msgstr "%0.1f"
-
-#: src/ng_config.c:202
-msgid "Zoom Duration:"
-msgstr "Durée du zoom :"
-
-#: src/ng_config.c:215
+#: src/ng_config.c:171 src/ng_config.c:229
 msgid "Appearance"
 msgstr "Aspect"
 
-#: src/ng_config.c:216
-msgid "Show Icon Label"
-msgstr "Montrer l'étiquette de l'icone"
-
-#: src/ng_config.c:219
-msgid "Show Background Box"
-msgstr "Afficher le fond"
-
-#: src/ng_config.c:225
+#: src/ng_config.c:172
 msgid "Icon Size:"
 msgstr "Taille de l'icone :"
 
-#: src/ng_config.c:227
+#: src/ng_config.c:174
 #, c-format
 msgid "%1.0f px"
 msgstr "%1.0f px"
 
-#: src/ng_config.c:234
-msgid "Background Transparency:"
+#: src/ng_config.c:179
+msgid "Reflection Opacity:"
+msgstr ""
+
+#: src/ng_config.c:181
+#, fuzzy, c-format
+msgid "%1.0f"
+msgstr "%1.0f px"
+
+#: src/ng_config.c:188
+#, fuzzy
+msgid "Background Opacity:"
 msgstr "Transparence du fond :"
 
-#: src/ng_config.c:236
+#: src/ng_config.c:190
 msgid "%1.0f \\%"
 msgstr "%1.0f \\%"
 
-#: src/ng_config.c:261
-msgid "Hide Behavior"
-msgstr "Comportement du masquage"
+#: src/ng_config.c:198
+msgid "Show Background Box"
+msgstr "Afficher le fond"
 
-#: src/ng_config.c:282
-msgid "Hide Timeout:"
-msgstr "Délai avant masquage :"
-
-#: src/ng_config.c:291
+#: src/ng_config.c:203
 msgid "Orientation"
 msgstr "Disposition"
 
-#: src/ng_config.c:603
+#: src/ng_config.c:205
+msgid "Bottom Edge"
+msgstr ""
+
+#: src/ng_config.c:207
+msgid "Top Edge"
+msgstr ""
+
+#: src/ng_config.c:209
+msgid "Left Edge"
+msgstr ""
+
+#: src/ng_config.c:211
+msgid "Right Edge"
+msgstr ""
+
+#: src/ng_config.c:232 src/ng_config.c:251
+#, fuzzy
+msgid "Zoom"
+msgstr "Zoom"
+
+#: src/ng_config.c:233
+#, fuzzy
+msgid "Factor:"
+msgstr "Facteur de zoom :"
+
+#: src/ng_config.c:239
+#, fuzzy
+msgid "Range:"
+msgstr "Étendue du zoom :"
+
+#: src/ng_config.c:245
+#, fuzzy
+msgid "Duration:"
+msgstr "Durée du zoom :"
+
+#: src/ng_config.c:254 src/ng_config.c:282
+msgid "Bar Items"
+msgstr "Éléments de la barre"
+
+#: src/ng_config.c:262 src/ng_config.c:539 src/ng_config_instances.c:104
+msgid "Delete"
+msgstr "Supprimer"
+
+#: src/ng_config.c:264 src/ng_config.c:541 src/ng_config_instances.c:106
+msgid "Configure"
+msgstr "Configurer"
+
+#: src/ng_config.c:266
+msgid "Up"
+msgstr "Monter"
+
+#: src/ng_config.c:268
+msgid "Down"
+msgstr "Descendre"
+
+#: src/ng_config.c:273 src/ng_config.c:537 src/ng_config_instances.c:102
+msgid "Add"
+msgstr "Ajouter"
+
+#: src/ng_config.c:275
+msgid "Taskbar"
+msgstr "Barre des tâches"
+
+#: src/ng_config.c:277
+msgid "Launcher"
+msgstr "Lanceur"
+
+#: src/ng_config.c:279
+msgid "Gadcon"
+msgstr "Gadcon"
+
+#: src/ng_config.c:285 src/ng_config.c:301
+msgid "Auto Hide"
+msgstr ""
+
+#: src/ng_config.c:299
+msgid "Show Bar when Urgent"
+msgstr ""
+
+#: src/ng_config.c:307
+msgid "Stacking"
+msgstr ""
+
+#: src/ng_config.c:309
+msgid "Above All"
+msgstr ""
+
+#: src/ng_config.c:311
+#, fuzzy
+msgid "Below Fullscreen"
+msgstr "Plein écran"
+
+#: src/ng_config.c:315 src/ng_config.c:322
+msgid "Other"
+msgstr ""
+
+#: src/ng_config.c:316
+msgid "Ecomorph Features"
+msgstr ""
+
+#: src/ng_config.c:318
+msgid "Show Icon Label"
+msgstr "Montrer l'étiquette de l'icone"
+
+#: src/ng_config.c:529
 msgid "Launcher Settings"
 msgstr "Paramétrage du lanceur"
 
-#: src/ng_config.c:623
+#: src/ng_config.c:549
 msgid "Taskbar Settings"
 msgstr "Paramétrage de la barre des tâches"
 
-#: src/ng_config.c:625
+#: src/ng_config.c:551
 msgid "Dont Show Dialogs"
 msgstr "Ne pas afficher les boîtes de dialogue"
 
-#: src/ng_config.c:627
+#: src/ng_config.c:554
 msgid "Advanced Window Menu"
 msgstr "Menu avancé de la fenêtre"
 
-#: src/ng_config.c:629
+#: src/ng_config.c:557
 msgid "Only Show Current Desk"
 msgstr "Afficher uniquement le bureau actuel"
 
-#: src/ng_config.c:634
-msgid "Show Iconified"
-msgstr "Afficher la minimisation"
+#: src/ng_config.c:560
+msgid "Group Applications by Window Class"
+msgstr ""
 
-#: src/ng_config.c:720
-#: src/ng_config.c:761
-msgid "Itask NG Bar Configuration"
+#: src/ng_config.c:563
+msgid "Append new Applications on the right Side"
+msgstr ""
+
+#: src/ng_config.c:569
+msgid "Iconified Applications"
+msgstr ""
+
+#: src/ng_config.c:644 src/ng_config.c:684
+#, fuzzy
+msgid "Engage Bar Configuration"
 msgstr "Configuration de la barre NG"
 
-#: src/ng_config.c:869
-msgid "Create new Itask NG source"
+#: src/ng_config.c:789
+#, fuzzy
+msgid "Create new source"
 msgstr "Créer une nouvelle source"
 
-#: src/ng_config.c:870
+#: src/ng_config.c:790
 msgid "Enter a name for this new Application Launcher:"
 msgstr "Entrer un nom pour ce nouveau lanceur :"
 
-#: src/ng_config.c:881
-#, c-format
-msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this ng source?"
-msgstr "Vous avez demandé à supprimer « %s ».<br><br>Voulez-vous vraiment supprimer cette source ?"
+#: src/ng_config.c:799
+#, fuzzy, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"source?"
+msgstr ""
+"Vous avez demandé à supprimer « %s ».<br><br>Voulez-vous vraiment supprimer "
+"cette source ?"
 
-#: src/ng_config.c:885
-msgid "Are you sure you want to delete this Itask NG source?"
-msgstr "Voulez-vous vraiment supprimer cette source ?"
+#: src/ng_config.c:803
+#, fuzzy
+msgid "Are you sure you want to delete this source?"
+msgstr "Voulez-vous vraiment supprimer cette instance ?"
 
-#: src/ng_config_instances.c:49
-msgid "Itask NG Instances"
-msgstr "Instances de Itask NG"
+#: src/ng_config_instances.c:64 src/ng_config_instances.c:94
+#, fuzzy
+msgid "Engage Instances"
+msgstr "N'autoriser qu'une seule instance"
 
-#: src/ng_config_instances.c:82
-msgid "Itask NG - Instances"
-msgstr "Itask NG - Instances"
-
-#: src/ng_config_instances.c:152
+#: src/ng_config_instances.c:164
 msgid "Bar"
 msgstr "Barre"
 
-#: src/ng_config_instances.c:336
+#: src/ng_config_instances.c:338
 #, c-format
-msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this Instance?"
-msgstr "Vous avez demandé à supprimer « %s ».<br><br>voulez-vous vraiment le faire ?"
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"Instance?"
+msgstr ""
+"Vous avez demandé à supprimer « %s ».<br><br>voulez-vous vraiment le faire ?"
 
-#: src/ng_config_instances.c:340
+#: src/ng_config_instances.c:342
 msgid "Are you sure you want to delete this Instance?"
 msgstr "Voulez-vous vraiment supprimer cette instance ?"
 
+#~ msgid "Itask NG"
+#~ msgstr "Itask NG"
+
+#~ msgid "Configure Launcher"
+#~ msgstr "Configurer le lanceur"
+
+#~ msgid "Window Locks"
+#~ msgstr "Verrous de la fenêtre"
+
+#~ msgid "Remember"
+#~ msgstr "Mémoriser"
+
+#~ msgid "Borders"
+#~ msgstr "Bordures"
+
+#~ msgid "Send to Desktop"
+#~ msgstr "Envoyer sur le bureau"
+
+#~ msgid "Pin to Desktop"
+#~ msgstr "Épingler au bureau"
+
+#~ msgid "Unpin from Desktop"
+#~ msgstr "Désépingler du bureau"
+
+#~ msgid "State"
+#~ msgstr "État"
+
+#~ msgid "Sticky"
+#~ msgstr "Ancré"
+
+#~ msgid "Skip Window List"
+#~ msgstr "Ne pas afficher dans la liste des fenêtres"
+
+#~ msgid "Add To Favorites Menu"
+#~ msgstr "Ajouter au menu des favoris"
+
+#~ msgid "Add To Launcher"
+#~ msgstr "Ajouter au lanceur"
+
+#~ msgid "Create Icon"
+#~ msgstr "Créer un icone"
+
+#~ msgid "Window Properties"
+#~ msgstr "Propriétés de la fenêtre"
+
+#~ msgid "Kill"
+#~ msgstr "Tuer"
+
+#~ msgid "Shaded"
+#~ msgstr "Enroulée"
+
+#~ msgid "Zoom only one icon"
+#~ msgstr "Ne zoomer qu'un seul icone"
+
+#~ msgid "%0.01f"
+#~ msgstr "%0.01f"
+
+#~ msgid "%0.1f"
+#~ msgstr "%0.1f"
+
+#~ msgid "Hide Behavior"
+#~ msgstr "Comportement du masquage"
+
+#~ msgid "Hide Timeout:"
+#~ msgstr "Délai avant masquage :"
+
+#~ msgid "Show Iconified"
+#~ msgstr "Afficher la minimisation"
+
+#~ msgid "Are you sure you want to delete this Itask NG source?"
+#~ msgstr "Voulez-vous vraiment supprimer cette source ?"
+
+#~ msgid "Itask NG Instances"
+#~ msgstr "Instances de Itask NG"
+
+#~ msgid "Itask NG - Instances"
+#~ msgstr "Itask NG - Instances"
diff --git a/po/it.po b/po/it.po
index 122aa94..5d9e59f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,304 +5,293 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Itask-ng\n"
-"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
-"POT-Creation-Date: 2011-03-24 05:00-0700\n"
+"Report-Msgid-Bugs-To: hannes.janetzek@gmail.com\n"
+"POT-Creation-Date: 2011-04-04 14:24+0200\n"
 "PO-Revision-Date: 2011-03-24 13:27+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/e_mod_main.c:1695 ../src/e_mod_main.c:1786
-msgid "Itask-NG"
-msgstr "Itask-NG"
+#: src/e_mod_main.c:1695 src/e_mod_main.c:1786 src/e_mod_main.c:1810
+msgid "Engage"
+msgstr ""
 
-#: ../src/e_mod_main.c:1810
-msgid "Itask NG"
-msgstr "Itask NG"
-
-#: ../src/ng_taskbar.c:685
+#: src/ng_taskbar.c:684
 msgid "No name!"
 msgstr "Nessun nome!"
 
-#: ../src/ng_launcher.c:528
+#: src/ng_launcher.c:529
 msgid "Configure Bar"
 msgstr "Configura barra"
 
-#: ../src/ng_launcher.c:532
+#: src/ng_launcher.c:533
 msgid "Lock Dragging"
 msgstr "Blocca trascinamento"
 
-#: ../src/ng_launcher.c:541
+#: src/ng_launcher.c:542
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: ../src/ng_launcher.c:545
+#: src/ng_launcher.c:546
 msgid "Edit Icon"
 msgstr "Modifica icona"
 
-#: ../src/ng_border_menu.c:30
+#: src/ng_border_menu.c:30
 msgid "Fullscreen"
 msgstr "A tutto schermo"
 
-#: ../src/ng_border_menu.c:45
+#: src/ng_border_menu.c:45
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../src/ng_border_menu.c:66
+#: src/ng_border_menu.c:66
 msgid "Maximized"
 msgstr "Massimizzata"
 
-#: ../src/ng_border_menu.c:86
+#: src/ng_border_menu.c:86
 msgid "Uniconify"
 msgstr "Disiconifica"
 
-#: ../src/ng_border_menu.c:88
+#: src/ng_border_menu.c:88
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: ../src/ng_gadcon.c:299
+#: src/ng_gadcon.c:299
 msgid "Available Gadgets"
 msgstr "Gadget disponibili"
 
-#: ../src/ng_gadcon.c:306
+#: src/ng_gadcon.c:306
 msgid "Add Gadget"
 msgstr "Aggiungi gadget"
 
-#: ../src/ng_gadcon.c:312
+#: src/ng_gadcon.c:312
 msgid "Selected Gadgets"
 msgstr "Gadget selezionati"
 
-#: ../src/ng_gadcon.c:319
+#: src/ng_gadcon.c:319
 msgid "Remove Gadget"
 msgstr "Rimuovi gadget"
 
-#: ../src/ng_gadcon.c:327 ../src/ng_gadcon.c:370 ../src/ng_gadcon.c:394
+#: src/ng_gadcon.c:327 src/ng_gadcon.c:370 src/ng_gadcon.c:394
 msgid "Description: Unavailable"
 msgstr "Descrizione: non disponibile"
 
-#: ../src/ng_config.c:101
-msgid "Itask NG Configuration"
+#: src/ng_config.c:101
+#, fuzzy
+msgid "Engage Configuration"
 msgstr "Configurazione di Itask NG"
 
-#: ../src/ng_config.c:171 ../src/ng_config.c:229
+#: src/ng_config.c:171 src/ng_config.c:229
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: ../src/ng_config.c:172
+#: src/ng_config.c:172
 msgid "Icon Size:"
 msgstr "Dimensione icona:"
 
-#: ../src/ng_config.c:174
+#: src/ng_config.c:174
 #, c-format
 msgid "%1.0f px"
 msgstr "%1.0f px"
 
-#: ../src/ng_config.c:179
+#: src/ng_config.c:179
 msgid "Reflection Opacity:"
 msgstr "Trasparenza riflesso:"
 
-#: ../src/ng_config.c:181
+#: src/ng_config.c:181
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: ../src/ng_config.c:188
+#: src/ng_config.c:188
 msgid "Background Opacity:"
 msgstr "Trasparenza sfondo:"
 
-#: ../src/ng_config.c:190
+#: src/ng_config.c:190
 msgid "%1.0f \\%"
 msgstr "%1.0f \\%"
 
-#: ../src/ng_config.c:198
+#: src/ng_config.c:198
 msgid "Show Background Box"
 msgstr "Mostra box di sfondo"
 
-#: ../src/ng_config.c:203
+#: src/ng_config.c:203
 msgid "Orientation"
 msgstr "Orientamento"
 
-#: ../src/ng_config.c:205
+#: src/ng_config.c:205
 msgid "Bottom Edge"
 msgstr "Bordo inferiore"
 
-#: ../src/ng_config.c:207
+#: src/ng_config.c:207
 msgid "Top Edge"
 msgstr "Bordo superiore"
 
-#: ../src/ng_config.c:209
+#: src/ng_config.c:209
 msgid "Left Edge"
 msgstr "Bordo sinistro"
 
-#: ../src/ng_config.c:211
+#: src/ng_config.c:211
 msgid "Right Edge"
 msgstr "Bordo destro"
 
-#: ../src/ng_config.c:232 ../src/ng_config.c:251
+#: src/ng_config.c:232 src/ng_config.c:251
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../src/ng_config.c:233
+#: src/ng_config.c:233
 msgid "Factor:"
 msgstr "Fattore:"
 
-#: ../src/ng_config.c:239
+#: src/ng_config.c:239
 msgid "Range:"
 msgstr "Intervallo:"
 
-#: ../src/ng_config.c:245
+#: src/ng_config.c:245
 msgid "Duration:"
 msgstr "Durata:"
 
-#: ../src/ng_config.c:254 ../src/ng_config.c:282
+#: src/ng_config.c:254 src/ng_config.c:282
 msgid "Bar Items"
 msgstr "Elementi nella barra"
 
-#: ../src/ng_config.c:262 ../src/ng_config.c:538
-#: ../src/ng_config_instances.c:104
+#: src/ng_config.c:262 src/ng_config.c:539 src/ng_config_instances.c:104
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../src/ng_config.c:264 ../src/ng_config.c:540
-#: ../src/ng_config_instances.c:106
+#: src/ng_config.c:264 src/ng_config.c:541 src/ng_config_instances.c:106
 msgid "Configure"
 msgstr "Configura"
 
-#: ../src/ng_config.c:266
+#: src/ng_config.c:266
 msgid "Up"
 msgstr "Su"
 
-#: ../src/ng_config.c:268
+#: src/ng_config.c:268
 msgid "Down"
 msgstr "Giù"
 
-#: ../src/ng_config.c:273 ../src/ng_config.c:536
-#: ../src/ng_config_instances.c:102
+#: src/ng_config.c:273 src/ng_config.c:537 src/ng_config_instances.c:102
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../src/ng_config.c:275
+#: src/ng_config.c:275
 msgid "Taskbar"
 msgstr "Taskbar"
 
-#: ../src/ng_config.c:277
+#: src/ng_config.c:277
 msgid "Launcher"
 msgstr "Lanciatore"
 
-#: ../src/ng_config.c:279
+#: src/ng_config.c:279
 msgid "Gadcon"
 msgstr "Gadcon"
 
-#: ../src/ng_config.c:285 ../src/ng_config.c:301
+#: src/ng_config.c:285 src/ng_config.c:301
 msgid "Auto Hide"
 msgstr "Nascondi automaticamente"
 
-#: ../src/ng_config.c:299
+#: src/ng_config.c:299
 msgid "Show Bar when Urgent"
 msgstr "Mostra barra su Urgenti"
 
-#: ../src/ng_config.c:307
+#: src/ng_config.c:307
 msgid "Stacking"
 msgstr "Livello"
 
-#: ../src/ng_config.c:309
+#: src/ng_config.c:309
 msgid "Above All"
 msgstr "Sopra tutto"
 
-#: ../src/ng_config.c:311
+#: src/ng_config.c:311
 msgid "Below Fullscreen"
 msgstr "Sotto finestre a tutto schermo"
 
-#: ../src/ng_config.c:315 ../src/ng_config.c:322
+#: src/ng_config.c:315 src/ng_config.c:322
 msgid "Other"
 msgstr "Altro"
 
-#: ../src/ng_config.c:316
+#: src/ng_config.c:316
 msgid "Ecomorph Features"
 msgstr "Funzionalità Ecomorph"
 
-#: ../src/ng_config.c:318
+#: src/ng_config.c:318
 msgid "Show Icon Label"
 msgstr "Mostra etichetta icona"
 
-#: ../src/ng_config.c:528
+#: src/ng_config.c:529
 msgid "Launcher Settings"
 msgstr "Impostazioni lanciatore"
 
-#: ../src/ng_config.c:548
+#: src/ng_config.c:549
 msgid "Taskbar Settings"
 msgstr "Impostazioni taskbar"
 
-#: ../src/ng_config.c:550
+#: src/ng_config.c:551
 msgid "Dont Show Dialogs"
 msgstr "Non mostrare finestre dialogo"
 
-#: ../src/ng_config.c:553
+#: src/ng_config.c:554
 msgid "Advanced Window Menu"
 msgstr "Menù finestra avanzato"
 
-#: ../src/ng_config.c:556
+#: src/ng_config.c:557
 msgid "Only Show Current Desk"
 msgstr "Mostra solo desktop corrente"
 
-#: ../src/ng_config.c:559
+#: src/ng_config.c:560
 msgid "Group Applications by Window Class"
 msgstr "Raggruppa applicazioni per classe finestra"
 
-#: ../src/ng_config.c:562
+#: src/ng_config.c:563
 msgid "Append new Applications on the right Side"
 msgstr "Aggiungi nuove applicazioni sul lato destro"
 
-#: ../src/ng_config.c:568
+#: src/ng_config.c:569
 msgid "Iconified Applications"
 msgstr "Applicazioni iconificate"
 
-#: ../src/ng_config.c:643 ../src/ng_config.c:683
-msgid "Itask NG Bar Configuration"
+#: src/ng_config.c:644 src/ng_config.c:684
+#, fuzzy
+msgid "Engage Bar Configuration"
 msgstr "Configurazione barra Itask NG"
 
-#: ../src/ng_config.c:788
-msgid "Create new Itask NG source"
+#: src/ng_config.c:789
+#, fuzzy
+msgid "Create new source"
 msgstr "Crea nuova fonte per Itask NG"
 
-#: ../src/ng_config.c:789
+#: src/ng_config.c:790
 msgid "Enter a name for this new Application Launcher:"
 msgstr "Inserire un nome per il nuovo lanciatore:"
 
-#: ../src/ng_config.c:798
-#, c-format
+#: src/ng_config.c:799
+#, fuzzy, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
-"ng source?"
+"source?"
 msgstr ""
 "Avete richiesto di eliminare \"%s\".<br><br>Siete sicuri di voler eliminare "
 "questa fonte?"
 
-#: ../src/ng_config.c:802
-msgid "Are you sure you want to delete this Itask NG source?"
-msgstr "Siete sicuri di voler eliminare questa fonte per Itask NG?"
+#: src/ng_config.c:803
+#, fuzzy
+msgid "Are you sure you want to delete this source?"
+msgstr "Siete sicuri di voler eliminare questa istanza?"
 
-#: ../src/ng_config_instances.c:64
-msgid "Itask NG Instances"
+#: src/ng_config_instances.c:64 src/ng_config_instances.c:94
+#, fuzzy
+msgid "Engage Instances"
 msgstr "Istanze di Itask NG"
 
-#: ../src/ng_config_instances.c:94
-msgid "Itask NG - Instances"
-msgstr "Itask NG - Istanze"
-
-#. FIXME
-#. if(ci->launcher)
-#. label = D_("Launcher NG");
-#. else if(ci->taskbar)
-#. label = D_("Taskbar NG");
-#.
-#: ../src/ng_config_instances.c:164
+#: src/ng_config_instances.c:164
 msgid "Bar"
 msgstr "Barra"
 
-#: ../src/ng_config_instances.c:338
+#: src/ng_config_instances.c:338
 #, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
@@ -311,6 +300,18 @@ msgstr ""
 "Avete richiesto di eliminare \"%s\".<br><br>Siete sicuri di voler eliminare "
 "questa istanza?"
 
-#: ../src/ng_config_instances.c:342
+#: src/ng_config_instances.c:342
 msgid "Are you sure you want to delete this Instance?"
 msgstr "Siete sicuri di voler eliminare questa istanza?"
+
+#~ msgid "Itask-NG"
+#~ msgstr "Itask-NG"
+
+#~ msgid "Itask NG"
+#~ msgstr "Itask NG"
+
+#~ msgid "Are you sure you want to delete this Itask NG source?"
+#~ msgstr "Siete sicuri di voler eliminare questa fonte per Itask NG?"
+
+#~ msgid "Itask NG - Instances"
+#~ msgstr "Itask NG - Istanze"
diff --git a/po/pt.po b/po/pt.po
index dda477f..54d49db 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Itask-ng\n"
-"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
-"POT-Creation-Date: 2011-03-18 23:00-0700\n"
+"Report-Msgid-Bugs-To: hannes.janetzek@gmail.com\n"
+"POT-Creation-Date: 2011-04-04 14:24+0200\n"
 "PO-Revision-Date: 2011-03-24 02:10-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Portuguese <>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,308 +21,303 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: ../src/e_mod_main.c:1695
-#: ../src/e_mod_main.c:1786
-msgid "Itask-NG"
-msgstr "Itask-NG"
+#: src/e_mod_main.c:1695 src/e_mod_main.c:1786 src/e_mod_main.c:1810
+msgid "Engage"
+msgstr ""
 
-#: ../src/e_mod_main.c:1810
-msgid "Itask NG"
-msgstr "Itask NG"
-
-#: ../src/ng_taskbar.c:701
+#: src/ng_taskbar.c:684
 msgid "No name!"
 msgstr "Sem nome!"
 
-#: ../src/ng_launcher.c:538
+#: src/ng_launcher.c:529
 msgid "Configure Bar"
 msgstr "Configurar barra"
 
-#: ../src/ng_launcher.c:542
+#: src/ng_launcher.c:533
 msgid "Lock Dragging"
 msgstr "Bloquear o arrastamento"
 
-#: ../src/ng_launcher.c:551
+#: src/ng_launcher.c:542
 msgid "Applications"
 msgstr "Aplicações"
 
-#: ../src/ng_launcher.c:555
+#: src/ng_launcher.c:546
 msgid "Edit Icon"
 msgstr "Editar ícone"
 
-#: ../src/ng_border_menu.c:30
+#: src/ng_border_menu.c:30
 msgid "Fullscreen"
 msgstr "Ecrã completo"
 
-#: ../src/ng_border_menu.c:45
+#: src/ng_border_menu.c:45
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/ng_border_menu.c:66
+#: src/ng_border_menu.c:66
 msgid "Maximized"
 msgstr "Maximizada"
 
-#: ../src/ng_border_menu.c:86
+#: src/ng_border_menu.c:86
 msgid "Uniconify"
 msgstr "Restaurar"
 
-#: ../src/ng_border_menu.c:88
+#: src/ng_border_menu.c:88
 msgid "Iconify"
 msgstr "Minimizar"
 
-#: ../src/ng_gadcon.c:299
+#: src/ng_gadcon.c:299
 msgid "Available Gadgets"
 msgstr "\"Gadgets\" disponíveis"
 
-#: ../src/ng_gadcon.c:306
+#: src/ng_gadcon.c:306
 msgid "Add Gadget"
 msgstr "Adicionar \"gadget\""
 
-#: ../src/ng_gadcon.c:312
+#: src/ng_gadcon.c:312
 msgid "Selected Gadgets"
 msgstr "\"Gadgets\" selecionados"
 
-#: ../src/ng_gadcon.c:319
+#: src/ng_gadcon.c:319
 msgid "Remove Gadget"
 msgstr "Remover \"gadget\""
 
-#: ../src/ng_gadcon.c:327
-#: ../src/ng_gadcon.c:370
-#: ../src/ng_gadcon.c:394
+#: src/ng_gadcon.c:327 src/ng_gadcon.c:370 src/ng_gadcon.c:394
 msgid "Description: Unavailable"
 msgstr "Descrição: indisponível"
 
-#: ../src/ng_config.c:101
-msgid "Itask NG Configuration"
+#: src/ng_config.c:101
+#, fuzzy
+msgid "Engage Configuration"
 msgstr "Configuração do Itask NG"
 
-#: ../src/ng_config.c:171
-#: ../src/ng_config.c:229
+#: src/ng_config.c:171 src/ng_config.c:229
 msgid "Appearance"
 msgstr "Aparência"
 
-#: ../src/ng_config.c:172
+#: src/ng_config.c:172
 msgid "Icon Size:"
 msgstr "Tamanho dos ícones:"
 
-#: ../src/ng_config.c:174
+#: src/ng_config.c:174
 #, c-format
 msgid "%1.0f px"
 msgstr "%1.0f px"
 
-#: ../src/ng_config.c:179
+#: src/ng_config.c:179
 msgid "Reflection Opacity:"
 msgstr "Opacidade do reflexo:"
 
-#: ../src/ng_config.c:181
+#: src/ng_config.c:181
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: ../src/ng_config.c:188
+#: src/ng_config.c:188
 msgid "Background Opacity:"
 msgstr "Opacidade do fundo:"
 
-#: ../src/ng_config.c:190
+#: src/ng_config.c:190
 msgid "%1.0f \\%"
 msgstr "%1.0f \\%"
 
-#: ../src/ng_config.c:198
+#: src/ng_config.c:198
 msgid "Show Background Box"
 msgstr "Mostrar caixa de fundo"
 
-#: ../src/ng_config.c:203
+#: src/ng_config.c:203
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../src/ng_config.c:205
+#: src/ng_config.c:205
 msgid "Bottom Edge"
 msgstr "Limite inferior"
 
-#: ../src/ng_config.c:207
+#: src/ng_config.c:207
 msgid "Top Edge"
 msgstr "Limite superior"
 
-#: ../src/ng_config.c:209
+#: src/ng_config.c:209
 msgid "Left Edge"
 msgstr "Limite esquerdo"
 
-#: ../src/ng_config.c:211
+#: src/ng_config.c:211
 msgid "Right Edge"
 msgstr "Limite direito"
 
-#: ../src/ng_config.c:232
-#: ../src/ng_config.c:251
+#: src/ng_config.c:232 src/ng_config.c:251
 msgid "Zoom"
 msgstr "Ampliação"
 
-#: ../src/ng_config.c:233
+#: src/ng_config.c:233
 msgid "Factor:"
 msgstr "Fator:"
 
-#: ../src/ng_config.c:239
+#: src/ng_config.c:239
 msgid "Range:"
 msgstr "Intervalo:"
 
-#: ../src/ng_config.c:245
+#: src/ng_config.c:245
 msgid "Duration:"
 msgstr "Duração:"
 
-#: ../src/ng_config.c:254
-#: ../src/ng_config.c:282
+#: src/ng_config.c:254 src/ng_config.c:282
 msgid "Bar Items"
 msgstr "Itens na barra"
 
-#: ../src/ng_config.c:262
-#: ../src/ng_config.c:538
-#: ../src/ng_config_instances.c:104
+#: src/ng_config.c:262 src/ng_config.c:539 src/ng_config_instances.c:104
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/ng_config.c:264
-#: ../src/ng_config.c:540
-#: ../src/ng_config_instances.c:106
+#: src/ng_config.c:264 src/ng_config.c:541 src/ng_config_instances.c:106
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../src/ng_config.c:266
+#: src/ng_config.c:266
 msgid "Up"
 msgstr "Cima"
 
-#: ../src/ng_config.c:268
+#: src/ng_config.c:268
 msgid "Down"
 msgstr "Baixo"
 
-#: ../src/ng_config.c:273
-#: ../src/ng_config.c:536
-#: ../src/ng_config_instances.c:102
+#: src/ng_config.c:273 src/ng_config.c:537 src/ng_config_instances.c:102
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/ng_config.c:275
+#: src/ng_config.c:275
 msgid "Taskbar"
 msgstr "Barra de tarefas"
 
-#: ../src/ng_config.c:277
+#: src/ng_config.c:277
 msgid "Launcher"
 msgstr "Lançador"
 
-#: ../src/ng_config.c:279
+#: src/ng_config.c:279
 msgid "Gadcon"
 msgstr "Gadcon"
 
-#: ../src/ng_config.c:285
-#: ../src/ng_config.c:301
+#: src/ng_config.c:285 src/ng_config.c:301
 msgid "Auto Hide"
 msgstr "Ocultar automaticamente"
 
-#: ../src/ng_config.c:299
+#: src/ng_config.c:299
 msgid "Show Bar when Urgent"
 msgstr "Mostrar a barra se for urgente"
 
-#: ../src/ng_config.c:307
+#: src/ng_config.c:307
 msgid "Stacking"
 msgstr "Empilhamento"
 
-#: ../src/ng_config.c:309
+#: src/ng_config.c:309
 msgid "Above All"
 msgstr "Acima de tudo"
 
-#: ../src/ng_config.c:311
+#: src/ng_config.c:311
 msgid "Below Fullscreen"
 msgstr "Por baixo de ecrã completo"
 
-#: ../src/ng_config.c:315
-#: ../src/ng_config.c:322
+#: src/ng_config.c:315 src/ng_config.c:322
 msgid "Other"
 msgstr "Outras"
 
-#: ../src/ng_config.c:316
+#: src/ng_config.c:316
 msgid "Ecomorph Features"
 msgstr "Funcionalidades Ecomorph"
 
-#: ../src/ng_config.c:318
+#: src/ng_config.c:318
 msgid "Show Icon Label"
 msgstr "Mostrar texto nos ícones"
 
-#: ../src/ng_config.c:528
+#: src/ng_config.c:529
 msgid "Launcher Settings"
 msgstr "Definições do lançador"
 
-#: ../src/ng_config.c:548
+#: src/ng_config.c:549
 msgid "Taskbar Settings"
 msgstr "Definições da barra de tarefas"
 
-#: ../src/ng_config.c:550
+#: src/ng_config.c:551
 msgid "Dont Show Dialogs"
 msgstr "Não mostrar diálogos"
 
-#: ../src/ng_config.c:553
+#: src/ng_config.c:554
 msgid "Advanced Window Menu"
 msgstr "Menu avançado"
 
-#: ../src/ng_config.c:556
+#: src/ng_config.c:557
 msgid "Only Show Current Desk"
 msgstr "Mostrar apenas na área de trabalho atual"
 
-#: ../src/ng_config.c:559
+#: src/ng_config.c:560
 msgid "Group Applications by Window Class"
 msgstr "Agrupar aplicações por classes de janela"
 
-#: ../src/ng_config.c:562
+#: src/ng_config.c:563
 msgid "Append new Applications on the right Side"
 msgstr "Colocar as novas aplicações no lado direito"
 
-#: ../src/ng_config.c:568
+#: src/ng_config.c:569
 msgid "Iconified Applications"
 msgstr "Aplicações miniminizadas"
 
-#: ../src/ng_config.c:643
-#: ../src/ng_config.c:683
-msgid "Itask NG Bar Configuration"
+#: src/ng_config.c:644 src/ng_config.c:684
+#, fuzzy
+msgid "Engage Bar Configuration"
 msgstr "Configuração da barra Itask NG"
 
-#: ../src/ng_config.c:788
-msgid "Create new Itask NG source"
+#: src/ng_config.c:789
+#, fuzzy
+msgid "Create new source"
 msgstr "Criar nova fonte Itask NG"
 
-#: ../src/ng_config.c:789
+#: src/ng_config.c:790
 msgid "Enter a name for this new Application Launcher:"
 msgstr "Indique o nome para este lançador de aplicações:"
 
-#: ../src/ng_config.c:798
-#, c-format
-msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this ng source?"
-msgstr "Solicitou a eliminação de \"%s\".<br><br>Tem a certeza que quer eliminar esta fonte?"
+#: src/ng_config.c:799
+#, fuzzy, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"source?"
+msgstr ""
+"Solicitou a eliminação de \"%s\".<br><br>Tem a certeza que quer eliminar "
+"esta fonte?"
 
-#: ../src/ng_config.c:802
-msgid "Are you sure you want to delete this Itask NG source?"
-msgstr "Tem a certeza que quer eliminar esta fonte Itask NG?"
+#: src/ng_config.c:803
+#, fuzzy
+msgid "Are you sure you want to delete this source?"
+msgstr "Tem a certeza que quer eliminar esta instância?"
 
-#: ../src/ng_config_instances.c:64
-msgid "Itask NG Instances"
+#: src/ng_config_instances.c:64 src/ng_config_instances.c:94
+#, fuzzy
+msgid "Engage Instances"
 msgstr "Instâncias Itask NG"
 
-#: ../src/ng_config_instances.c:94
-msgid "Itask NG - Instances"
-msgstr "Itask NG - Instâncias"
-
-#. FIXME
-#. if(ci->launcher)
-#. label = D_("Launcher NG");
-#. else if(ci->taskbar)
-#. label = D_("Taskbar NG");
-#.
-#: ../src/ng_config_instances.c:164
+#: src/ng_config_instances.c:164
 msgid "Bar"
 msgstr "Barra"
 
-#: ../src/ng_config_instances.c:338
+#: src/ng_config_instances.c:338
 #, c-format
-msgid "You requested to delete \"%s\".<br><br>Are you sure you want to delete this Instance?"
-msgstr "Solicitou a eliminação de \"%s\".<br><br>Tem a certeza que quer eliminar esta instância?"
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"Instance?"
+msgstr ""
+"Solicitou a eliminação de \"%s\".<br><br>Tem a certeza que quer eliminar "
+"esta instância?"
 
-#: ../src/ng_config_instances.c:342
+#: src/ng_config_instances.c:342
 msgid "Are you sure you want to delete this Instance?"
 msgstr "Tem a certeza que quer eliminar esta instância?"
 
+#~ msgid "Itask-NG"
+#~ msgstr "Itask-NG"
+
+#~ msgid "Itask NG"
+#~ msgstr "Itask NG"
+
+#~ msgid "Are you sure you want to delete this Itask NG source?"
+#~ msgstr "Tem a certeza que quer eliminar esta fonte Itask NG?"
+
+#~ msgid "Itask NG - Instances"
+#~ msgstr "Itask NG - Instâncias"
diff --git a/po/sl.po b/po/sl.po
index cfcad7b..18b57a2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,292 +7,293 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: itask_ng 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n"
-"POT-Creation-Date: 2011-02-22 20:00-0800\n"
+"Report-Msgid-Bugs-To: hannes.janetzek@gmail.com\n"
+"POT-Creation-Date: 2011-04-04 14:24+0200\n"
 "PO-Revision-Date: 2011-02-24 16:58+0100\n"
 "Last-Translator: r1to <renato.rener@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/e_mod_main.c:1641 ../src/e_mod_main.c:1732
-msgid "Itask-NG"
-msgstr "Itask-NG"
+#: src/e_mod_main.c:1695 src/e_mod_main.c:1786 src/e_mod_main.c:1810
+msgid "Engage"
+msgstr ""
 
-#: ../src/e_mod_main.c:1756
-msgid "Itask NG"
-msgstr "Itask·NG"
-
-#: ../src/ng_taskbar.c:702
+#: src/ng_taskbar.c:684
 msgid "No name!"
 msgstr "Ni imena !"
 
-#: ../src/ng_launcher.c:508
+#: src/ng_launcher.c:529
 msgid "Configure Bar"
 msgstr "Nastavi vrstico"
 
-#: ../src/ng_launcher.c:512
+#: src/ng_launcher.c:533
 msgid "Lock Dragging"
 msgstr "Zakleni vleko"
 
-#: ../src/ng_launcher.c:521
+#: src/ng_launcher.c:542
 msgid "Applications"
 msgstr "Programi"
 
-#: ../src/ng_launcher.c:525
+#: src/ng_launcher.c:546
 msgid "Edit Icon"
 msgstr "Uredi ikono"
 
-#: ../src/ng_border_menu.c:30
+#: src/ng_border_menu.c:30
 msgid "Fullscreen"
 msgstr "Celozaslonsko"
 
-#: ../src/ng_border_menu.c:45
+#: src/ng_border_menu.c:45
 msgid "Close"
 msgstr "Zapri"
 
-#: ../src/ng_border_menu.c:66
+#: src/ng_border_menu.c:66
 msgid "Maximized"
 msgstr "Razpeto"
 
-#: ../src/ng_border_menu.c:86
+#: src/ng_border_menu.c:86
 msgid "Uniconify"
 msgstr "Deikoniziraj"
 
-#: ../src/ng_border_menu.c:88
+#: src/ng_border_menu.c:88
 msgid "Iconify"
 msgstr "Ikoniziraj"
 
-#: ../src/ng_gadcon.c:299
+#: src/ng_gadcon.c:299
 msgid "Available Gadgets"
 msgstr "Dostopni gadgeti"
 
-#: ../src/ng_gadcon.c:306
+#: src/ng_gadcon.c:306
 msgid "Add Gadget"
 msgstr "Dodaj gadget"
 
-#: ../src/ng_gadcon.c:312
+#: src/ng_gadcon.c:312
 msgid "Selected Gadgets"
 msgstr "Izbrani gadgeti"
 
-#: ../src/ng_gadcon.c:319
+#: src/ng_gadcon.c:319
 msgid "Remove Gadget"
 msgstr "Odstrani gadget"
 
-#: ../src/ng_gadcon.c:327 ../src/ng_gadcon.c:370 ../src/ng_gadcon.c:394
+#: src/ng_gadcon.c:327 src/ng_gadcon.c:370 src/ng_gadcon.c:394
 msgid "Description: Unavailable"
 msgstr "Opis: Nedostopno"
 
-#: ../src/ng_config.c:101
-msgid "Itask NG Configuration"
+#: src/ng_config.c:101
+#, fuzzy
+msgid "Engage Configuration"
 msgstr "Itask·NG·nastavitve"
 
-#: ../src/ng_config.c:174
-msgid "Bar Items"
-msgstr "Predmeti vrstice"
-
-#: ../src/ng_config.c:183 ../src/ng_config.c:537
-#: ../src/ng_config_instances.c:104
-msgid "Delete"
-msgstr "Izbriši"
-
-#: ../src/ng_config.c:185 ../src/ng_config.c:539
-#: ../src/ng_config_instances.c:106
-msgid "Configure"
-msgstr "Nastavi"
-
-#: ../src/ng_config.c:187
-msgid "Up"
-msgstr "Gor"
-
-#: ../src/ng_config.c:189
-msgid "Down"
-msgstr "Dol"
-
-#: ../src/ng_config.c:194 ../src/ng_config.c:535
-#: ../src/ng_config_instances.c:102
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../src/ng_config.c:196
-msgid "Taskbar"
-msgstr "Opravilna vrstica"
-
-#: ../src/ng_config.c:198
-msgid "Launcher"
-msgstr "Zaganjalnik"
-
-#: ../src/ng_config.c:200
-msgid "Gadcon"
-msgstr "Gadcon"
-
-#: ../src/ng_config.c:211
+#: src/ng_config.c:171 src/ng_config.c:229
 msgid "Appearance"
 msgstr "Videz"
 
-#: ../src/ng_config.c:212
-msgid "Show Icon Label"
-msgstr "Prikaži oznako ikone"
-
-#: ../src/ng_config.c:215
-msgid "Show Background Box"
-msgstr "Prikaži škatlo ozadja"
-
-#.
-#. ob = e_widget_check_add(evas, D_("Mouse-Over Animation"), &(cfdata->mouse_over_anim));
-#. e_widget_framelist_object_append(of, ob);
-#.
-#: ../src/ng_config.c:221
+#: src/ng_config.c:172
 msgid "Icon Size:"
 msgstr "Velikost ikone"
 
-#: ../src/ng_config.c:223
+#: src/ng_config.c:174
 #, c-format
 msgid "%1.0f px"
 msgstr "%1.0f·pik."
 
-#: ../src/ng_config.c:228
+#: src/ng_config.c:179
 msgid "Reflection Opacity:"
 msgstr "Prozornost zrcaljenja"
 
-#: ../src/ng_config.c:230
+#: src/ng_config.c:181
 #, c-format
 msgid "%1.0f"
 msgstr "%1.0f"
 
-#: ../src/ng_config.c:237
+#: src/ng_config.c:188
 msgid "Background Opacity:"
 msgstr "Prozornost ozadja"
 
-#: ../src/ng_config.c:239
+#: src/ng_config.c:190
 msgid "%1.0f \\%"
 msgstr "%1.0f·\\%"
 
-#: ../src/ng_config.c:247
-msgid "Stacking"
-msgstr "Skladanje"
+#: src/ng_config.c:198
+msgid "Show Background Box"
+msgstr "Prikaži škatlo ozadja"
 
-#: ../src/ng_config.c:250
-msgid "Above All"
-msgstr "Nad vsem"
-
-#: ../src/ng_config.c:252
-msgid "Below Fullscreen"
-msgstr "Pod celozaslonskim"
-
-#: ../src/ng_config.c:257
-msgid "Auto Hide"
-msgstr "Samodejno skrij"
-
-#: ../src/ng_config.c:271
-msgid "Show Bar when Urgent"
-msgstr "Pokaži vrstico ko je nujno"
-
-#: ../src/ng_config.c:279
-msgid "Zoom"
-msgstr "Povečava"
-
-#: ../src/ng_config.c:281
-msgid "Factor:"
-msgstr "Dejavnik:"
-
-#: ../src/ng_config.c:287
-msgid "Range:"
-msgstr "Domet:"
-
-#: ../src/ng_config.c:293
-msgid "Duration:"
-msgstr "Trajanje:"
-
-#: ../src/ng_config.c:301
+#: src/ng_config.c:203
 msgid "Orientation"
 msgstr "Usmeritev"
 
-#: ../src/ng_config.c:317
+#: src/ng_config.c:205
+msgid "Bottom Edge"
+msgstr ""
+
+#: src/ng_config.c:207
+msgid "Top Edge"
+msgstr ""
+
+#: src/ng_config.c:209
+msgid "Left Edge"
+msgstr ""
+
+#: src/ng_config.c:211
+msgid "Right Edge"
+msgstr ""
+
+#: src/ng_config.c:232 src/ng_config.c:251
+msgid "Zoom"
+msgstr "Povečava"
+
+#: src/ng_config.c:233
+msgid "Factor:"
+msgstr "Dejavnik:"
+
+#: src/ng_config.c:239
+msgid "Range:"
+msgstr "Domet:"
+
+#: src/ng_config.c:245
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#: src/ng_config.c:254 src/ng_config.c:282
+msgid "Bar Items"
+msgstr "Predmeti vrstice"
+
+#: src/ng_config.c:262 src/ng_config.c:539 src/ng_config_instances.c:104
+msgid "Delete"
+msgstr "Izbriši"
+
+#: src/ng_config.c:264 src/ng_config.c:541 src/ng_config_instances.c:106
+msgid "Configure"
+msgstr "Nastavi"
+
+#: src/ng_config.c:266
+msgid "Up"
+msgstr "Gor"
+
+#: src/ng_config.c:268
+msgid "Down"
+msgstr "Dol"
+
+#: src/ng_config.c:273 src/ng_config.c:537 src/ng_config_instances.c:102
+msgid "Add"
+msgstr "Dodaj"
+
+#: src/ng_config.c:275
+msgid "Taskbar"
+msgstr "Opravilna vrstica"
+
+#: src/ng_config.c:277
+msgid "Launcher"
+msgstr "Zaganjalnik"
+
+#: src/ng_config.c:279
+msgid "Gadcon"
+msgstr "Gadcon"
+
+#: src/ng_config.c:285 src/ng_config.c:301
+msgid "Auto Hide"
+msgstr "Samodejno skrij"
+
+#: src/ng_config.c:299
+msgid "Show Bar when Urgent"
+msgstr "Pokaži vrstico ko je nujno"
+
+#: src/ng_config.c:307
+msgid "Stacking"
+msgstr "Skladanje"
+
+#: src/ng_config.c:309
+msgid "Above All"
+msgstr "Nad vsem"
+
+#: src/ng_config.c:311
+msgid "Below Fullscreen"
+msgstr "Pod celozaslonskim"
+
+#: src/ng_config.c:315 src/ng_config.c:322
 msgid "Other"
 msgstr "Drugo"
 
-#: ../src/ng_config.c:318
+#: src/ng_config.c:316
 msgid "Ecomorph Features"
 msgstr "Ecomorph funkcije"
 
-#: ../src/ng_config.c:527
+#: src/ng_config.c:318
+msgid "Show Icon Label"
+msgstr "Prikaži oznako ikone"
+
+#: src/ng_config.c:529
 msgid "Launcher Settings"
 msgstr "Nastavitve zaganjalnika"
 
-#: ../src/ng_config.c:547
+#: src/ng_config.c:549
 msgid "Taskbar Settings"
 msgstr "Nastavitve opravilne vrstice"
 
-#: ../src/ng_config.c:549
+#: src/ng_config.c:551
 msgid "Dont Show Dialogs"
 msgstr "Ne prikaži pojavnih oken"
 
-#: ../src/ng_config.c:552
+#: src/ng_config.c:554
 msgid "Advanced Window Menu"
 msgstr "Napreden meni oken"
 
-#: ../src/ng_config.c:555
+#: src/ng_config.c:557
 msgid "Only Show Current Desk"
 msgstr "Prikaži le trenutno namizje"
 
-#: ../src/ng_config.c:558
+#: src/ng_config.c:560
 msgid "Group Applications by Window Class"
 msgstr "Uskupini programe po razredih okna"
 
-#: ../src/ng_config.c:561
+#: src/ng_config.c:563
 msgid "Append new Applications on the right Side"
 msgstr "Dodaj nove programe na desni strani"
 
-#: ../src/ng_config.c:567
+#: src/ng_config.c:569
 msgid "Iconified Applications"
 msgstr "Ikonizirani programi"
 
-#: ../src/ng_config.c:642 ../src/ng_config.c:682
-msgid "Itask NG Bar Configuration"
+#: src/ng_config.c:644 src/ng_config.c:684
+#, fuzzy
+msgid "Engage Bar Configuration"
 msgstr "Nastavitve Itask·NG vrstice"
 
-#: ../src/ng_config.c:787
-msgid "Create new Itask NG source"
+#: src/ng_config.c:789
+#, fuzzy
+msgid "Create new source"
 msgstr "Ustvari nov vir·Itask·NG"
 
-#: ../src/ng_config.c:788
+#: src/ng_config.c:790
 msgid "Enter a name for this new Application Launcher:"
 msgstr "Vnesi ime za ta novi zaganjalnik programov"
 
-#: ../src/ng_config.c:797
-#, c-format
+#: src/ng_config.c:799
+#, fuzzy, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
-"ng source?"
+"source?"
 msgstr ""
 "Zahtevali ste izbris·\"%s\".<br><br>Ali ste prepričani da hočete izbrisati "
 "ta vir·ng ?"
 
-#: ../src/ng_config.c:801
-msgid "Are you sure you want to delete this Itask NG source?"
-msgstr "Ali ste prepričani da hočete izbrisati ta vir·Itask·NG?"
+#: src/ng_config.c:803
+#, fuzzy
+msgid "Are you sure you want to delete this source?"
+msgstr "Ali ste prepričani da hočete izbrisati ta primerek?"
 
-#: ../src/ng_config_instances.c:64
-msgid "Itask NG Instances"
+#: src/ng_config_instances.c:64 src/ng_config_instances.c:94
+#, fuzzy
+msgid "Engage Instances"
 msgstr "Primerki Itask·NG"
 
-#: ../src/ng_config_instances.c:94
-msgid "Itask NG - Instances"
-msgstr "Itask·NG·-·Primerki"
-
-#. FIXME
-#. if(ci->launcher)
-#. label = D_("Launcher NG");
-#. else if(ci->taskbar)
-#. label = D_("Taskbar NG");
-#.
-#: ../src/ng_config_instances.c:164
+#: src/ng_config_instances.c:164
 msgid "Bar"
 msgstr "Vrstica"
 
-#: ../src/ng_config_instances.c:338
+#: src/ng_config_instances.c:338
 #, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
@@ -301,6 +302,18 @@ msgstr ""
 "Zahtevali ste izbris·\"%s\".<br><br>Ali ste prepričani da hočete izbrisati "
 "ta primerek?"
 
-#: ../src/ng_config_instances.c:342
+#: src/ng_config_instances.c:342
 msgid "Are you sure you want to delete this Instance?"
 msgstr "Ali ste prepričani da hočete izbrisati ta primerek?"
+
+#~ msgid "Itask-NG"
+#~ msgstr "Itask-NG"
+
+#~ msgid "Itask NG"
+#~ msgstr "Itask·NG"
+
+#~ msgid "Are you sure you want to delete this Itask NG source?"
+#~ msgstr "Ali ste prepričani da hočete izbrisati ta vir·Itask·NG?"
+
+#~ msgid "Itask NG - Instances"
+#~ msgstr "Itask·NG·-·Primerki"
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 637c5b2..8e5b37a 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -129,9 +129,9 @@ ngi_new(Config_Item *cfg)
    switch(cfg->orient)
      {
       case E_GADCON_ORIENT_BOTTOM:
-	 ngi_object_theme_set(ng->o_bg,	  "e/modules/itask-ng/bg_bottom");
-	 ngi_object_theme_set(ng->o_frame,"e/modules/itask-ng/frame_bottom");
-	 ngi_object_theme_set(ng->o_label,"e/modules/itask-ng/label_bottom");
+	 ngi_object_theme_set(ng->o_bg,	  "e/modules/engage/bg_bottom");
+	 ngi_object_theme_set(ng->o_frame,"e/modules/engage/frame_bottom");
+	 ngi_object_theme_set(ng->o_label,"e/modules/engage/label_bottom");
 
 	 ng->o_proxy = evas_object_image_add(ng->evas);
 	 evas_object_image_source_set(ng->o_proxy, ng->o_icons);
@@ -144,21 +144,21 @@ ngi_new(Config_Item *cfg)
 	 break;
 
       case E_GADCON_ORIENT_TOP:
-	 ngi_object_theme_set(ng->o_bg,	  "e/modules/itask-ng/bg_top");
-	 ngi_object_theme_set(ng->o_frame,"e/modules/itask-ng/frame_top");
-	 ngi_object_theme_set(ng->o_label,"e/modules/itask-ng/label_top");
+	 ngi_object_theme_set(ng->o_bg,	  "e/modules/engage/bg_top");
+	 ngi_object_theme_set(ng->o_frame,"e/modules/engage/frame_top");
+	 ngi_object_theme_set(ng->o_label,"e/modules/engage/label_top");
          break;
 
       case E_GADCON_ORIENT_LEFT:
-	 ngi_object_theme_set(ng->o_bg,	  "e/modules/itask-ng/bg_left");
-	 ngi_object_theme_set(ng->o_frame,"e/modules/itask-ng/frame_left");
-	 ngi_object_theme_set(ng->o_label,"e/modules/itask-ng/label_left");
+	 ngi_object_theme_set(ng->o_bg,	  "e/modules/engage/bg_left");
+	 ngi_object_theme_set(ng->o_frame,"e/modules/engage/frame_left");
+	 ngi_object_theme_set(ng->o_label,"e/modules/engage/label_left");
          break;
 
       case E_GADCON_ORIENT_RIGHT:
-	 ngi_object_theme_set(ng->o_bg,	  "e/modules/itask-ng/bg_right");
-	 ngi_object_theme_set(ng->o_frame,"e/modules/itask-ng/frame_right");
-	 ngi_object_theme_set(ng->o_label,"e/modules/itask-ng/label_right");
+	 ngi_object_theme_set(ng->o_bg,	  "e/modules/engage/bg_right");
+	 ngi_object_theme_set(ng->o_frame,"e/modules/engage/frame_right");
+	 ngi_object_theme_set(ng->o_label,"e/modules/engage/label_right");
          break;
      }
 
@@ -333,7 +333,7 @@ ngi_free(Ng *ng)
 Eina_Bool
 ngi_object_theme_set(Evas_Object *obj, const char *part)
 {
-   if (e_theme_edje_object_set(obj, "base/theme/modules/itask-ng", part))
+   if (e_theme_edje_object_set(obj, "base/theme/modules/engage", part))
      return 1;
    else
      return edje_object_file_set(obj, ngi_config->theme_path, part);
@@ -1662,7 +1662,7 @@ _ngi_win_cb_border_event(void *data, int type, void *event)
 
 /***************************************************************************/
 
-EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "itask-ng" };
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "engage" };
 
 static int
 _ngi_init_timer_cb(void *data)
@@ -1692,7 +1692,7 @@ _e_mod_menu_add(void *data, E_Menu *m)
    E_Menu_Item *mi;
 
    mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, D_("Itask-NG"));
+   e_menu_item_label_set(mi, D_("Engage"));
    e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
    e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
 }
@@ -1780,10 +1780,10 @@ e_modapi_init(E_Module *m)
    E_CONFIG_VAL(ngi_conf_edd, Config, version, INT);
    E_CONFIG_LIST(ngi_conf_edd, Config, items, ngi_conf_item_edd);
 
-   ngi_config = (Config *)e_config_domain_load("module.itask-ng", ngi_conf_edd);
+   ngi_config = (Config *)e_config_domain_load("module.engage", ngi_conf_edd);
 
    if (ngi_config && !e_util_module_config_check
-       (D_("Itask-NG"), ngi_config->version,
+       (D_("Engage"), ngi_config->version,
 	MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
      _ngi_config_free();
 
@@ -1796,7 +1796,7 @@ e_modapi_init(E_Module *m)
    ngi_config->cfd = NULL;
    ngi_config->module = m;
 
-   snprintf(buf, sizeof(buf), "%s/itask-ng.edj", e_module_dir_get(m));
+   snprintf(buf, sizeof(buf), "%s/engage.edj", e_module_dir_get(m));
    ngi_config->theme_path = strdup(buf);
 
    snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/", e_user_homedir_get());
@@ -1806,8 +1806,8 @@ e_modapi_init(E_Module *m)
         return m;
      }
 
-   e_configure_registry_item_add("extensions/itask_ng", 40,
-                                 D_("Itask NG"), NULL,
+   e_configure_registry_item_add("extensions/engage", 40,
+                                 D_("Engage"), NULL,
                                  "preferences-desktop-shelf",
                                  ngi_instances_config);
 
@@ -1865,7 +1865,7 @@ e_modapi_shutdown(E_Module *m)
    E_CONFIG_DD_FREE(ngi_conf_item_edd);
    E_CONFIG_DD_FREE(ngi_conf_edd);
 
-   e_configure_registry_item_del("extensions/itask_ng");
+   e_configure_registry_item_del("extensions/engage");
 
    return 1;
 }
@@ -1873,6 +1873,6 @@ e_modapi_shutdown(E_Module *m)
 EAPI int
 e_modapi_save(E_Module *m)
 {
-   e_config_domain_save("module.itask-ng", ngi_conf_edd, ngi_config);
+   e_config_domain_save("module.engage", ngi_conf_edd, ngi_config);
    return 1;
 }
diff --git a/src/ng_box.c b/src/ng_box.c
index 5df1ef6..da06c22 100644
--- a/src/ng_box.c
+++ b/src/ng_box.c
@@ -19,16 +19,16 @@ ngi_box_new(Ng *ng)
    switch(box->ng->cfg->orient)
      {
       case E_GADCON_ORIENT_BOTTOM:
-	 ngi_object_theme_set(box->separator, "e/modules/itask-ng/separator_bottom");
+	 ngi_object_theme_set(box->separator, "e/modules/engage/separator_bottom");
 	 break;
       case E_GADCON_ORIENT_TOP:
-	 ngi_object_theme_set(box->separator, "e/modules/itask-ng/separator_top");
+	 ngi_object_theme_set(box->separator, "e/modules/engage/separator_top");
          break;
       case E_GADCON_ORIENT_LEFT:
-	 ngi_object_theme_set(box->separator, "e/modules/itask-ng/separator_left");
+	 ngi_object_theme_set(box->separator, "e/modules/engage/separator_left");
          break;
       case E_GADCON_ORIENT_RIGHT:
-	 ngi_object_theme_set(box->separator, "e/modules/itask-ng/separator_right");
+	 ngi_object_theme_set(box->separator, "e/modules/engage/separator_right");
          break;
      }
 
diff --git a/src/ng_config.c b/src/ng_config.c
index 66abb48..00dd7da 100644
--- a/src/ng_config.c
+++ b/src/ng_config.c
@@ -81,7 +81,7 @@ ngi_configure_module(Config_Item *ci)
    else
       i++;
 
-   snprintf(path, sizeof(path), "extensions/itask_ng::%d", i);
+   snprintf(path, sizeof(path), "extensions/engage::%d", i);
    if (e_config_dialog_find("E", path))
       return;
 
@@ -98,7 +98,7 @@ ngi_configure_module(Config_Item *ci)
    /* Create The Dialog */
    snprintf(buf, sizeof(buf), "%s/e-module-ng.edj", e_module_dir_get(ngi_config->module));
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
-                             D_("Itask NG Configuration"),
+                             D_("Engage Configuration"),
                              "E", path, buf, 0, v, ci);
 
    ci->config_dialog = cfd;
@@ -641,7 +641,7 @@ _cb_box_config(void *data, void *data2)
 
         snprintf(buf, sizeof(buf), "%s/e-module-ng.edj", e_module_dir_get(ngi_config->module));
         cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
-                                  D_("Itask NG Bar Configuration"),
+                                  D_("Engage Bar Configuration"),
                                   "e", "_e_mod_ngi_config_dialog_add_box", buf, 0, v, cfdata);
      }
 }
@@ -681,7 +681,7 @@ ngi_configure_box(Ngi_Box *box)
 
    snprintf(buf, sizeof(buf), "%s/e-module-ng.edj", e_module_dir_get(ngi_config->module));
    cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
-                             D_("Itask NG Bar Configuration"),
+                             D_("Engage Bar Configuration"),
                              "e", "_e_mod_ngi_config_dialog_add_box", buf, 0, v, box);
 }
 
@@ -786,7 +786,7 @@ static void
 _cb_add(void *data, void *data2)
 {
    E_Config_Dialog_Data *cfdata = (E_Config_Dialog_Data *)data;
-   e_entry_dialog_show(D_("Create new Itask NG source"), "enlightenment/e",
+   e_entry_dialog_show(D_("Create new source"), "enlightenment/e",
                        D_("Enter a name for this new Application Launcher:"), "", NULL, NULL,
                        _cb_entry_ok, NULL, cfdata);
 }
@@ -797,10 +797,10 @@ _cb_del(void *data, void *data2)
    char buf[4096];
    E_Config_Dialog_Data *cfdata = (E_Config_Dialog_Data *)data;
    snprintf(buf, sizeof(buf), D_("You requested to delete \"%s\".<br><br>"
-                                 "Are you sure you want to delete this ng source?"),
+                                 "Are you sure you want to delete this source?"),
             cfdata->app_dir);
 
-   e_confirm_dialog_show(D_("Are you sure you want to delete this Itask NG source?"),
+   e_confirm_dialog_show(D_("Are you sure you want to delete this source?"),
                          "enlightenment/exit", buf, NULL, NULL,
                          _cb_confirm_dialog_yes, NULL, cfdata, NULL, NULL, NULL);
 }
diff --git a/src/ng_config_instances.c b/src/ng_config_instances.c
index ee32c2b..f3ded12 100644
--- a/src/ng_config_instances.c
+++ b/src/ng_config_instances.c
@@ -49,7 +49,7 @@ ngi_instances_config(E_Container *con, const char *params)
    if(ngi_config->cfd)
       return NULL;
 
-   if (e_config_dialog_find("E", "extensions/itask_ng"))
+   if (e_config_dialog_find("E", "extensions/engage"))
       return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
@@ -61,8 +61,8 @@ ngi_instances_config(E_Container *con, const char *params)
    v->basic.create_widgets = _basic_create_widgets;
 
    cfd = e_config_dialog_new(con,
-                             D_("Itask NG Instances"),
-                             "E", "extensions/itask_ng",
+                             D_("Engage Instances"),
+                             "E", "extensions/engage",
                              "enlightenment/module/ng-instances", 0, v, NULL);
    ngi_config->cfd = cfd;
    return cfd;
@@ -91,7 +91,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
    o = e_widget_list_add(evas, 0, 1);
 
-   of = e_widget_framelist_add(evas, D_("Itask NG - Instances"), 0);
+   of = e_widget_framelist_add(evas, D_("Engage Instances"), 0);
    cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->cur_ng));
    e_widget_ilist_selector_set(cfdata->o_list, 1);
    e_widget_size_min_set(cfdata->o_list, 200, 250);
diff --git a/src/ng_item.c b/src/ng_item.c
index 758e867..52acfde 100644
--- a/src/ng_item.c
+++ b/src/ng_item.c
@@ -12,24 +12,24 @@ ngi_item_init_defaults(Ngi_Item *it)
    switch(ng->cfg->orient)
      {
       case E_GADCON_ORIENT_BOTTOM:
-	 ok = ngi_object_theme_set(it->obj, "e/modules/itask-ng/icon_bottom");
+	 ok = ngi_object_theme_set(it->obj, "e/modules/engage/icon_bottom");
    	 break;
       case E_GADCON_ORIENT_TOP:
-	 ok = ngi_object_theme_set(it->obj, "e/modules/itask-ng/icon_top");
+	 ok = ngi_object_theme_set(it->obj, "e/modules/engage/icon_top");
    	 break;
       case E_GADCON_ORIENT_LEFT:
-	 ok = ngi_object_theme_set(it->obj, "e/modules/itask-ng/icon_left");
+	 ok = ngi_object_theme_set(it->obj, "e/modules/engage/icon_left");
    	 break;
       case E_GADCON_ORIENT_RIGHT:
-	 ok = ngi_object_theme_set(it->obj, "e/modules/itask-ng/icon_right");
+	 ok = ngi_object_theme_set(it->obj, "e/modules/engage/icon_right");
    	 break;
      }
 
    /* TODO remove fallback */
    if (!ok)
      {
-   	if (!e_theme_edje_object_set(it->obj, "base/theme/modules/itask-ng", "e/modules/itask-ng/icon"))
-   	  edje_object_file_set(it->obj, ngi_config->theme_path, "e/modules/itask-ng/icon");
+   	if (!e_theme_edje_object_set(it->obj, "base/theme/modules/engage", "e/modules/engage/icon"))
+   	  edje_object_file_set(it->obj, ngi_config->theme_path, "e/modules/engage/icon");
      }
 
    it->over = edje_object_add(ng->evas);
@@ -37,22 +37,22 @@ ngi_item_init_defaults(Ngi_Item *it)
    switch(ng->cfg->orient)
      {
       case E_GADCON_ORIENT_BOTTOM:
-	 ok = ngi_object_theme_set(it->over, "e/modules/itask-ng/icon_over_bottom");
+	 ok = ngi_object_theme_set(it->over, "e/modules/engage/icon_over_bottom");
    	 break;
       case E_GADCON_ORIENT_TOP:
-	 ok = ngi_object_theme_set(it->over, "e/modules/itask-ng/icon_over_top");
+	 ok = ngi_object_theme_set(it->over, "e/modules/engage/icon_over_top");
    	 break;
       case E_GADCON_ORIENT_LEFT:
-	 ok = ngi_object_theme_set(it->over, "e/modules/itask-ng/icon_over_left");
+	 ok = ngi_object_theme_set(it->over, "e/modules/engage/icon_over_left");
    	 break;
       case E_GADCON_ORIENT_RIGHT:
-	 ok = ngi_object_theme_set(it->over, "e/modules/itask-ng/icon_over_right");
+	 ok = ngi_object_theme_set(it->over, "e/modules/engage/icon_over_right");
    	 break;
      }
    if (!ok)
      {
-	if (!e_theme_edje_object_set(it->over, "base/theme/modules/itask-ng", "e/modules/itask-ng/icon_overlay"))
-	  edje_object_file_set(it->over, ngi_config->theme_path, "e/modules/itask-ng/icon_overlay");
+	if (!e_theme_edje_object_set(it->over, "base/theme/modules/engage", "e/modules/engage/icon_overlay"))
+	  edje_object_file_set(it->over, ngi_config->theme_path, "e/modules/engage/icon_overlay");
      }