12 files changed, 48 insertions, 44 deletions
diff --git a/apps/1Pim/addressbook.desktop b/apps/1Pim/addressbook.desktop
index b11cdd4..93fd761 100644
--- a/apps/1Pim/addressbook.desktop
+++ b/apps/1Pim/addressbook.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Comment=An Address Book Program
 Comment[fr]=Un répertoire
 Comment[es]=Una libreta de direcciones
 Comment[da]=Adressebog med kontaktpersoner, adresser, telefonnumre m.m.
 Exec=addressbook
-Icon=AddressBook
+Icon=addressbook/AddressBook
 Type=Application
 Name=Contacts
 MimeType=text/x-vCard
 Name[pt_BR]=Contactos
 Name[no]=Adressebok
 Name[de]=Adressbuch
 Name[hu]=Címtár
 Name[it]=Rubrica
diff --git a/apps/1Pim/datebook.desktop b/apps/1Pim/datebook.desktop
index cefd163..991dc01 100644
--- a/apps/1Pim/datebook.desktop
+++ b/apps/1Pim/datebook.desktop
@@ -1,21 +1,23 @@
 [Desktop Entry]
-Comment=A Calendar and Scheduling Program
-Comment[es]=Un calendario y planificador
-Comment[da]=Et kalender og planlægnings program
-Comment[de]=Ein Terminkalender
-comment[fr]=Un calendrier et planificateur de tâches
-Exec=datebook
-Icon=DateBook
-Type=Application
-Name=Calendar
-Name[pt_BR]=Calendário
-Name[no]=Avtalebok
-Name[de]=Termine
-Name[hu]=Naptár
-Name[it]=Agenda
-Name[pt]=Calendário
-Name[es]=Calendario
-Name[zh_TW]=行事歷
-Name[ko]=일정관리
-Name[da]=Kalender
-Name[fr]=Agenda
+Categories = 
+Comment = A Calendar and Scheduling Program
+Comment[da] = Et kalender og planlægnings program
+Comment[de] = Ein Terminkalender
+Comment[es] = Un calendario y planificador
+Exec = datebook
+File = 
+Icon = datebook/DateBook
+Name = Calendar
+Name[da] = Kalender
+Name[de] = Termine
+Name[es] = Calendario
+Name[fr] = Agenda
+Name[hu] = Naptár
+Name[it] = Agenda
+Name[ko] = 일정관리
+Name[no] = Avtalebok
+Name[pt] = Calendário
+Name[pt_BR] = Calendário
+Name[zh_TW] = 行事歷
+Type = 1Pim
+comment[fr] = Un calendrier et planificateur de tâches
diff --git a/apps/1Pim/textedit.desktop b/apps/1Pim/textedit.desktop
index 721e330..0b88eee 100644
--- a/apps/1Pim/textedit.desktop
+++ b/apps/1Pim/textedit.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Comment=A Text Editing Program
 Comment[es]=Un editor de textos
 Comment[da]=Et tekst redigerings program
 Comment[fr]=Un éditeur de texte
 Exec=textedit
-Icon=TextEditor
+Icon=textedit/TextEditor
 Type=Application
 MimeType=text/plain
 Name=Text Editor
 Name[pt_BR]=Editor de Textos
 Name[no]=Teksteditor
 Name[de]=Texteditor
 Name[it]=Blocco Note
 Name[ja]=テキストエディタ
diff --git a/apps/1Pim/todo.desktop b/apps/1Pim/todo.desktop
index 0d990f5..8471395 100644
--- a/apps/1Pim/todo.desktop
+++ b/apps/1Pim/todo.desktop
@@ -1,21 +1,23 @@
 [Desktop Entry]
-Comment=A Todo List Program
-Comment[es]=Un programa de lista de tareas
-Comment[de]=Ein Programm zur Verwaltung von Aufgaben
-Comment[da]=Et program til styring af opgaver
-Comment[fr]=Un programme de liste de tâches
-Exec=todolist
-Icon=TodoList
-Type=Application
-Name=Todo List
-Name[pt_BR]=Afazeres
-Name[no]=Oppgaveliste
-Name[de]=Aufgaben
-Name[hu]=Feladatok
-Name[it]=Impegni
-Name[pt]=Tarefas
-Name[es]=Tareas
-Name[zh_TW]=待辦事項
-Name[ko]=할일 목록
-Name[da]=Opgaveliste
-Name[fr]=Tâches
+Categories = 
+Comment = A Todo List Program
+Comment[da] = Et program til styring af opgaver
+Comment[de] = Ein Programm zur Verwaltung von Aufgaben
+Comment[es] = Un programa de lista de tareas
+Comment[fr] = Un programme de liste de tâches
+Exec = todolist
+File = 
+Icon = todo/TodoList
+Name = Todo List
+Name[da] = Opgaveliste
+Name[de] = Aufgaben
+Name[es] = Tareas
+Name[fr] = Tâches
+Name[hu] = Feladatok
+Name[it] = Impegni
+Name[ko] = 할일 목록
+Name[no] = Oppgaveliste
+Name[pt] = Tarefas
+Name[pt_BR] = Afazeres
+Name[zh_TW] = 待辦事項
+Type = 1Pim
diff --git a/apps/Applications/embeddedkonsole.desktop b/apps/Applications/embeddedkonsole.desktop
index e78e884..ccc7f5e 100644
--- a/apps/Applications/embeddedkonsole.desktop
+++ b/apps/Applications/embeddedkonsole.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Comment=A Terminal Window
 Comment[es]=Una ventana de terminal
 Comment[da]=Et terminalvindue
 Exec=embeddedkonsole
-Icon=Terminal
+Icon=konsole/Terminal
 Type=Application
 Name=Konsole
 Name[de]=Kommando zeile
 Name[hu]=Terminál
 Name[it]=Terminale
 Name[pt]=Terminal
 Name[es]=Terminal
 Name[zh_TW]=終端機
diff --git a/apps/Applications/sysinfo.desktop b/apps/Applications/sysinfo.desktop
index 745a5d5..4ac4174 100644
--- a/apps/Applications/sysinfo.desktop
+++ b/apps/Applications/sysinfo.desktop
@@ -2,15 +2,15 @@
 Name=System Info
 Name[pt_BR]=Informações do Sistema
 Name[no]=Systeminfo
 Name[de]=Systeminfos
 Exec=sysinfo
 Type=Application
 Comment=System Information
 Comment[es]=Info Sistema
-Icon=SystemInfo
+Icon=sysinfo/SystemInfo
 Name[hu]=Rendszerinfó
 Name[it]=Sistema
 Name[pt]=Sistema
 Name[es]=Info Sistema
 Name[zh_TW]=系統資訊
 Name[ko]=시스템정보
diff --git a/pics/inline/AddressBook.png b/pics/addressbook/AddressBook.png
index 6858683..6858683 100644
--- a/pics/inline/AddressBook.png
+++ b/pics/addressbook/AddressBook.png
diff --git a/pics/inline/DateBook.png b/pics/datebook/DateBook.png
index f7b5380..f7b5380 100644
--- a/pics/inline/DateBook.png
+++ b/pics/datebook/DateBook.png
diff --git a/pics/inline/Terminal.png b/pics/konsole/Terminal.png
index 786b18f..786b18f 100644
--- a/pics/inline/Terminal.png
+++ b/pics/konsole/Terminal.png
diff --git a/pics/inline/SystemInfo.png b/pics/sysinfo/SystemInfo.png
index dfb9a1c..dfb9a1c 100644
--- a/pics/inline/SystemInfo.png
+++ b/pics/sysinfo/SystemInfo.png
diff --git a/pics/inline/TextEditor.png b/pics/textedit/TextEditor.png
index 9f17179..9f17179 100644
--- a/pics/inline/TextEditor.png
+++ b/pics/textedit/TextEditor.png
diff --git a/pics/inline/TodoList.png b/pics/todo/TodoList.png
index 323eea4..323eea4 100644
--- a/pics/inline/TodoList.png
+++ b/pics/todo/TodoList.png