diff --git a/src/app/qgstilescalewidget.cpp → src/providers/wms/qgstilescalewidget.cpp b/src/app/qgstilescalewidget.cpp → src/providers/wms/qgstilescalewidget.cpp
@@ -19,8 +19,15 @@
 #include "qgstilescalewidget.h"
 #include "qgsmapcanvas.h"
 #include "qgsrasterlayer.h"
+#include "qgswmsprovider.h"
+#include "qgsmessagelog.h"
 #include "qgslogger.h"
 
+#include <QDockWidget>
+#include <QMainWindow>
+#include <QMenu>
+#include <QGraphicsView>
+
 QgsTileScaleWidget::QgsTileScaleWidget( QgsMapCanvas * mapCanvas, QWidget * parent, Qt::WindowFlags f )
     : QWidget( parent, f )
     , mMapCanvas( mapCanvas )
@@ -32,54 +39,46 @@ QgsTileScaleWidget::QgsTileScaleWidget( QgsMapCanvas * mapCanvas, QWidget * pare
   layerChanged( mMapCanvas->currentLayer() );
 }
 
+QgsTileScaleWidget::~QgsTileScaleWidget()
+{
+  QSettings settings;
+  settings.setValue( "/UI/tileScaleEnabled", isVisible() );
+}
+
 void QgsTileScaleWidget::layerChanged( QgsMapLayer *layer )
 {
   QgsRasterLayer *rl = qobject_cast<QgsRasterLayer *>( layer );
+  if ( !rl )
+    return;
 
-  mResolutions.clear();
-  mSlider->setDisabled( true );
+  QgsWmsProvider *wms = qobject_cast<QgsWmsProvider *>( rl->dataProvider() );
+  if ( !wms )
+    return;
 
-  if ( !rl || rl->providerKey() != "wms" )
+  QgsWmtsTileMatrixSet *tileMatrixSet = wms->tileMatrixSet();
+  if ( !tileMatrixSet )
     return;
 
-  QString uri = rl->source();
-  int tiledpos = uri.indexOf( "tiled=" );
-  int urlpos = uri.indexOf( "url=" );
+  mSlider->setDisabled( true );
+
+  mResolutions = tileMatrixSet->tileMatrices.keys();
+  qSort( mResolutions );
 
-  if ( tiledpos >= 0 && urlpos >= 0 && urlpos > tiledpos )
+  for ( int i = 0; i < mResolutions.size(); i++ )
   {
-    uri = uri.mid( tiledpos + 6 );
-    int pos = uri.indexOf( "," );
-    if ( pos >= 0 )
-      uri = uri.left( pos );
-    QStringList params = uri.split( ";" );
-    if ( params.size() < 3 )
-      return;
-
-    params.takeFirst();
-    params.takeFirst();
-
-    mResolutions.clear();
-    foreach( QString r, params )
-    {
-      mResolutions << r.toDouble();
-    }
-    qSort( mResolutions );
-
-    for ( int i = 0; i < mResolutions.size(); i++ )
-      QgsDebugMsg( QString( "found resolution %1: %2" ).arg( i ).arg( mResolutions[i] ) );
-
-    mSlider->setRange( 0, mResolutions.size() - 1 );
-    mSlider->setTickInterval( 1 );
-    mSlider->setInvertedAppearance( true );
-    mSlider->setPageStep( 1 );
-    mSlider->setTracking( false );
-
-    scaleChanged( mMapCanvas->scale() );
-
-    mSlider->setEnabled( true );
-    show();
+    QgsDebugMsg( QString( "found resolution %1: %2" ).arg( i ).arg( mResolutions[i] ) );
   }
+
+  mSlider->setRange( 0, mResolutions.size() - 1 );
+  mSlider->setTickInterval( 1 );
+  mSlider->setInvertedAppearance( true );
+  mSlider->setPageStep( 1 );
+  mSlider->setTracking( false );
+
+  scaleChanged( mMapCanvas->scale() );
+
+  mSlider->setEnabled( true );
+  show();
 }
 
 void QgsTileScaleWidget::scaleChanged( double scale )
@@ -102,11 +101,68 @@ void QgsTileScaleWidget::scaleChanged( double scale )
   }
 
   QgsDebugMsg( QString( "selected resolution %1: %2" ).arg( i ).arg( mResolutions[i] ) );
+  mSlider->blockSignals( true );
   mSlider->setValue( i );
+  mSlider->blockSignals( false );
 }
 
 void QgsTileScaleWidget::on_mSlider_valueChanged( int value )
 {
   QgsDebugMsg( QString( "slider released at %1: %2" ).arg( mSlider->value() ).arg( mResolutions[mSlider->value()] ) );
   mMapCanvas->zoomByFactor( mResolutions[mSlider->value()] / mMapCanvas->mapUnitsPerPixel() );
 }
+
+void QgsTileScaleWidget::showTileScale( QMainWindow *mainWindow )
+{
+  QDockWidget *dock = mainWindow->findChild<QDockWidget *>( "theTileScaleDock" );
+  if ( dock )
+  {
+    dock->setVisible( dock->isHidden() );
+    return;
+  }
+
+  QgsMapCanvas *canvas = mainWindow->findChild<QgsMapCanvas *>( "theMapCanvas" );
+  QgsDebugMsg( QString( "canvas:%1 [%2]" ).arg(( ulong ) canvas, 0, 16 ).arg( canvas ? canvas->objectName() : "" ) );
+  if ( !canvas )
+  {
+    QgsDebugMsg( "map canvas theMapCanvas not found" );
+    return;
+  }
+
+  QgsTileScaleWidget *tws = new QgsTileScaleWidget( canvas );
+  tws->setObjectName( "theTileScaleWidget" );
+
+  QObject *legend = mainWindow->findChild<QObject*>( "theMapLegend" );
+  if ( legend )
+  {
+    connect( legend, SIGNAL( currentLayerChanged( QgsMapLayer* ) ),
+             tws, SLOT( layerChanged( QgsMapLayer* ) ) );
+  }
+  else
+  {
+    QgsDebugMsg( "legend not found" );
+  }
+
+  //create the dock widget
+  dock = new QDockWidget( tr( "Tile scale" ), mainWindow );
+  dock->setObjectName( "theTileScaleDock" );
+  dock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
+  mainWindow->addDockWidget( Qt::RightDockWidgetArea, dock );
+
+  // add to the Panel submenu
+  QMenu *panelMenu = mainWindow->findChild<QMenu *>( "mPanelMenu" );
+  if ( panelMenu )
+  {
+    // add to the Panel submenu
+    panelMenu->addAction( dock->toggleViewAction() );
+  }
+  else
+  {
+    QgsDebugMsg( "panel menu not found" );
+  }
+
+  panelMenu->addAction( dock->toggleViewAction() );
+
+  dock->setWidget( tws );
+  dock->show();
+}
diff --git a/src/app/qgstilescalewidget.h → src/providers/wms/qgstilescalewidget.h b/src/app/qgstilescalewidget.h → src/providers/wms/qgstilescalewidget.h
@@ -23,20 +23,24 @@
 
 class QgsMapCanvas;
 class QgsMapLayer;
-class QwtSlider;
+class QMainWindow;
 
 class QgsTileScaleWidget : public QWidget, private Ui::QgsTileScaleWidget
 {
     Q_OBJECT
+
   public:
-    QgsTileScaleWidget( QgsMapCanvas *mapCanvas, QWidget * parent = 0, Qt::WindowFlags f = 0 );
+    static void showTileScale( QMainWindow *mainWindow );
 
   public slots:
     void layerChanged( QgsMapLayer *layer );
     void scaleChanged( double );
     void on_mSlider_valueChanged( int );
 
   private:
+    QgsTileScaleWidget( QgsMapCanvas *mapCanvas, QWidget *parent = 0, Qt::WindowFlags f = 0 );
+    ~QgsTileScaleWidget();
+
     QgsMapCanvas *mMapCanvas;
     QList<double> mResolutions;
 };

diff --git a/src/providers/wms/qgswmsconnection.cpp b/src/providers/wms/qgswmsconnection.cpp
@@ -0,0 +1,139 @@
+/***************************************************************************
+    qgswmsconnection.cpp  -  selector for WMS servers, etc.
+                             -------------------
+    begin                : May 2011
+    original             : (C) 2011 by Martin Dobias
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "../providers/wms/qgswmsprovider.h"
+#include "qgis.h" // GEO_EPSG_CRS_ID
+#include "qgsnewhttpconnection.h"
+#include "qgsproject.h"
+#include "qgsproviderregistry.h"
+#include "qgswmsconnection.h"
+#include "qgsnetworkaccessmanager.h"
+
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QPicture>
+#include <QSettings>
+#include <QUrl>
+
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
+QgsWMSConnection::QgsWMSConnection( QString theConnName ) :
+    mConnName( theConnName )
+{
+  QgsDebugMsg( "theConnName = " + theConnName );
+
+  QSettings settings;
+
+  QString key = "/Qgis/connections-wms/" + mConnName;
+  QString credentialsKey = "/Qgis/WMS/" + mConnName;
+
+  QStringList connStringParts;
+
+  mConnectionInfo = settings.value( key + "/url" ).toString();
+
+  // Check for credentials and prepend to the connection info
+  QString username = settings.value( credentialsKey + "/username" ).toString();
+  QString password = settings.value( credentialsKey + "/password" ).toString();
+  if ( !username.isEmpty() )
+  {
+    // check for a password, if none prompt to get it
+    if ( password.isEmpty() )
+    {
+      //password = QInputDialog::getText( this, tr( "WMS Password for %1" ).arg( theConnName ), "Password", QLineEdit::Password );
+      password = QInputDialog::getText( 0, tr( "WMS Password for %1" ).arg( mConnName ), "Password", QLineEdit::Password );
+    }
+    mConnectionInfo = "username=" + username + ",password=" + password + ",url=" + mConnectionInfo;
+  }
+
+  bool ignoreGetMap = settings.value( key + "/ignoreGetMapURI", false ).toBool();
+  bool ignoreGetFeatureInfo = settings.value( key + "/ignoreGetFeatureInfoURI", false ).toBool();
+  if ( ignoreGetMap || ignoreGetFeatureInfo )
+  {
+    QString connArgs = "ignoreUrl=";
+    if ( ignoreGetMap )
+    {
+      connArgs += "GetMap";
+      if ( ignoreGetFeatureInfo )
+        connArgs += ";";
+    }
+    if ( ignoreGetFeatureInfo )
+      connArgs += "GetFeatureInfo";
+
+    if ( mConnectionInfo.startsWith( "username=" ) )
+    {
+      mConnectionInfo.prepend( connArgs + "," );
+    }
+    else
+    {
+      mConnectionInfo.prepend( connArgs + ",url=" );
+    }
+  }
+
+  QgsDebugMsg( QString( "Connection info: '%1'." ).arg( mConnectionInfo ) );
+}
+
+QgsWMSConnection::~QgsWMSConnection()
+{
+
+}
+
+QString QgsWMSConnection::connectionInfo()
+{
+  return mConnectionInfo;
+}
+
+QgsWmsProvider *QgsWMSConnection::provider()
+{
+  // TODO: Create and bind to data provider
+
+  // load the server data provider plugin
+  QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
+
+  QgsWmsProvider *wmsProvider =
+    ( QgsWmsProvider* ) pReg->provider( "wms", mConnectionInfo );
+
+  return wmsProvider;
+}
+
+
+
+QStringList QgsWMSConnection::connectionList()
+{
+  QSettings settings;
+  settings.beginGroup( "/Qgis/connections-wms" );
+  return settings.childGroups();
+}
+
+QString QgsWMSConnection::selectedConnection()
+{
+  QSettings settings;
+  return settings.value( "/Qgis/connections-wms/selected" ).toString();
+}
+
+void QgsWMSConnection::setSelectedConnection( QString name )
+{
+  QSettings settings;
+  settings.setValue( "/Qgis/connections-wms/selected", name );
+}
+
+void QgsWMSConnection::deleteConnection( QString name )
+{
+  QSettings settings;
+  settings.remove( "/Qgis/connections-wms/" + name );
+  settings.remove( "/Qgis/WMS/" + name );
+}
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -0,0 +1,273 @@
+#include "qgswmsdataitems.h"
+
+#include "qgslogger.h"
+
+#include "qgswmsconnection.h"
+#include "qgswmssourceselect.h"
+
+#include "qgsnewhttpconnection.h"
+
+#include "qgstilescalewidget.h"
+
+// ---------------------------------------------------------------------------
+QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, QString path )
+    : QgsDataCollectionItem( parent, name, path )
+{
+  mIcon = QIcon( getThemePixmap( "mIconConnect.png" ) );
+}
+
+QgsWMSConnectionItem::~QgsWMSConnectionItem()
+{
+}
+
+QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()
+{
+  QgsDebugMsg( "Entered" );
+  QVector<QgsDataItem*> children;
+  QgsWMSConnection connection( mName );
+  QgsWmsProvider *wmsProvider = connection.provider();
+  if ( !wmsProvider )
+    return children;
+
+  QString mConnInfo = connection.connectionInfo();
+  QgsDebugMsg( "mConnInfo = " + mConnInfo );
+
+  // Attention: supportedLayers() gives tree leafes, not top level
+  if ( !wmsProvider->supportedLayers( mLayerProperties ) )
+  {
+    children.append( new QgsErrorItem( this, tr( "Failed to retrieve layers" ), mPath + "/error" ) );
+    return children;
+  }
+
+  QgsWmsCapabilitiesProperty mCapabilitiesProperty = wmsProvider->capabilitiesProperty();
+  QgsWmsCapabilityProperty capabilityProperty = mCapabilitiesProperty.capability;
+
+  // Top level layer is present max once
+  // <element name="Capability">
+  //    <element ref="wms:Layer" minOccurs="0"/>  - default maxOccurs=1
+  QgsWmsLayerProperty topLayerProperty = capabilityProperty.layer;
+  foreach( QgsWmsLayerProperty layerProperty, topLayerProperty.layer )
+  {
+    // Attention, the name may be empty
+    QgsDebugMsg( QString::number( layerProperty.orderId ) + " " + layerProperty.name + " " + layerProperty.title );
+    QString pathName = layerProperty.name.isEmpty() ? QString::number( layerProperty.orderId ) : layerProperty.name;
+
+    QgsWMSLayerItem * layer = new QgsWMSLayerItem( this, layerProperty.title, mPath + "/" + pathName, mCapabilitiesProperty, mConnInfo, layerProperty );
+
+    children.append( layer );
+  }
+  return children;
+}
+
+bool QgsWMSConnectionItem::equal( const QgsDataItem *other )
+{
+  if ( type() != other->type() )
+  {
+    return false;
+  }
+  const QgsWMSConnectionItem *o = dynamic_cast<const QgsWMSConnectionItem *>( other );
+  return ( mPath == o->mPath && mName == o->mName && mConnInfo == o->mConnInfo );
+}
+
+QList<QAction*> QgsWMSConnectionItem::actions()
+{
+  QList<QAction*> lst;
+
+  QAction* actionEdit = new QAction( tr( "Edit..." ), this );
+  connect( actionEdit, SIGNAL( triggered() ), this, SLOT( editConnection() ) );
+  lst.append( actionEdit );
+
+  QAction* actionDelete = new QAction( tr( "Delete" ), this );
+  connect( actionDelete, SIGNAL( triggered() ), this, SLOT( deleteConnection() ) );
+  lst.append( actionDelete );
+
+  return lst;
+}
+
+void QgsWMSConnectionItem::editConnection()
+{
+  QgsNewHttpConnection nc( 0, "/Qgis/connections-wms/", mName );
+
+  if ( nc.exec() )
+  {
+    // the parent should be updated
+    mParent->refresh();
+  }
+}
+
+void QgsWMSConnectionItem::deleteConnection()
+{
+  QgsWMSConnection::deleteConnection( mName );
+  // the parent should be updated
+  mParent->refresh();
+}
+
+
+// ---------------------------------------------------------------------------
+
+QgsWMSLayerItem::QgsWMSLayerItem( QgsDataItem* parent, QString name, QString path, QgsWmsCapabilitiesProperty capabilitiesProperty, QString connInfo, QgsWmsLayerProperty layerProperty )
+    : QgsLayerItem( parent, name, path, QString(), QgsLayerItem::Raster, "wms" ),
+    mCapabilitiesProperty( capabilitiesProperty ),
+    mConnInfo( connInfo ),
+    mLayerProperty( layerProperty )
+    //mProviderKey ("wms"),
+    //mLayerType ( QgsLayerItem::Raster )
+{
+  mUri = createUri();
+  // Populate everything, it costs nothing, all info about layers is collected
+  foreach( QgsWmsLayerProperty layerProperty, mLayerProperty.layer )
+  {
+    // Attention, the name may be empty
+    QgsDebugMsg( QString::number( layerProperty.orderId ) + " " + layerProperty.name + " " + layerProperty.title );
+    QString pathName = layerProperty.name.isEmpty() ? QString::number( layerProperty.orderId ) : layerProperty.name;
+    QgsWMSLayerItem * layer = new QgsWMSLayerItem( this, layerProperty.title, mPath + "/" + pathName, mCapabilitiesProperty, mConnInfo, layerProperty );
+    mChildren.append( layer );
+  }
+
+  if ( mChildren.size() == 0 )
+  {
+    mIcon = iconRaster();
+  }
+  mPopulated = true;
+}
+
+QgsWMSLayerItem::~QgsWMSLayerItem()
+{
+}
+
+QString QgsWMSLayerItem::createUri()
+{
+  QString uri;
+  if ( mLayerProperty.name.isEmpty() )
+    return uri; // layer collection
+
+  QString rasterLayerPath = mConnInfo;
+  QString baseName = mLayerProperty.name;
+
+  // Number of styles must match number of layers
+  QStringList layers;
+  layers << mLayerProperty.name;
+  QStringList styles;
+  if ( mLayerProperty.style.size() > 0 )
+  {
+    styles.append( mLayerProperty.style[0].name );
+  }
+  else
+  {
+    styles << ""; // TODO: use loadDefaultStyleFlag
+  }
+
+  QString format;
+  // get first supporte by qt and server
+  QVector<QgsWmsSupportedFormat> formats = QgsWmsProvider::supportedFormats();
+  foreach( QgsWmsSupportedFormat f, formats )
+  {
+    if ( mCapabilitiesProperty.capability.request.getMap.format.indexOf( f.format ) >= 0 )
+    {
+      format = f.format;
+      break;
+    }
+  }
+  QString crs;
+  // get first known if possible
+  QgsCoordinateReferenceSystem testCrs;
+  foreach( QString c, mLayerProperty.crs )
+  {
+    testCrs.createFromOgcWmsCrs( c );
+    if ( testCrs.isValid() )
+    {
+      crs = c;
+      break;
+    }
+  }
+  if ( crs.isEmpty() && mLayerProperty.crs.size() > 0 )
+  {
+    crs = mLayerProperty.crs[0];
+  }
+  uri = rasterLayerPath + "|layers=" + layers.join( "," ) + "|styles=" + styles.join( "," ) + "|format=" + format + "|crs=" + crs;
+
+  return uri;
+}
+
+// ---------------------------------------------------------------------------
+QgsWMSRootItem::QgsWMSRootItem( QgsDataItem* parent, QString name, QString path )
+    : QgsDataCollectionItem( parent, name, path )
+{
+  mIcon = QIcon( getThemePixmap( "mIconWms.png" ) );
+
+  populate();
+}
+
+QgsWMSRootItem::~QgsWMSRootItem()
+{
+}
+
+QVector<QgsDataItem*>QgsWMSRootItem::createChildren()
+{
+  QVector<QgsDataItem*> connections;
+
+  foreach( QString connName, QgsWMSConnection::connectionList() )
+  {
+    QgsDataItem * conn = new QgsWMSConnectionItem( this, connName, mPath + "/" + connName );
+    connections.append( conn );
+  }
+  return connections;
+}
+
+QList<QAction*> QgsWMSRootItem::actions()
+{
+  QList<QAction*> lst;
+
+  QAction* actionNew = new QAction( tr( "New Connection..." ), this );
+  connect( actionNew, SIGNAL( triggered() ), this, SLOT( newConnection() ) );
+  lst.append( actionNew );
+
+  return lst;
+}
+
+
+QWidget * QgsWMSRootItem::paramWidget()
+{
+  QgsWMSSourceSelect *select = new QgsWMSSourceSelect( 0, 0, true, true );
+  connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
+  return select;
+}
+void QgsWMSRootItem::connectionsChanged()
+{
+  refresh();
+}
+
+void QgsWMSRootItem::newConnection()
+{
+  QgsNewHttpConnection nc( 0 );
+
+  if ( nc.exec() )
+  {
+    refresh();
+  }
+}
+
+
+// ---------------------------------------------------------------------------
+
+QGISEXTERN void registerGui( QMainWindow *mainWindow )
+{
+  QgsTileScaleWidget::showTileScale( mainWindow );
+}
+
+QGISEXTERN QgsWMSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
+{
+  return new QgsWMSSourceSelect( parent, fl );
+}
+
+QGISEXTERN int dataCapabilities()
+{
+  return  QgsDataProvider::Net;
+}
+
+QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
+{
+  Q_UNUSED( thePath );
+
+  return new QgsWMSRootItem( parentItem, "WMS", "wms:" );
+}
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
diff --git a/src/app/qgswmssourceselect.cpp → src/providers/wms/qgswmssourceselect.cpp b/src/app/qgswmssourceselect.cpp → src/providers/wms/qgswmssourceselect.cpp
@@ -5,7 +5,7 @@
     copyright            :
     original             : (C) 2005 by Brendan Morley email  : morb at ozemail dot com dot au
     wms search           : (C) 2009 Mathias Walker <mwa at sourcepole.ch>, Sourcepole AG
-    wms-c support        : (C) 2010 Juergen E. Fischer < jef at norbit dot de >, norBIT GmbH
+    wmts/wms-c support   : (C) 2010-2012 Juergen E. Fischer < jef at norbit dot de >, norBIT GmbH
 
  ***************************************************************************/
 
@@ -19,7 +19,7 @@
  ***************************************************************************/
 /* $Id$ */
 
-#include "../providers/wms/qgswmsprovider.h"
+#include "qgswmsprovider.h"
 #include "qgis.h" // GEO_EPSG_CRS_ID
 #include "qgisapp.h" //for getThemeIcon
 #include "qgscontexthelp.h"
@@ -33,6 +33,7 @@
 #include "qgsproject.h"
 #include "qgsproviderregistry.h"
 #include "qgswmssourceselect.h"
+#include "qgswmtsdimensions.h"
 #include "qgsnetworkaccessmanager.h"
 
 #include <QButtonGroup>
@@ -347,57 +348,64 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
 
   lstLayers->sortByColumn( 0, Qt::AscendingOrder );
 
-  QVector<QgsWmsTileSetProfile> tilesets;
-  wmsProvider->supportedTileSets( tilesets );
+  wmsProvider->supportedTileLayers( mTileLayers );
 
-  tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), tilesets.size() > 0 );
+  tabServers->setTabEnabled( tabServers->indexOf( tabTilesets ), mTileLayers.size() > 0 );
   if ( tabServers->isTabEnabled( tabServers->indexOf( tabTilesets ) ) )
     tabServers->setCurrentWidget( tabTilesets );
 
-  if ( tilesets.size() > 0 )
+  if ( mTileLayers.size() > 0 )
   {
+    QHash<QString, QgsWmtsTileMatrixSet> tileMatrixSets;
+    wmsProvider->supportedTileMatrixSets( tileMatrixSets );
+
+    int rows = 0;
+    foreach( const QgsWmtsTileLayer &l, mTileLayers )
+    {
+      rows += l.styles.size() * l.setLinks.size();
+    }
+
     lstTilesets->clearContents();
-    lstTilesets->setRowCount( tilesets.size() );
+    lstTilesets->setRowCount( rows );
     lstTilesets->setSortingEnabled( true );
 
-    for ( int i = 0; i < tilesets.size(); i++ )
+    int row = 0;
+    foreach( const QgsWmtsTileLayer &l, mTileLayers )
     {
-      QTableWidgetItem *item = new QTableWidgetItem( tilesets[i].layers.join( ", " ) );
-
-      item->setData( Qt::UserRole + 0, tilesets[i].layers.join( "," ) );
-      item->setData( Qt::UserRole + 1, tilesets[i].styles.join( "," ) );
-      item->setData( Qt::UserRole + 2, tilesets[i].format );
-      item->setData( Qt::UserRole + 3, tilesets[i].crs );
-      item->setData( Qt::UserRole + 4, tilesets[i].tileWidth );
-      item->setData( Qt::UserRole + 5, tilesets[i].tileHeight );
-      item->setData( Qt::UserRole + 6, tilesets[i].resolutions );
-
-      lstTilesets->setItem( i, 0, item );
-      lstTilesets->setItem( i, 1, new QTableWidgetItem( tilesets[i].styles.join( ", " ) ) );
-      lstTilesets->setItem( i, 2, new QTableWidgetItem( QString( "%1x%2" ).arg( tilesets[i].tileWidth ).arg( tilesets[i].tileHeight ) ) );
-      lstTilesets->setItem( i, 3, new QTableWidgetItem( tilesets[i].format ) );
-      lstTilesets->setItem( i, 4, new QTableWidgetItem( tilesets[i].crs ) );
-
-      for ( int j = 0; j < 5; j++ )
-      {
-        QTableWidgetItem *item = lstTilesets->item( i, j );
-        item->setFlags( item->flags() & ~Qt::ItemIsEditable );
-      }
-
-      if ( !mMimeMap.contains( tilesets[i].format ) )
+      foreach( const QgsWmtsStyle &style, l.styles )
       {
-        for ( int j = 0; j < 5; j++ )
+        foreach( const QgsWmtsTileMatrixSetLink &setLink, l.setLinks )
         {
-          QTableWidgetItem *item = lstTilesets->item( i, j );
-          item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
-          item->setToolTip( tr( "encoding %1 not supported." ).arg( tilesets[i].format ) );
+          QTableWidgetItem *item = new QTableWidgetItem( l.identifier );
+          item->setData( Qt::UserRole + 0, l.identifier );
+          item->setData( Qt::UserRole + 1, l.format );
+          item->setData( Qt::UserRole + 2, style.identifier );
+          item->setData( Qt::UserRole + 3, setLink.tileMatrixSet );
+          item->setData( Qt::UserRole + 4, tileMatrixSets[ setLink.tileMatrixSet ].crs );
+
+          lstTilesets->setItem( row, 0, item );
+          lstTilesets->setItem( row, 1, new QTableWidgetItem( l.format ) );
+          lstTilesets->setItem( row, 2, new QTableWidgetItem( style.identifier ) );
+          QTableWidgetItem *styleItem = new QTableWidgetItem( l.title );
+          if ( !l.abstract.isEmpty() )
+            styleItem->setToolTip( "<p>" + l.abstract + "</p>" );
+          lstTilesets->setItem( row, 3, styleItem );
+          lstTilesets->setItem( row, 4, new QTableWidgetItem( setLink.tileMatrixSet ) );
+          lstTilesets->setItem( row, 5, new QTableWidgetItem( tileMatrixSets[ setLink.tileMatrixSet ].crs ) );
+
+          if ( !mMimeMap.contains( l.format ) )
+          {
+            for ( int i = 0; i < lstTilesets->columnCount(); i++ )
+            {
+              QTableWidgetItem *item = lstTilesets->item( row, i );
+              item->setFlags( item->flags() & ~Qt::ItemIsEnabled );
+              item->setToolTip( tr( "encoding %1 not supported." ).arg( l.format ) );
+            }
+          }
+
+          row++;
         }
       }
-
-      QString crsName = descriptionForAuthId( tilesets[i].crs );
-      if ( crsName.isEmpty() )
-        crsName = tr( "CRS %1 not supported." ).arg( tilesets[i].crs );
-      lstTilesets->item( i, 4 )->setToolTip( crsName );
     }
 
     lstTilesets->resizeColumnsToContents();
@@ -511,35 +519,91 @@ void QgsWMSSourceSelect::addClicked()
   QString crs;
   QString connInfo = connectionInfo();
 
+  QStringList connArgs;
+
+  if ( mTileWidth->text().toInt() > 0 && mTileHeight->text().toInt() > 0 )
+  {
+    connArgs << QString( "maxSize=%1;%2" ).arg( mTileWidth->text().toInt() ).arg( mTileHeight->text().toInt() );
+  }
+
   if ( lstTilesets->selectedItems().isEmpty() )
   {
     collectSelectedLayers( layers, styles );
     crs = mCRS;
-    format = mFormats[ mImageFormatGroup->checkedId()];
+    format = mFormats[ mImageFormatGroup->checkedId()].format;
   }
   else
   {
     QTableWidgetItem *item = lstTilesets->selectedItems().first();
-    layers = item->data( Qt::UserRole + 0 ).toStringList();
-    styles = item->data( Qt::UserRole + 1 ).toStringList();
-    format = item->data( Qt::UserRole + 2 ).toString();
-    crs    = item->data( Qt::UserRole + 3 ).toString();
 
-    QString connArgs = QString( "tiled=%1;%2;%3" )
-                       .arg( item->data( Qt::UserRole + 4 ).toInt() )
-                       .arg( item->data( Qt::UserRole + 5 ).toInt() )
-                       .arg( item->data( Qt::UserRole + 6 ).toStringList().join( ";" ) );
+    layers = QStringList( item->data( Qt::UserRole + 0 ).toString() );
+    format = item->data( Qt::UserRole + 1 ).toString();
+    styles = QStringList( item->data( Qt::UserRole + 2 ).toString() );
+    crs    = item->data( Qt::UserRole + 4 ).toString();
+
+    connArgs << QString( "tileMatrixSet=%1" ).arg( item->data( Qt::UserRole + 3 ).toStringList().join( ";" ) );
 
-    if ( connInfo.startsWith( "username=" ) || connInfo.startsWith( "ignoreUrl=" ) )
+    const QgsWmtsTileLayer *layer = 0;
+
+    foreach( const QgsWmtsTileLayer &l, mTileLayers )
     {
-      connInfo.prepend( connArgs + "," );
+      if ( l.identifier == layers.join( "," ) )
+      {
+        layer = &l;
+        break;
+      }
     }
-    else
+
+    Q_ASSERT( layer );
+
+    if ( !layer->dimensions.isEmpty() )
     {
-      connInfo.prepend( connArgs + ",url=" );
+      QgsWmtsDimensions *dlg = new QgsWmtsDimensions( *layer, this );
+      if ( dlg->exec() != QDialog::Accepted )
+      {
+        delete dlg;
+        return;
+      }
+
+      QHash<QString, QString> dims;
+      dlg->selectedDimensions( dims );
+
+      QString dimString = "tileDimensions=";
+      QString delim;
+
+      for ( QHash<QString, QString>::const_iterator it = dims.constBegin();
+            it != dims.constEnd();
+            ++it )
+      {
+        dimString += delim + it.key() + "=" + it.value();
+        delim = ";";
+      }
+
+      delete dlg;
+
+      connArgs << dimString;
+    }
+  }
+
+  if ( mFeatureCount->text().toInt() > 0 )
+  {
+    connArgs << QString( "featureCount=%1" ).arg( mFeatureCount->text().toInt() );
+  }
+
+  if ( !connArgs.isEmpty() )
+  {
+    if ( !connInfo.startsWith( "username=" ) && !connInfo.startsWith( "ignoreUrl=" ) )
+    {
+      connInfo.prepend( "url=" );
     }
+
+    connArgs << connInfo;
+
+    connInfo = connArgs.join( "," );
   }
 
+  QgsDebugMsg( QString( "connInfo=%1 crs=%2 " ).arg( connInfo ).arg( crs ) );
+
   QgisApp::instance()->addRasterLayer( connInfo,
                                        leLayerName->text().isEmpty() ? layers.join( "/" ) : leLayerName->text(),
                                        "wms", layers, styles, format, crs );

diff --git a/src/app/qgswmssourceselect.h → src/providers/wms/qgswmssourceselect.h b/src/app/qgswmssourceselect.h → src/providers/wms/qgswmssourceselect.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-    qgserversourceselect.h  -  selector for WMS servers, etc.
+    qgswmssourceselect.h  -  selector for WMS servers, etc.
                              -------------------
     begin                : 3 April 2005
     original             : (C) 2005 by Brendan Morley email  : morb at ozemail dot com dot au
@@ -188,6 +188,17 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
     QList<QTreeWidgetItem*> mCurrentSelection;
     QTableWidgetItem* mCurrentTileset;
 
+    QList<QgsWmtsTileLayer> mTileLayers;
+
+  signals:
+    void addRasterLayer( QString const & rasterLayerPath,
+                         QString const & baseName,
+                         QString const & providerKey,
+                         QStringList const & layers,
+                         QStringList const & styles,
+                         QString const & format,
+                         QString const & crs );
+    void connectionsChanged();
   private slots:
     void on_btnSearch_clicked();
     void on_btnAddWMS_clicked();

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -119,7 +119,6 @@
     <addaction name="mActionNewBookmark"/>
     <addaction name="mActionShowBookmarks"/>
     <addaction name="mActionDraw"/>
-    <addaction name="mActionTileScale"/>
     <addaction name="mActionGpsTool"/>
    </widget>
    <widget class="QMenu" name="mLayerMenu">
@@ -1214,11 +1213,6 @@
     <string>Set Project CRS from Layer</string>
    </property>
   </action>
-  <action name="mActionTileScale">
-   <property name="text">
-    <string>Tile scale slider</string>
-   </property>
-  </action>
   <action name="mActionGpsTool">
    <property name="text">
     <string>Live GPS tracking</string>

diff --git a/src/ui/qgswmssourceselectbase.ui b/src/ui/qgswmssourceselectbase.ui
@@ -326,22 +326,27 @@
          </attribute>
          <column>
           <property name="text">
-           <string>Layers</string>
+           <string>Layer</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Styles</string>
+           <string>Format</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Size</string>
+           <string>Style</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Format</string>
+           <string>Title</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Tileset</string>
           </property>
          </column>
          <column>