diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
@@ -16,48 +16,64 @@
 #ifndef QGSCPTCITYCOLORRAMPV2DIALOG_H
 #define QGSCPTCITYCOLORRAMPV2DIALOG_H
 
-#include <QDialog>
 
 #include "ui_qgscptcitycolorrampv2dialogbase.h"
+#include <QDialog>
+
+#include "qgscptcityarchive.h"
+
+#include <QAbstractProxyModel>
 
 class QgsCptCityColorRampV2;
-class QgsCptCityArchive;
-class QgsCptCityBrowserModel;
+class TreeFilterProxyModel;
+class ListFilterProxyModel;
+class UngroupProxyModel;
+
 
 class GUI_EXPORT QgsCptCityColorRampV2Dialog : public QDialog, private Ui::QgsCptCityColorRampV2DialogBase
 {
     Q_OBJECT
 
   public:
     QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* ramp, QWidget* parent = NULL );
+    ~QgsCptCityColorRampV2Dialog();
 
-    QString selectedName() const { return lblSchemeName->text() + cboVariantName->currentText(); }
+    QString selectedName() const
+    { return mRamp ? QFileInfo( mRamp->schemeName() ).baseName() + mRamp->variantName() : QString(); }
 
   public slots:
-    void populateVariants( QString newVariant = QString() );
+    void populateVariants();
 
-    void on_mBrowserView_clicked( const QModelIndex & );
+    void on_mTreeView_clicked( const QModelIndex & );
+    void on_mListWidget_itemClicked( QListWidgetItem * item );
     void on_tabBar_currentChanged( int index );
     void on_pbtnLicenseDetails_pressed();
     void on_cboVariantName_currentIndexChanged( int index );
+    void onFinished();
+
     /* void refresh(); */
 
   protected:
 
-    void updatePreview();
-    void updateCopyingInfo( const QMap< QString, QString >& copyingMap );
+    void updatePreview( bool clear = false );
+    void updateCopyingInfo( const QMap< QString, QString >& copyingMap = QMap< QString, QString >() );
+    void updateTreeView( QgsCptCityDataItem *item, bool resetRamp = true );
+    void updateListWidget( QgsCptCityDataItem *item );
     bool eventFilter( QObject *obj, QEvent *event );
 
     QgsCptCityColorRampV2* mRamp;
     QgsCptCityArchive* mArchive;
-    QString mArchiveGroup;
+    QgsCptCityBrowserModel::ViewType mArchiveViewType;
 
     /* void refreshModel( const QModelIndex& index ); */
-    void showEvent( QShowEvent * event );
+    bool updateRamp();
+    void setTreeModel( QgsCptCityBrowserModel* model );
 
     QgsCptCityBrowserModel* mModel;
     QgsCptCityBrowserModel* mAuthorsModel;
     QgsCptCityBrowserModel* mSelectionsModel;
+    TreeFilterProxyModel* mTreeFilter;
+    QVector<QgsCptCityColorRampItem*> mListRamps;
 
 };
 

diff --git a/src/ui/qgscptcitycolorrampv2dialogbase.ui b/src/ui/qgscptcitycolorrampv2dialogbase.ui