diff --git a/resources/etc/Uniboard.css b/resources/etc/Uniboard.css
index a6a1ceda..8fac56d7 100644
--- a/resources/etc/Uniboard.css
+++ b/resources/etc/Uniboard.css
@@ -1,4 +1,9 @@
+*
+{
+   color: #3F3F3F;
+}
 QMainWindow
+
 {
    background-color: #F1F1F1;  
 }
diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp
index 7620740b..0947ede9 100644
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@@ -25,7 +25,6 @@ const QString UBFeaturesController::virtualRootName = "root";
 UBFeature::UBFeature(const QString &url, const QPixmap &icon, const QString &name, const QUrl &realPath, UBFeatureElementType type)
 : virtualDir(url), mThumbnail(icon), mName(name), mPath(realPath), elementType(type)
 {
-	
 }
 
 UBFeature::~UBFeature()
@@ -43,8 +42,7 @@ QString UBFeature::getUrl() const
 {
 	if ( elementType == FEATURE_INTERNAL )
         return getFullPath().toString();
-	/*if ( UBApplication::isFromWeb( getFullPath() ) )
-		return QUrl( getFullPath() );*/
+
     return getFullPath().toLocalFile();
 }
 
@@ -185,28 +183,6 @@ void UBFeaturesController::scanFS()
     fileSystemScan( mLibInteractiveDirectoryPath, interactPath);
     fileSystemScan( trashDirectoryPath, trashPath);
     fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search");
-//=======
-//	// Claudio:
-//	// don't change the order of the scans
-//	fileSystemScan( mLibAudiosDirectoryPath, audiosPath);
-//	fileSystemScan( mLibVideosDirectoryPath, moviesPath);
-//	fileSystemScan( mLibAnimationsDirectoryPath, flashPath);
-//	fileSystemScan( mLibPicturesDirectoryPath, picturesPath  );
-
-//	fileSystemScan( mUserInteractiveDirectoryPath, appPath  );
-//	fileSystemScan( mUserAudioDirectoryPath, audiosPath  );
-//	fileSystemScan( mUserPicturesDirectoryPath, picturesPath  );
-//	fileSystemScan( mUserVideoDirectoryPath, moviesPath  );
-//	fileSystemScan( mUserAnimationDirectoryPath, flashPath  );
-
-//	fileSystemScan( mLibApplicationsDirectoryPath, appPath  );
-//	fileSystemScan( mLibShapesDirectoryPath, shapesPath  );
-//	fileSystemScan( mLibInteractiveDirectoryPath, interactPath  );
-//	fileSystemScan( trashDirectoryPath, trashPath );
-//	fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search" );
-	
-//>>>>>>> e38b24544e8b8b1d5bd41dabdeaf588df7d45185
-
 }
 
 void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QString & currVirtualPath)
@@ -287,12 +263,7 @@ void UBFeaturesController::loadFavoriteList()
 		{
 			QUrl path;
 			in >> path;
-			/*QFileInfo fileInfo( path );
-			QString fileName = fileInfo.fileName();
-
-			UBFeature elem( favoritePath, thumbnailForFile( path ), fileName, path, fileTypeFromUrl(path) );
-			featuresList->append( elem );*/
-			favoriteSet->insert( path );
+            favoriteSet->insert( path );
 		}
 	}
 }
diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index ed0f1365..e6dd0eda 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -55,8 +55,6 @@ public:
     void setFullVirtualPath(const QString &newVirtualPath) {virtualDir = newVirtualPath;}
     UBFeatureElementType getType() const { return elementType; }
 
-
-
 	bool isFolder() const;
 	bool isDeletable() const;
     bool inTrash() const;
diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp
index 11487633..ecf28854 100644
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
@@ -507,32 +507,6 @@ UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name )
 	setObjectName(name);
 }
 
-/*
-void UBFeaturesListView::mousePressEvent( QMouseEvent *event )
-{
-	rubberOrigin = event->pos();
-	rubberBand->setGeometry( QRect( rubberOrigin, QSize() ) );
-	//qDebug()  << rubberOrigin.x() << rubberOrigin.y();
-	rubberBand->show();
-	QListView::mousePressEvent(event);
-}
-
-void UBFeaturesListView::mouseMoveEvent( QMouseEvent *event )
-{
-	QPoint current = event->pos();
-	rubberBand->setGeometry( QRect( rubberOrigin, current ).normalized() );
-
-	//setSelection( rubberBand->rect(), QItemSelectionModel::Select );
-	QListView::mouseMoveEvent(event);
-}
-
-void UBFeaturesListView::mouseReleaseEvent( QMouseEvent *event )
-{
-	rubberBand->hide();
-	QListView::mouseReleaseEvent(event);
-}
-
-*/
 void UBFeaturesListView::dragEnterEvent( QDragEnterEvent *event )
 {
     if ( event->mimeData()->hasUrls() || event->mimeData()->hasImage() )
@@ -580,9 +554,7 @@ UBFeaturesNavigatorWidget::UBFeaturesNavigatorWidget(QWidget *parent, const char
     QWidget(parent), mListView(0), mListSlder(0)
 
 {
-//    if ('\0' == name) {
-        name = "UBFeaturesNavigatorWidget";
-//    }
+    name = "UBFeaturesNavigatorWidget";
 
     setObjectName(name);
     SET_STYLE_SHEET()
@@ -719,7 +691,6 @@ UBFeatureProperties::UBFeatureProperties( QWidget *parent, const char *name ) :
 	setObjectName(name);
 
     SET_STYLE_SHEET();
-    //setStyleSheet(UBApplication::globalStyleSheet());
 
     // Create the GUI
     mpLayout = new QVBoxLayout(this);