diff --git a/spritz/po/spritz.pot b/spritz/po/spritz.pot
index 850783584..1d939947f 100644
--- a/spritz/po/spritz.pot
+++ b/spritz/po/spritz.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-18 14:29+0200\n"
+"POT-Creation-Date: 2008-04-24 21:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,67 +16,106 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/dialogs.py:52
+#: ../src/dialogs.py:86
+msgid "License name"
+msgstr ""
+
+#: ../src/dialogs.py:94
+msgid "Sources"
+msgstr ""
+
+#: ../src/dialogs.py:102
+msgid "Mirrors"
+msgstr ""
+
+#: ../src/dialogs.py:110
+msgid "Keywords"
+msgstr ""
+
+#: ../src/dialogs.py:118
+msgid "Dependencies"
+msgstr ""
+
+#: ../src/dialogs.py:126
+msgid "Depends"
+msgstr ""
+
+#: ../src/dialogs.py:134
+msgid "Needed libraries"
+msgstr ""
+
+#: ../src/dialogs.py:142
+msgid "Protected item"
+msgstr ""
+
+#: ../src/dialogs.py:145 ../src/dialogs.py:157
+msgid "Type"
+msgstr ""
+
+#: ../src/dialogs.py:153
+msgid "File"
+msgstr ""
+
+#: ../src/dialogs.py:218
+msgid "From your Operating System"
+msgstr ""
+
+#: ../src/dialogs.py:360
 msgid "Please confirm the actions above"
 msgstr ""
 
-#. self.create_text_column( _( "Package" ), 'name' , size=300)
-#: ../src/dialogs.py:89 ../src/dialogs.py:96 ../src/views.py:413
-#: ../src/spritz.py:1105
+#: ../src/dialogs.py:397 ../src/dialogs.py:403 ../src/views.py:423
+#: ../src/spritz.py:916
 msgid "Package"
 msgstr ""
 
-#: ../src/dialogs.py:90 ../src/views.py:552 ../src/views.py:708
-#: ../src/views.py:1037 ../src/spritz.glade.h:23
-msgid "Description"
-msgstr ""
-
-#: ../src/dialogs.py:113 ../src/dialogs.py:154
+#: ../src/dialogs.py:420 ../src/dialogs.py:462
 msgid "To be reinstalled"
 msgstr ""
 
-#: ../src/dialogs.py:119 ../src/dialogs.py:159
+#: ../src/dialogs.py:426 ../src/dialogs.py:473
 msgid "To be installed"
 msgstr ""
 
-#: ../src/dialogs.py:125 ../src/dialogs.py:167
+#: ../src/dialogs.py:432 ../src/dialogs.py:484
 msgid "To be updated"
 msgstr ""
 
-#: ../src/dialogs.py:131
+#: ../src/dialogs.py:438
 msgid "To be downgraded"
 msgstr ""
 
-#: ../src/dialogs.py:137 ../src/dialogs.py:172
+#: ../src/dialogs.py:444 ../src/dialogs.py:495
 msgid "To be removed"
 msgstr ""
 
-#: ../src/dialogs.py:164
+#: ../src/dialogs.py:468 ../src/dialogs.py:479 ../src/dialogs.py:490
+#: ../src/dialogs.py:501
 msgid "No description"
 msgstr ""
 
-#: ../src/dialogs.py:305
+#: ../src/dialogs.py:634
 msgid "About"
 msgstr ""
 
-#: ../src/dialogs.py:400
+#: ../src/dialogs.py:729
 msgid "Hey!"
 msgstr ""
 
-#: ../src/dialogs.py:404
+#: ../src/dialogs.py:733
 msgid "Spritz Question"
 msgstr ""
 
-#: ../src/dialogs.py:419 ../src/misc.py:89 ../src/misc.py:144
+#: ../src/dialogs.py:748 ../src/misc.py:91 ../src/misc.py:256
 msgid "Attention"
 msgstr ""
 
-#: ../src/dialogs.py:473
+#: ../src/dialogs.py:802
 msgid "License"
 msgstr ""
 
 #. new
-#: ../src/dialogs.py:476
+#: ../src/dialogs.py:805
 msgid "Accepted"
 msgstr ""
 
@@ -93,7 +132,7 @@ msgid "Show Installed Packages"
 msgstr ""
 
 #. Setup Vertical Toolbar
-#: ../src/gui.py:296 ../src/views.py:547
+#: ../src/gui.py:296 ../src/views.py:587
 msgid "Packages"
 msgstr ""
 
@@ -105,7 +144,7 @@ msgstr ""
 msgid "Package Queue"
 msgstr ""
 
-#: ../src/gui.py:299
+#: ../src/gui.py:299 ../src/packages.py:210
 msgid "Repository Selection"
 msgstr ""
 
@@ -121,134 +160,162 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: ../src/misc.py:90
+#: ../src/misc.py:92
 msgid ""
 "There are packages that can't be installed at the same time, thus are "
 "blocking your request:"
 msgstr ""
 
-#: ../src/misc.py:145
+#: ../src/misc.py:134
+msgid "These are the needed packages"
+msgstr ""
+
+#: ../src/misc.py:135
+msgid ""
+"These packages must be removed from the removal queue because they depend on "
+"your last selection. Do you agree?"
+msgstr ""
+
+#: ../src/misc.py:257
 msgid ""
 "Some dependencies couldn't be found. It can either be because they are "
 "masked or because they aren't in any active repository."
 msgstr ""
 
-#: ../src/misc.py:188
+#: ../src/misc.py:306
 msgid "Needed disk space"
 msgstr ""
 
-#: ../src/misc.py:191
+#: ../src/misc.py:309
 msgid "Freed disk space"
 msgstr ""
 
-#: ../src/misc.py:195
+#: ../src/misc.py:313
 msgid "These are the packages that would be installed/updated"
 msgstr ""
 
-#: ../src/misc.py:238
+#: ../src/misc.py:360
 msgid "Freed space"
 msgstr ""
 
-#: ../src/misc.py:241
+#: ../src/misc.py:363
 msgid "Needed space"
 msgstr ""
 
-#: ../src/misc.py:245
+#: ../src/misc.py:368
 msgid "These are the packages that would be removed"
 msgstr ""
 
+#: ../src/packages.py:206
+msgid "No updates available"
+msgstr ""
+
+#: ../src/packages.py:207
+msgid "It seems that your system is already up-to-date. Good!"
+msgstr ""
+
+#: ../src/packages.py:208
+#, python-format
+msgid "Try clicking the %s button in the %s page"
+msgstr ""
+
+#: ../src/packages.py:209 ../src/spritz.py:418 ../src/spritz.py:463
+msgid "Update Repositories"
+msgstr ""
+
 #: ../src/views.py:41
 msgid "Categories"
 msgstr ""
 
-#: ../src/views.py:414 ../src/views.py:643
-msgid "Rev."
-msgstr ""
-
-#: ../src/views.py:415 ../src/spritz.glade.h:67
-msgid "Slot"
-msgstr ""
-
-#: ../src/views.py:416 ../src/views.py:975
+#: ../src/views.py:424 ../src/views.py:894
 msgid "Repository"
 msgstr ""
 
-#: ../src/views.py:588
+#: ../src/views.py:592 ../src/views.py:748 ../src/views.py:956
+#: ../src/spritz.glade.h:23
+msgid "Description"
+msgstr ""
+
+#: ../src/views.py:628
 msgid "Packages To Reinstall"
 msgstr ""
 
-#: ../src/views.py:592
+#: ../src/views.py:632
 msgid "Packages To Update"
 msgstr ""
 
-#: ../src/views.py:596
+#: ../src/views.py:636
 msgid "Packages To Install"
 msgstr ""
 
-#: ../src/views.py:600
+#: ../src/views.py:640
 msgid "Packages To Remove"
 msgstr ""
 
-#: ../src/views.py:629
+#: ../src/views.py:669
 msgid "Proposed"
 msgstr ""
 
-#: ../src/views.py:636
+#: ../src/views.py:676
 msgid "Destination"
 msgstr ""
 
-#: ../src/views.py:685
+#: ../src/views.py:683
+msgid "Rev."
+msgstr ""
+
+#: ../src/views.py:725
 msgid "Status"
 msgstr ""
 
-#: ../src/views.py:692
+#: ../src/views.py:732
 msgid "GLSA id."
 msgstr ""
 
-#: ../src/views.py:700
+#: ../src/views.py:740
 msgid "Package key"
 msgstr ""
 
-#: ../src/views.py:793
+#: ../src/views.py:833
 msgid "No advisories"
 msgstr ""
 
-#: ../src/views.py:794
+#: ../src/views.py:834
 msgid "There are no items to show"
 msgstr ""
 
-#: ../src/views.py:975
+#: ../src/views.py:894
 msgid "Filename"
 msgstr ""
 
-#: ../src/views.py:995 ../src/spritz.py:383 ../src/spritz.py:418
+#: ../src/views.py:914 ../src/spritz.py:383 ../src/spritz.py:418
 msgid "You should press the button"
 msgstr ""
 
-#: ../src/views.py:995 ../src/spritz.py:383 ../src/spritz.py:463
+#: ../src/views.py:914 ../src/spritz.py:383 ../src/spritz.py:463
 msgid "Regenerate Cache"
 msgstr ""
 
-#: ../src/views.py:995 ../src/spritz.py:383 ../src/spritz.py:418
+#: ../src/views.py:914 ../src/spritz.py:383 ../src/spritz.py:418
 #: ../src/spritz.py:463
 msgid "now"
 msgstr ""
 
-#: ../src/views.py:1015
+#: ../src/views.py:934
 msgid "Active"
 msgstr ""
 
-#: ../src/views.py:1025 ../src/spritz.glade.h:82
+#: ../src/views.py:944 ../src/spritz.glade.h:82
 msgid "Update"
 msgstr ""
 
 #. Setup revision column
-#: ../src/views.py:1033 ../src/spritz.glade.h:62
+#: ../src/views.py:952 ../src/spritz.glade.h:62
 msgid "Revision"
 msgstr ""
 
 #. Setup reponame & repofile column's
-#: ../src/views.py:1036
+#: ../src/views.py:955
 msgid "Repository Identifier"
 msgstr ""
 
@@ -324,10 +391,6 @@ msgstr ""
 msgid "Database URL must start either with http:// or ftp:// or file://"
 msgstr ""
 
-#: ../src/spritz.py:418 ../src/spritz.py:463
-msgid "Update Repositories"
-msgstr ""
-
 #: ../src/spritz.py:431
 msgid "Insert Repository"
 msgstr ""
@@ -381,183 +444,138 @@ msgstr ""
 msgid "Unaffected"
 msgstr ""
 
-#. from installed
-#: ../src/spritz.py:822
-msgid "From your Operating System"
-msgstr ""
-
-#: ../src/spritz.py:1072
+#: ../src/spritz.py:883
 msgid "Entropy Config Setup"
 msgstr ""
 
-#: ../src/spritz.py:1084
+#: ../src/spritz.py:895
 msgid "GUI Setup Completed"
 msgstr ""
 
-#: ../src/spritz.py:1113
+#: ../src/spritz.py:924
 msgid "Bug"
 msgstr ""
 
-#: ../src/spritz.py:1121
+#: ../src/spritz.py:932
 msgid "Reference"
 msgstr ""
 
-#: ../src/spritz.py:1131
-msgid "License name"
-msgstr ""
-
-#: ../src/spritz.py:1139
-msgid "Sources"
-msgstr ""
-
-#: ../src/spritz.py:1147
-msgid "Mirrors"
-msgstr ""
-
-#: ../src/spritz.py:1155
-msgid "Keywords"
-msgstr ""
-
-#: ../src/spritz.py:1163
-msgid "Dependencies"
-msgstr ""
-
-#: ../src/spritz.py:1171
-msgid "Depends"
-msgstr ""
-
-#: ../src/spritz.py:1179
-msgid "Needed libraries"
-msgstr ""
-
-#: ../src/spritz.py:1187
-msgid "Protected item"
-msgstr ""
-
-#: ../src/spritz.py:1190 ../src/spritz.py:1202
-msgid "Type"
-msgstr ""
-
-#: ../src/spritz.py:1198
-msgid "File"
-msgstr ""
-
-#: ../src/spritz.py:1263
+#: ../src/spritz.py:989
 msgid "Generating metadata. Please wait."
 msgstr ""
 
-#: ../src/spritz.py:1267 ../src/spritz.py:1408 ../src/spritz.py:1415
+#: ../src/spritz.py:993 ../src/spritz.py:1134 ../src/spritz.py:1141
 msgid "Ready"
 msgstr ""
 
-#: ../src/spritz.py:1295
+#: ../src/spritz.py:1021
 msgid "Error loading advisories"
 msgstr ""
 
-#: ../src/spritz.py:1327
+#: ../src/spritz.py:1053
 msgid "Initializing Repository module..."
 msgstr ""
 
-#: ../src/spritz.py:1333
+#: ../src/spritz.py:1059
 msgid "You must run this application as root"
 msgstr ""
 
-#: ../src/spritz.py:1336 ../src/applet/etp_applet.py:612
+#: ../src/spritz.py:1062 ../src/applet/etp_applet.py:612
 msgid "No repositories specified in"
 msgstr ""
 
-#: ../src/spritz.py:1340
+#: ../src/spritz.py:1066
 msgid "You are not connected to the Internet. You should."
 msgstr ""
 
-#: ../src/spritz.py:1343 ../src/applet/etp_applet.py:620
+#: ../src/spritz.py:1069 ../src/applet/etp_applet.py:620
 msgid "Unhandled exception"
 msgstr ""
 
-#: ../src/spritz.py:1348
+#: ../src/spritz.py:1074
 msgid "Errors updating repositories."
 msgstr ""
 
-#: ../src/spritz.py:1349
+#: ../src/spritz.py:1075
 msgid "Please check logs below for more info"
 msgstr ""
 
-#: ../src/spritz.py:1352
+#: ../src/spritz.py:1078
 msgid "Repositories updated successfully"
 msgstr ""
 
-#: ../src/spritz.py:1355
+#: ../src/spritz.py:1081
 msgid "All the repositories were already up to date."
 msgstr ""
 
-#: ../src/spritz.py:1357
+#: ../src/spritz.py:1083
 msgid "repositories were already up to date. Others have been updated."
 msgstr ""
 
-#: ../src/spritz.py:1360
+#: ../src/spritz.py:1086
 msgid "sys-apps/entropy needs to be updated as soon as possible."
 msgstr ""
 
-#: ../src/spritz.py:1365
+#: ../src/spritz.py:1091
 msgid "Nothing to do. I am idle."
 msgstr ""
 
-#: ../src/spritz.py:1366
+#: ../src/spritz.py:1092
 msgid "Really, don't waste your time here. This is just a placeholder"
 msgstr ""
 
-#: ../src/spritz.py:1367
+#: ../src/spritz.py:1093
 msgid "I am still alive and kickin'"
 msgstr ""
 
 #. -> Get lists
-#: ../src/spritz.py:1401
+#: ../src/spritz.py:1127
 msgid "Generating Metadata, please wait."
 msgstr ""
 
-#: ../src/spritz.py:1402
+#: ../src/spritz.py:1128
 msgid "Entropy is indexing the repositories. It will take a few seconds"
 msgstr ""
 
-#: ../src/spritz.py:1403
+#: ../src/spritz.py:1129
 msgid "While you are waiting, take a break and look outside. Is it rainy?"
 msgstr ""
 
-#: ../src/spritz.py:1405 ../src/spritz.py:1412
+#: ../src/spritz.py:1131 ../src/spritz.py:1138
 msgid "Calculating"
 msgstr ""
 
-#: ../src/spritz.py:1433
+#: ../src/spritz.py:1164
 msgid "Running tasks"
 msgstr ""
 
-#: ../src/spritz.py:1439
+#: ../src/spritz.py:1170
 msgid "Processing Packages in queue"
 msgstr ""
 
-#: ../src/spritz.py:1450
+#: ../src/spritz.py:1181
 msgid ""
 "Attention. An error occured when processing the queue.\n"
 "Please have a look in the processing terminal."
 msgstr ""
 
-#: ../src/spritz.py:1475
+#: ../src/spritz.py:1206
 msgid "No packages selected"
 msgstr ""
 
-#: ../src/spritz.py:1531
+#: ../src/spritz.py:1265
 msgid "Exception caught"
 msgstr ""
 
-#: ../src/spritz.py:1532
+#: ../src/spritz.py:1266
 msgid "Spritz crashed! An unexpected error occured."
 msgstr ""
 
-#: ../src/spritz.py:1541
+#: ../src/spritz.py:1275
 msgid "Your report has been submitted successfully! Thanks a lot."
 msgstr ""
 
-#: ../src/spritz.py:1543
+#: ../src/spritz.py:1277
 msgid "Cannot submit your report. Not connected to Internet?"
 msgstr ""
 
@@ -1042,6 +1060,10 @@ msgstr ""
 msgid "Show unapplied"
 msgstr ""
 
+#: ../src/spritz.glade.h:67
+msgid "Slot"
+msgstr ""
+
 #: ../src/spritz.glade.h:68
 msgid "Soon!"
 msgstr ""
diff --git a/spritz/src/etpgui/packages.py b/spritz/src/etpgui/packages.py
index 673f3f927..4e439b0de 100644
--- a/spritz/src/etpgui/packages.py
+++ b/spritz/src/etpgui/packages.py
@@ -58,8 +58,8 @@ class PackageWrapper:
         return self.dbconn.retrieveAtom(self.matched_atom[0])
 
     def getNameDesc(self):
-        t = self.getName()
-        desc = self.getDescription()
+        t = cleanMarkupSting(self.getName())
+        desc = cleanMarkupSting(self.getDescription())
         if len(desc) > 58:
             desc = desc[:58]+"..."
         t += "\n<small><span foreground='#FF0000'>%s</span></small>" % (desc,)
diff --git a/spritz/src/views.py b/spritz/src/views.py
index 4c93f4aae..ff2d48281 100644
--- a/spritz/src/views.py
+++ b/spritz/src/views.py
@@ -482,8 +482,21 @@ class EntropyPackageView:
         if obj:
             cell.set_property('markup',getattr( obj, property ))
             if obj.color:
+                self.set_line_status(obj, cell)
                 cell.set_property('foreground',obj.color)
 
+    def set_line_status(self, obj, cell, stype = "cell-background"):
+        if obj.queued == "r":
+            cell.set_property(stype,'#FFE2A3')
+        elif obj.queued == "u":
+            cell.set_property(stype,'#B7BEFF')
+        elif obj.queued == "i":
+            cell.set_property(stype,'#D895FF')
+        elif obj.queued == "rr":
+            cell.set_property(stype,'#B7BEFF')
+        elif not obj.queued:
+            cell.set_property(stype,None)
+
     def selectAll(self):
         list = [x[0] for x in self.store if not x[0].queued == x[0].action]
         if not list:
@@ -531,6 +544,8 @@ class EntropyPackageView:
         pkg = model.get_value( iter, 0 )
         if pkg:
 
+            self.set_line_status(pkg, cell)
+
             if not pkg.dbconn:
                 cell.set_property( 'stock-id', 'gtk-apply' )
                 return