diff --git a/retroshare-gui/src/gui/AboutDialog.cpp b/retroshare-gui/src/gui/AboutDialog.cpp
index 441b78b9e..3648d2f27 100644
--- a/retroshare-gui/src/gui/AboutDialog.cpp
+++ b/retroshare-gui/src/gui/AboutDialog.cpp
@@ -21,789 +21,17 @@
  ****************************************************************/
 
 #include "AboutDialog.h"
-#include "HelpDialog.h"
-#include "rshare.h"
-
-#include <retroshare/rsiface.h>
-#include <retroshare/rsplugin.h>
-#include <retroshare/rsdisc.h>
-#include <retroshare/rspeers.h>
-#include "settings/rsharesettings.h"
-
-#ifdef ENABLE_WEBUI
-#include <microhttpd.h>
-#endif
-
-#include <QClipboard>
-#include <QSysInfo>
-#include <QHBoxLayout>
-#include <QPainter>
-#include <QBrush>
-#include <QMessageBox>
-#include <QStyle>
-#include <assert.h>
 
 AboutDialog::AboutDialog(QWidget* parent)
-: QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint)
+	: QDialog(parent,Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint)
 {
-    setupUi(this);
-
-    QHBoxLayout* l = new QHBoxLayout();
-    l->setMargin(0);
-    l->addStretch(1);
-    l->addStretch(1);
-    frame->setContentsMargins(0, 0, 0, 0);
-    frame->setLayout(l);
-    tWidget = NULL;
-    installAWidget();
-
-    updateTitle();
-
 #ifdef Q_OS_WIN
     setWindowFlags(windowFlags() | Qt::MSWindowsFixedSizeDialogHint);
 #endif
-}
 
-void AboutDialog::installAWidget() {
-    assert(tWidget == NULL);
-    AWidget* aWidget = new AWidget();
-    QVBoxLayout* l = (QVBoxLayout*)frame->layout();
-    l->insertWidget(0, aWidget);
-    l->setStretchFactor(aWidget, 100);
-}
+    setupUi(this) ;
 
-void AboutDialog::installTWidget() {
-    assert(tWidget == NULL);
-    tWidget = new TBoard();
-    QLabel* npLabel = new NextPieceLabel(tWidget);
-    tWidget->setNextPieceLabel(npLabel);
-
-    QWidget* pan = new QWidget();
-    QVBoxLayout* vl = new QVBoxLayout(pan);
-    QLabel* topRecLabel = new QLabel(tr("Max score: %1").arg(tWidget->getMaxScore()));
-    QLabel* scoreLabel = new QLabel(pan);
-    QLabel* levelLabel = new QLabel(pan);
-    vl->addStretch();
-    vl->addWidget(topRecLabel);
-    vl->addStretch();
-    vl->addWidget(npLabel);
-    vl->addStretch();
-    vl->addWidget(scoreLabel);
-    vl->addWidget(levelLabel);
-    vl->addStretch();
-
-    QHBoxLayout* l = (QHBoxLayout*)frame->layout();
-    l->insertWidget(0, pan);
-    l->insertWidget(0, tWidget);
-    QRect cRect = frame->contentsRect();
-    int height = tWidget->heightForWidth(cRect.width());
-    tWidget->setFixedSize(cRect.width() * cRect.height() / height, cRect.height());
-    npLabel->setFixedSize(tWidget->squareWidth()*4, tWidget->squareHeight()*5);
-    l->setStretchFactor(tWidget, 100);
-    connect(tWidget, SIGNAL(scoreChanged(int)), SLOT(sl_scoreChanged(int)));
-    connect(tWidget, SIGNAL(levelChanged(int)), SLOT(sl_levelChanged(int)));
-    connect(this, SIGNAL(si_scoreChanged(QString)), scoreLabel, SLOT(setText(QString)));
-    connect(this, SIGNAL(si_levelChanged(QString)), levelLabel, SLOT(setText(QString)));
-    tWidget->setFocus();
-    tWidget->start();
-}
-
-void AboutDialog::switchPages() {
-    QLayoutItem* li = NULL;
-    QLayout* l = frame->layout();
-    while ((li = l->takeAt(0)) && li->widget()) {
-        li->widget()->deleteLater();
-    }
-    if (tWidget==NULL) {
-        installTWidget();
-    } else {
-        tWidget = NULL;
-        installAWidget();
-    }
-    updateTitle();
-}
-
-void AboutDialog::sl_scoreChanged(int sc) {
-    emit si_scoreChanged(tr("Score: %1").arg(sc));
-}
-
-void AboutDialog::sl_levelChanged(int level) {
-    emit si_levelChanged(tr("Level: %1").arg(level));
-}
-
-void AboutDialog::updateTitle()
-{
-    if (tWidget == NULL) 
-    {
-        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), Rshare::retroshareVersion(true)));
-    }
-    else
-    {
-        setWindowTitle(tr("Have fun ;-)"));
-    }
-}
-
-void AboutDialog::keyPressEvent(QKeyEvent *e) {
-    if (e->key() == Qt::Key_T) {
-        switchPages();
-    } else if (tWidget!=NULL && (e->key() == Qt::Key_P || e->key() == Qt::Key_Pause)) {
-        tWidget->pause();
-    }
-    QDialog::keyPressEvent(e);
-}
-
-void AboutDialog::mousePressEvent(QMouseEvent *e) {
-    QPoint globalPos = mapToGlobal(e->pos());
-    QPoint framePos = frame->mapFromGlobal(globalPos);
-    if (frame->contentsRect().contains(framePos)) {
-        switchPages();
-    }
-    QDialog::mousePressEvent(e);
-}
-
-void AboutDialog::on_help_button_clicked()
-{
-    HelpDialog helpdlg (this);
-    helpdlg.exec();
-}
-
-AWidget::AWidget() {
-    setMouseTracking(true);
-
-    QImage image(":/images/logo/logo_info.png");
-    QPainter p(&image);
-    p.setPen(Qt::black);
-    QFont font = p.font();
-    font.setBold(true);
-    font.setPointSizeF(font.pointSizeF() + 2);
-    p.setFont(font);
-
-    /* Draw RetroShare version */
-    p.drawText(QRect(10, 10, width()-10, 60), QString("%1 : \n%2").arg(tr("RetroShare version"), Rshare::retroshareVersion(true)));
-
-    /* Draw Qt's version number */
-    p.drawText(QRect(10, 50, width()-10, 60), QString("Qt %1 : \n%2").arg(tr("version"), QT_VERSION_STR));
-
-    p.end();
-
-    image1 = image2 = image;
-    setFixedSize(image1.size());
-
-    int w = image1.width();
-    int h = image1.height();
-    heightField1.resize(w*h);
-    heightField2.resize(w*h);
-
-    density = 5;
-    page = 0;
-
-    startTimer(15);
+    QObject::connect(widget->close_button,SIGNAL(clicked()),this,SLOT(close()));
 }
 
 
-void AWidget::timerEvent(QTimerEvent* e) {
-    drawWater((QRgb*)image1.bits(), (QRgb*)image2.bits());
-    calcWater(page, density);
-    page ^= 1;
-
-    if (qrand()  % 128 == 0) {
-        int r = 3 + qRound((double) qrand() * 4 / RAND_MAX);
-        int h = 300 + qrand() * 200 / RAND_MAX;
-        int x = 1 + r + qrand()%(image1.width() -2*r-1);
-        int y = 1 + r + qrand()%(image1.height()-2*r-1);
-        addBlob(x, y, r, h);
-    }
-
-    update();
-    QObject::timerEvent(e);
-}
-
-
-void AWidget::paintEvent(QPaintEvent* e) {
-    QWidget::paintEvent(e);
-    
-    QPainter p(this);
-    p.drawImage(0, 0, image2);
-}
-
-void AWidget::mouseMoveEvent(QMouseEvent* e) {
-    QPoint point = e->pos();
-    addBlob(point.x() - 15,point.y(), 5, 400);
-}
-
-
-void AWidget::calcWater(int npage, int density) { 
-    int w = image1.width();
-    int h = image1.height();
-    int count = w + 1;
-
-
-    // Set up the pointers
-    int *newptr;
-    int *oldptr;
-    if(npage == 0) {
-        newptr = &heightField1.front();
-        oldptr = &heightField2.front();
-    } else {
-        newptr = &heightField2.front();
-        oldptr = &heightField1.front();
-    }
-
-    for (int y = (h-1)*w; count < y; count += 2) {
-        for (int x = count+w-2; count < x; ++count) {
-            // This does the eight-pixel method.  It looks much better.
-            int newh  = ((oldptr[count + w]
-            + oldptr[count - w]
-            + oldptr[count + 1]
-            + oldptr[count - 1]
-            + oldptr[count - w - 1]
-            + oldptr[count - w + 1]
-            + oldptr[count + w - 1]
-            + oldptr[count + w + 1]
-            ) >> 2 ) - newptr[count];
-
-            newptr[count] =  newh - (newh >> density);
-        }
-    }
-}
-
-void AWidget::addBlob(int x, int y, int radius, int height) {
-    int w = image1.width();
-    int h = image1.height();
-
-    // Set up the pointers
-    int *newptr;
-//    int *oldptr;
-    if (page == 0) {
-        newptr = &heightField1.front();
-//        oldptr = &heightField2.front();
-    } else {
-        newptr = &heightField2.front();
-//        oldptr = &heightField1.front();
-    }
-
-    int rquad = radius * radius;
-
-    int left=-radius, right = radius;
-    int top=-radius, bottom = radius;
-
-    // Perform edge clipping...
-    if (x - radius < 1) left -= (x-radius-1);
-    if (y - radius < 1) top  -= (y-radius-1);
-    if (x + radius > w-1) right -= (x+radius-w+1);
-    if (y + radius > h-1) bottom-= (y+radius-h+1);
-
-    for(int cy = top; cy < bottom; ++cy) {
-        int cyq = cy*cy;
-        for(int cx = left; cx < right; ++cx) {
-            if (cx*cx + cyq < rquad) {
-                newptr[w*(cy+y) + (cx+x)] += height;
-            }
-        }
-    }
-}
-
-
-void AWidget::drawWater(QRgb* srcImage,QRgb* dstImage) {
-    int w = image1.width();
-    int h = image1.height();
-
-    int offset = w + 1;
-    int lIndex;
-    int lBreak = w * h;
-
-    int *ptr = &heightField1.front();
-
-    for (int y = (h-1)*w; offset < y; offset += 2) {
-        for (int x = offset+w-2; offset < x; ++offset) {
-            int dx = ptr[offset] - ptr[offset+1];
-            int dy = ptr[offset] - ptr[offset+w];
-
-            lIndex = offset + w*(dy>>3) + (dx>>3);
-            if(lIndex < lBreak && lIndex > 0) {
-                QRgb c = srcImage[lIndex];
-                c = shiftColor(c, dx);
-                dstImage[offset] = c;
-            }
-            ++offset;
-            dx = ptr[offset] - ptr[offset+1];
-            dy = ptr[offset] - ptr[offset+w];
-
-            lIndex = offset + w*(dy>>3) + (dx>>3);
-            if(lIndex < lBreak && lIndex > 0) {
-                QRgb c = srcImage[lIndex];
-                c = shiftColor(c, dx);
-                dstImage[offset] = c;
-            }
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////
-// T
-TBoard::TBoard(QWidget *parent) {
-    Q_UNUSED(parent);
-    
-    setFocusPolicy(Qt::StrongFocus);
-    isStarted = false;
-    isWaitingAfterLine = false;
-    numLinesRemoved = 0;
-    numPiecesDropped = 0;
-    isPaused = false;
-    clearBoard();
-    nextPiece.setRandomShape();
-    score = 0;
-    level = 0;
-    curX = 0;
-    curY = 0;
-
-    maxScore = Settings->value("/about/maxsc").toInt();
-}
-TBoard::~TBoard() {
-    int oldMax = Settings->value("/about/maxsc").toInt();
-    int newMax = qMax(maxScore, score);
-    if (oldMax < newMax) {
-        Settings->setValue("/about/maxsc", newMax);
-    }
-}
-
-int TBoard::heightForWidth ( int w ) const {
-    return qRound(BoardHeight * float(w)/BoardWidth);
-}
-
-
-void TBoard::start() {
-    if (isPaused) {
-        return;
-    }
-
-    isStarted = true;
-    isWaitingAfterLine = false;
-    numLinesRemoved = 0;
-    numPiecesDropped = 0;
-    maxScore = qMax(score, maxScore);
-    score = 0;
-    level = 1;
-    clearBoard();
-
-    emit linesRemovedChanged(numLinesRemoved);
-    emit scoreChanged(score);
-    emit levelChanged(level);
-
-    newPiece();
-    timer.start(timeoutTime(), this);
-}
-
-void TBoard::pause() {
-    if (!isStarted) {
-        return;
-    }
-
-    isPaused = !isPaused;
-    if (isPaused) {
-        timer.stop();
-    } else {
-        timer.start(timeoutTime(), this);
-    }
-    update();
-}
-
-void TBoard::paintEvent(QPaintEvent *event) {
-    QWidget::paintEvent(event);
-
-    QPainter painter(this);
-    
-    painter.setPen(Qt::black);
-    painter.drawRect(frameRect());  
-    QRect rect = boardRect();
-    painter.fillRect(rect, Qt::white);
-    
-    if (isPaused) {
-        painter.drawText(rect, Qt::AlignCenter, tr("Pause"));
-        return;
-    }
-
-    int boardTop = rect.bottom() - BoardHeight*squareHeight();
-
-    for (int i = 0; i < BoardHeight; ++i) {
-        for (int j = 0; j < BoardWidth; ++j) {
-            TPiece::Shape shape = shapeAt(j, BoardHeight - i - 1);
-            if (shape != TPiece::NoShape) {
-                drawSquare(painter, rect.left() + j * squareWidth(), boardTop + i * squareHeight(), shape);
-            }
-        }
-    }
-    if (curPiece.shape() != TPiece::NoShape) {
-        for (int i = 0; i < 4; ++i) {
-            int x = curX + curPiece.x(i);
-            int y = curY - curPiece.y(i);
-            drawSquare(painter, rect.left() + x * squareWidth(), boardTop + (BoardHeight - y - 1) * squareHeight(), curPiece.shape());
-        }
-    }
-}
-
-void TBoard::keyPressEvent(QKeyEvent *event) {
-    if (!isStarted || isPaused || curPiece.shape() == TPiece::NoShape) {
-        QWidget::keyPressEvent(event);
-        return;
-    }
-
-    switch (event->key()) {
-    case Qt::Key_Left:
-        tryMove(curPiece, curX - 1, curY);
-        break;
-    case Qt::Key_Right:
-        tryMove(curPiece, curX + 1, curY);
-        break;
-    case Qt::Key_Down:
-        tryMove(curPiece.rotatedRight(), curX, curY);
-        break;
-    case Qt::Key_Up:
-        tryMove(curPiece.rotatedLeft(), curX, curY);
-        break;
-    case Qt::Key_Space:
-        dropDown();
-        break;
-    case Qt::Key_Control:
-        oneLineDown();
-        break;
-    default:
-        QWidget::keyPressEvent(event);
-    }
-}
-
-void TBoard::timerEvent(QTimerEvent *event) {
-    if (event->timerId() == timer.timerId()) {
-        if (isWaitingAfterLine) {
-            isWaitingAfterLine = false;
-            newPiece();
-            timer.start(timeoutTime(), this);
-        } else {
-            oneLineDown();
-        }
-    } else {
-        QWidget::timerEvent(event);
-    }
-}
-void TBoard::clearBoard() {
-    for (int i = 0; i < BoardHeight * BoardWidth; ++i) {
-        board[i] = TPiece::NoShape;
-    }
-}
-
-void TBoard::dropDown() {
-    int dropHeight = 0;
-    int newY = curY;
-    while (newY > 0) {
-        if (!tryMove(curPiece, curX, newY - 1)) {
-            break;
-        }
-        newY--;
-        ++dropHeight;
-    }
-    pieceDropped(dropHeight);
-}
-void TBoard::oneLineDown() {
-    if (!tryMove(curPiece, curX, curY - 1))
-        pieceDropped(0);
-}
-void TBoard::pieceDropped(int dropHeight) {
-    for (int i = 0; i < 4; ++i) {
-        int x = curX + curPiece.x(i);
-        int y = curY - curPiece.y(i);
-        shapeAt(x, y) = curPiece.shape();
-    }
-
-    ++numPiecesDropped;
-    if (numPiecesDropped % 50 == 0) {
-        ++level;
-        timer.start(timeoutTime(), this);
-        emit levelChanged(level);
-    }
-
-    score += dropHeight + 7;
-    emit scoreChanged(score);
-    removeFullLines();
-
-    if (!isWaitingAfterLine) {
-        newPiece();
-    }
-}
-
-void TBoard::removeFullLines() {
-    int numFullLines = 0;
-
-    for (int i = BoardHeight - 1; i >= 0; --i) {
-        bool lineIsFull = true;
-
-        for (int j = 0; j < BoardWidth; ++j) {
-            if (shapeAt(j, i) == TPiece::NoShape) {
-                lineIsFull = false;
-                break;
-            }
-        }
-
-        if (lineIsFull) {
-            ++numFullLines;
-            for (int k = i; k < BoardHeight - 1; ++k) {
-                for (int j = 0; j < BoardWidth; ++j) {
-                    shapeAt(j, k) = shapeAt(j, k + 1);
-                }
-            }
-            for (int j = 0; j < BoardWidth; ++j) {
-                shapeAt(j, BoardHeight - 1) = TPiece::NoShape;
-            }
-        }
-    }
-
-    if (numFullLines > 0) {
-        numLinesRemoved += numFullLines;
-        score += 10 * numFullLines;
-        emit linesRemovedChanged(numLinesRemoved);
-        emit scoreChanged(score);
-
-        timer.start(500, this);
-        isWaitingAfterLine = true;
-        curPiece.setShape(TPiece::NoShape);
-        update();
-    }
-}
-void TBoard::newPiece() {
-    curPiece = nextPiece;
-    nextPiece.setRandomShape();
-    showNextPiece();
-    curX = BoardWidth / 2 + 1;
-    curY = BoardHeight - 1 + curPiece.minY();
-
-    if (!tryMove(curPiece, curX, curY)) {
-        curPiece.setShape(TPiece::NoShape);
-        timer.stop();
-        isStarted = false;
-    }
-}
-
-void TBoard::showNextPiece() {
-    if (!nextPieceLabel) {
-        return;
-    }
-
-    int dx = nextPiece.maxX() - nextPiece.minX() + 1;
-    int dy = nextPiece.maxY() - nextPiece.minY() + 1;
-
-    QPixmap pixmap(dx * squareWidth(), dy * squareHeight());
-    QPainter painter(&pixmap);
-    painter.fillRect(pixmap.rect(), nextPieceLabel->palette().background());
-
-    for (int i = 0; i < 4; ++i) {
-        int x = nextPiece.x(i) - nextPiece.minX();
-        int y = nextPiece.y(i) - nextPiece.minY();
-        drawSquare(painter, x * squareWidth(), y * squareHeight(), nextPiece.shape());
-    }
-    nextPieceLabel->setPixmap(pixmap);
-}
-
-bool TBoard::tryMove(const TPiece &newPiece, int newX, int newY) {
-    for (int i = 0; i < 4; ++i) {
-        int x = newX + newPiece.x(i);
-        int y = newY - newPiece.y(i);
-        if (x < 0 || x >= BoardWidth || y < 0 || y >= BoardHeight) {
-            return false;
-        }
-        if (shapeAt(x, y) != TPiece::NoShape) {
-            return false;
-        }
-    }
-
-    curPiece = newPiece;
-    curX = newX;
-    curY = newY;
-    update();
-    return true;
-}
-
-void TBoard::drawSquare(QPainter &painter, int x, int y, TPiece::Shape shape) {
-    static const QRgb colorTable[8] = { 0x000000, 0xCC6666, 0x66CC66, 0x6666CC, 0xCCCC66, 0xCC66CC, 0x66CCCC, 0xDAAA00};
-
-    QColor color = colorTable[int(shape)];
-    painter.fillRect(x + 1, y + 1, squareWidth() - 2, squareHeight() - 2, color);
-
-    painter.setPen(color.light());
-    painter.drawLine(x, y + squareHeight() - 1, x, y);
-    painter.drawLine(x, y, x + squareWidth() - 1, y);
-
-    painter.setPen(color.dark());
-    painter.drawLine(x + 1, y + squareHeight() - 1, x + squareWidth() - 1, y + squareHeight() - 1);
-    painter.drawLine(x + squareWidth() - 1, y + squareHeight() - 1, x + squareWidth() - 1, y + 1);
-}
-
-
-void TPiece::setRandomShape() {
-    setShape(TPiece::Shape(qrand() % 7 + 1));
-}
-
-
-void TPiece::setShape(TPiece::Shape shape) {
-    static const int coordsTable[8][4][2] = {
-        { { 0, 0 },   { 0, 0 },   { 0, 0 },   { 0, 0 } },
-        { { 0, -1 },  { 0, 0 },   { -1, 0 },  { -1, 1 } },
-        { { 0, -1 },  { 0, 0 },   { 1, 0 },   { 1, 1 } },
-        { { 0, -1 },  { 0, 0 },   { 0, 1 },   { 0, 2 } },
-        { { -1, 0 },  { 0, 0 },   { 1, 0 },   { 0, 1 } },
-        { { 0, 0 },   { 1, 0 },   { 0, 1 },   { 1, 1 } },
-        { { -1, -1 }, { 0, -1 },  { 0, 0 },   { 0, 1 } },
-        { { 1, -1 },  { 0, -1 },  { 0, 0 },   { 0, 1 } }
-    };
-
-    for (int i = 0; i < 4 ; i++) {
-        for (int j = 0; j < 2; ++j) {
-            coords[i][j] = coordsTable[shape][i][j];
-        }
-    }
-    pieceShape = shape;
-}
-int TPiece::minX() const {
-    int min = coords[0][0];
-    for (int i = 1; i < 4; ++i) {
-        min = qMin(min, coords[i][0]);
-    }
-    return min;
-}
-
-int TPiece::maxX() const {
-    int max = coords[0][0];
-    for (int i = 1; i < 4; ++i) {
-        max = qMax(max, coords[i][0]);
-    }
-    return max;
-}
-
-int TPiece::minY() const {
-    int min = coords[0][1];
-    for (int i = 1; i < 4; ++i) {
-        min = qMin(min, coords[i][1]);
-    }
-    return min;
-}
-
-int TPiece::maxY() const {
-    int max = coords[0][1];
-    for (int i = 1; i < 4; ++i) {
-        max = qMax(max, coords[i][1]);
-    }
-    return max;
-}
-
-TPiece TPiece::rotatedLeft() const {
-    if (pieceShape == SquareShape) {
-        return *this;
-    }
-
-    TPiece result;
-    result.pieceShape = pieceShape;
-    for (int i = 0; i < 4; ++i) {
-        result.setX(i, y(i));
-        result.setY(i, -x(i));
-    }
-    return result;
-}
-
-TPiece TPiece::rotatedRight() const {
-    if (pieceShape == SquareShape) {
-        return *this;
-    }
-    TPiece result;
-    result.pieceShape = pieceShape;
-    for (int i = 0; i < 4; ++i) {
-        result.setX(i, -y(i));
-        result.setY(i, x(i));
-    }
-    return result;
-}
-
-NextPieceLabel::NextPieceLabel( QWidget* parent /* = 0*/ ) : QLabel(parent)
-{
-    QPalette p = palette();
-    p.setColor(QPalette::Background, Qt::white);
-    setPalette(p);
-    setFrameShape(QFrame::Box);
-    setAlignment(Qt::AlignCenter);
-    setAutoFillBackground(true);
-}
-
-static QString addLibraries(const std::string &name, const std::list<RsLibraryInfo> &libraries)
-{
-    QString mTextEdit;
-    mTextEdit+=QString::fromUtf8(name.c_str());
-    mTextEdit+="\n";
-
-    std::list<RsLibraryInfo>::const_iterator libraryIt;
-    for (libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt) {
-
-        mTextEdit+=" - ";
-        mTextEdit+=QString::fromUtf8(libraryIt->mName.c_str());
-        mTextEdit+=": ";
-        mTextEdit+=QString::fromUtf8(libraryIt->mVersion.c_str());
-        mTextEdit+="\n";
-    }
-    mTextEdit+="\n";
-    return mTextEdit;
-}
-
-
-void AboutDialog::on_copy_button_clicked()
-{
-    QString verInfo;
-    QString rsVerString = "RetroShare Version: ";
-    rsVerString+=Rshare::retroshareVersion(true);
-    verInfo+=rsVerString;
-    verInfo+="\n";
-
-
-#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
-	#if QT_VERSION >= QT_VERSION_CHECK (5, 4, 0)
-		verInfo+=QSysInfo::prettyProductName();
-	#endif
-#else
-	#ifdef Q_OS_LINUX
-	verInfo+="Linux";
-	#endif
-	#ifdef Q_OS_WIN
-	verInfo+="Windows";
-	#endif
-	#ifdef Q_OS_MAC
-	verInfo+="Mac";
-	#endif
-#endif
-	verInfo+=" ";
-    QString qtver = QString("QT ")+QT_VERSION_STR;
-    verInfo+=qtver;
-    verInfo+="\n\n";
-
-    /* Add version numbers of libretroshare */
-    std::list<RsLibraryInfo> libraries;
-    RsControl::instance()->getLibraries(libraries);
-    verInfo+=addLibraries("libretroshare", libraries);
-
-#ifdef ENABLE_WEBUI
-    /* Add version numbers of RetroShare */
-    // Add versions here. Find a better place.
-    libraries.clear();
-    libraries.push_back(RsLibraryInfo("Libmicrohttpd", MHD_get_version()));
-    verInfo+=addLibraries("RetroShare", libraries);
-#endif // ENABLE_WEBUI
-
-    /* Add version numbers of plugins */
-    if (rsPlugins) {
-        for (int i = 0; i < rsPlugins->nbPlugins(); ++i) {
-            RsPlugin *plugin = rsPlugins->plugin(i);
-            if (plugin) {
-                libraries.clear();
-                plugin->getLibraries(libraries);
-                verInfo+=addLibraries(plugin->getPluginName(), libraries);
-            }
-        }
-    }
-
-
-    QApplication::clipboard()->setText(verInfo);
-}
diff --git a/retroshare-gui/src/gui/AboutDialog.h b/retroshare-gui/src/gui/AboutDialog.h
index c0095699b..6b1d19ed1 100644
--- a/retroshare-gui/src/gui/AboutDialog.h
+++ b/retroshare-gui/src/gui/AboutDialog.h
@@ -20,186 +20,17 @@
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
-#ifndef _GB2_ABOUT_DIALOG_
-#define _GB2_ABOUT_DIALOG_
+#pragma once
 
 #include "ui_AboutDialog.h"
-
-#include <QBasicTimer>
-#include <QPointer>
+#include "AboutWidget.h"
 
 #include <QDialog>
-#include <QLabel>
-#include <QPaintEvent>
-#include <QKeyEvent>
-#include <QMouseEvent>
 
-
-class AWidget;
-class TBoard;
-class NextPieceLabel;
-
-class AboutDialog : public QDialog, public Ui::AboutDialog 
+class AboutDialog : public QDialog, public Ui::AboutDialog
 {
-    Q_OBJECT
 public:
-    AboutDialog(QWidget *parent = 0);
-
-private slots:
-    void sl_scoreChanged(int);
-    void sl_levelChanged(int);
-    void on_help_button_clicked();
-
-    void on_copy_button_clicked();
-
-signals:
-    void si_scoreChanged(QString);
-    void si_maxScoreChanged(QString);
-    void si_levelChanged(QString);
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-private:
-    void switchPages();
-    void installAWidget();
-    void installTWidget();
-    void updateTitle();
-
-    TBoard*     tWidget;
+    AboutDialog(QWidget *parent = NULL);
+    virtual ~AboutDialog() {}
 };
 
-//////////////////////////////////////////////////////////////////////////
-// A
-class AWidget : public QWidget {
-    Q_OBJECT
-
-public:
-    AWidget();
-
-protected:
-    void timerEvent(QTimerEvent* e);
-    void paintEvent(QPaintEvent* e);
-    void mouseMoveEvent(QMouseEvent* e);
-  
-private:
-    void calcWater(int npage, int density);
-
-    void addBlob(int x, int y, int radius, int height);
-
-    void drawWater(QRgb* srcImage, QRgb* dstImage);
-
-    static QRgb shiftColor(QRgb color,int shift) {
-        return qRgb(qBound(0, qRed(color) - shift,  255),
-            qBound(0, qGreen(color) - shift,255),
-            qBound(0, qBlue(color) - shift, 255));
-    }
-
-    int			    page;
-    int			    density;
-    QVector<int>    heightField1;
-    QVector<int>    heightField2;
-    QImage          image1;
-    QImage          image2;
-};
-
-//////////////////////////////////////////////////////////////////////////
-// T
-
-class TPiece {
-public:
-    enum Shape { NoShape, ZShape, SShape, LineShape, TShape, SquareShape, LShape, MirroredLShape };
-
-    TPiece() { setShape(NoShape); }
-
-    void setRandomShape();
-    void setShape(Shape shape);
-
-    Shape shape() const { return pieceShape; }
-    int x(int index) const { return coords[index][0]; }
-    int y(int index) const { return coords[index][1]; }
-    int minX() const;
-    int maxX() const;
-    int minY() const;
-    int maxY() const;
-    TPiece rotatedLeft() const;
-    TPiece rotatedRight() const;
-
-private:
-    void setX(int index, int x) { coords[index][0] = x; }
-    void setY(int index, int y) { coords[index][1] = y; }
-
-    Shape pieceShape;
-    int coords[4][2];
-};
-
-class TBoard : public QWidget {
-    Q_OBJECT
-
-public:
-    TBoard(QWidget *parent = 0);
-    ~TBoard();
-    int heightForWidth ( int w ) const;
-    int getScore() const {return score;}
-    int getMaxScore() const {return qMax(maxScore, score);}
-    int getLevel() const {return level;}
-    void setNextPieceLabel(QLabel *label) {nextPieceLabel = label;}
-    int squareWidth() const { return  boardRect().width()  / BoardWidth; }
-    int squareHeight() const { return boardRect().height() / BoardHeight; }
-
-public slots:
-    void start();
-    void pause();
-    
-signals:
-    void scoreChanged(int score);
-    void levelChanged(int level);
-    void linesRemovedChanged(int numLines);
-
-protected:
-    void paintEvent(QPaintEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-    void timerEvent(QTimerEvent *event);
-
-private:
-
-    enum { BoardWidth = 10, BoardHeight = 22 };
-
-    TPiece::Shape &shapeAt(int x, int y) { return board[(y * BoardWidth) + x]; }
-    int timeoutTime() const { return 1000 / (1 + level); }
-    QRect boardRect() const {return QRect(1, 1, width()-2, height()-2);}
-    QRect frameRect() const {return QRect(0, 0, width()-1, height()-1);}
-    void clearBoard();
-    void dropDown();
-    void oneLineDown();
-    void pieceDropped(int dropHeight);
-    void removeFullLines();
-    void newPiece();
-    void showNextPiece();
-    bool tryMove(const TPiece &newPiece, int newX, int newY);
-    void drawSquare(QPainter &painter, int x, int y, TPiece::Shape shape);
-
-    QBasicTimer timer;
-    QPointer<QLabel> nextPieceLabel;
-    bool isStarted;
-    bool isPaused;
-    bool isWaitingAfterLine;
-    TPiece curPiece;
-    TPiece nextPiece;
-    int curX;
-    int curY;
-    int numLinesRemoved;
-    int numPiecesDropped;
-    int score;
-    int maxScore;
-    int level;
-    TPiece::Shape board[BoardWidth * BoardHeight];
-};
-
-class NextPieceLabel : public QLabel {
-public:
-    NextPieceLabel(QWidget* parent = 0);
-};
-
-
-#endif
diff --git a/retroshare-gui/src/gui/AboutDialog.ui b/retroshare-gui/src/gui/AboutDialog.ui
index d279f801c..9e5bb9bc1 100644
--- a/retroshare-gui/src/gui/AboutDialog.ui
+++ b/retroshare-gui/src/gui/AboutDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>271</width>
+    <width>422</width>
     <height>376</height>
    </rect>
   </property>
@@ -36,85 +36,20 @@
     <number>9</number>
    </property>
    <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="help_button">
-       <property name="text">
-        <string>About</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="copy_button">
-       <property name="text">
-        <string>Copy Info</string>
-       </property>
-       <property name="icon">
-        <iconset resource="images.qrc">
-         <normaloff>:/images/copy.png</normaloff>:/images/copy.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="close_button">
-       <property name="text">
-        <string>close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="AboutWidget" name="widget" native="true"/>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AboutWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">gui/AboutWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="images.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>close_button</sender>
-   <signal>clicked()</signal>
-   <receiver>AboutDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>243</x>
-     <y>281</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>145</x>
-     <y>187</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
new file mode 100644
index 000000000..f2ef6aac8
--- /dev/null
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -0,0 +1,989 @@
+/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2009, RetroShare Team
+ * Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru)
+ *
+ *  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.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#include "AboutDialog.h"
+#include "HelpDialog.h"
+#include "rshare.h"
+
+#include <retroshare/rsiface.h>
+#include <retroshare/rsplugin.h>
+#include <retroshare/rsdisc.h>
+#include <retroshare/rspeers.h>
+#include "settings/rsharesettings.h"
+
+#ifdef ENABLE_WEBUI
+#include <microhttpd.h>
+#endif
+
+#include <QClipboard>
+#include <QSysInfo>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QBrush>
+#include <QMessageBox>
+#include <QStyle>
+#include <assert.h>
+
+AboutWidget::AboutWidget(QWidget* parent)
+: QWidget(parent)
+{
+    setupUi(this);
+
+    QHBoxLayout* l = new QHBoxLayout();
+    l->setMargin(0);
+    l->addStretch(1);
+    l->addStretch(1);
+    frame->setContentsMargins(0, 0, 0, 0);
+    frame->setLayout(l);
+    tWidget = NULL;
+    aWidget = NULL;
+    installAWidget();
+
+    updateTitle();
+
+    QObject::connect(help_button,SIGNAL(clicked()),this,SLOT(on_help_button_clicked()));
+    QObject::connect(copy_button,SIGNAL(clicked()),this,SLOT(on_copy_button_clicked()));
+}
+
+void AboutWidget::installAWidget() {
+    assert(tWidget == NULL);
+    aWidget = new AWidget();
+    QVBoxLayout* l = (QVBoxLayout*)frame->layout();
+    l->insertWidget(0, aWidget);
+    l->setStretchFactor(aWidget, 100);
+    aWidget->setFocus();
+
+    delete tWidget ;
+    tWidget = NULL;
+}
+
+void AboutWidget::installTWidget() {
+    assert(tWidget == NULL);
+    tWidget = new TBoard();
+    QLabel* npLabel = new NextPieceLabel(tWidget);
+    tWidget->setNextPieceLabel(npLabel);
+
+    QWidget* pan = new QWidget();
+    QVBoxLayout* vl = new QVBoxLayout(pan);
+    QLabel* topRecLabel = new QLabel(tr("Max score: %1").arg(tWidget->getMaxScore()));
+    QLabel* scoreLabel = new QLabel(pan);
+    QLabel* levelLabel = new QLabel(pan);
+    vl->addStretch();
+    vl->addWidget(topRecLabel);
+    vl->addStretch();
+    vl->addWidget(npLabel);
+    vl->addStretch();
+    vl->addWidget(scoreLabel);
+    vl->addWidget(levelLabel);
+    vl->addStretch();
+
+    QHBoxLayout* l = (QHBoxLayout*)frame->layout();
+    l->insertWidget(0, pan);
+    l->insertWidget(0, tWidget);
+    QRect cRect = frame->contentsRect();
+    int height = tWidget->heightForWidth(cRect.width());
+    tWidget->setFixedSize(cRect.width() * cRect.height() / height, cRect.height());
+    npLabel->setFixedSize(tWidget->squareWidth()*4, tWidget->squareHeight()*5);
+    l->setStretchFactor(tWidget, 100);
+    connect(tWidget, SIGNAL(scoreChanged(int)), SLOT(sl_scoreChanged(int)));
+    connect(tWidget, SIGNAL(levelChanged(int)), SLOT(sl_levelChanged(int)));
+    connect(this, SIGNAL(si_scoreChanged(QString)), scoreLabel, SLOT(setText(QString)));
+    connect(this, SIGNAL(si_levelChanged(QString)), levelLabel, SLOT(setText(QString)));
+    tWidget->setFocus();
+    tWidget->start();
+
+    delete aWidget ;
+    aWidget = NULL;
+}
+
+void AboutWidget::switchPages() {
+    QLayoutItem* li = NULL;
+    QLayout* l = frame->layout();
+    while ((li = l->takeAt(0)) && li->widget()) {
+        li->widget()->deleteLater();
+    }
+    if (tWidget==NULL) {
+        installTWidget();
+    } else {
+        tWidget = NULL;
+        installAWidget();
+    }
+    updateTitle();
+}
+
+void AboutWidget::sl_scoreChanged(int sc) {
+    emit si_scoreChanged(tr("Score: %1").arg(sc));
+}
+
+void AboutWidget::sl_levelChanged(int level) {
+    emit si_levelChanged(tr("Level: %1").arg(level));
+}
+
+void AboutWidget::updateTitle()
+{
+    if (tWidget == NULL)
+    {
+        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), Rshare::retroshareVersion(true)));
+    }
+    else
+    {
+        setWindowTitle(tr("Have fun ;-)"));
+    }
+}
+
+//void AboutWidget::keyPressEvent(QKeyEvent *e) {
+//    if(aWidget != NULL)
+//        aWidget->keyPressEvent(e) ;
+//}
+
+void AboutWidget::mousePressEvent(QMouseEvent *e)
+{
+    QPoint globalPos = mapToGlobal(e->pos());
+    QPoint framePos = frame->mapFromGlobal(globalPos);
+
+    if (frame->contentsRect().contains(framePos)) {
+		{
+    	if(e->modifiers() & Qt::ControlModifier)
+			switchPages();
+        else
+        {
+            if(aWidget)
+                aWidget->switchState();
+        }
+        }
+    }
+    QWidget::mousePressEvent(e);
+}
+
+void AboutWidget::on_help_button_clicked()
+{
+    HelpDialog helpdlg (this);
+    helpdlg.exec();
+}
+
+void AWidget::switchState()
+{
+		mState = 1 - mState ;
+
+		if(mState == 1)
+		{
+            mStep = 1.0f ;
+			initGoL();
+			drawBitField();
+
+			mTimerId = startTimer(50);
+		}
+        else
+            killTimer(mTimerId);
+
+
+        update();
+
+}
+
+void AWidget::resizeEvent(QResizeEvent *e)
+{
+    mImagesReady = false ;
+}
+
+void AWidget::initImages()
+{
+    if(width() == 0) return ;
+    if(height() == 0) return ;
+
+    image1 = QImage(width(),height(),QImage::Format_ARGB32);
+    image1.fill(palette().color(QPalette::Background));
+
+    //QImage image(":/images/logo/logo_info.png");
+    QPixmap image(":/images/logo/logo_splash.png");
+    QPainter p(&image1);
+    p.setPen(Qt::black);
+    QFont font = p.font();
+    font.setBold(true);
+    font.setPointSizeF(font.pointSizeF() + 2);
+    p.setFont(font);
+
+    //p.drawPixmap(QRect(10, 10, width()-10, 60), image);
+
+    /* Draw RetroShare version */
+    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("RetroShare version"), Rshare::retroshareVersion(true)));
+
+    /* Draw Qt's version number */
+    p.drawText(QPointF(10, 90), QString("Qt %1 : %2").arg(tr("version"), QT_VERSION_STR));
+
+    p.end();
+
+//    setFixedSize(image1.size());
+
+    image2 = image1 ;
+    mImagesReady = true ;
+
+    drawBitField();
+
+    update() ;
+}
+
+void AWidget::initGoL()
+{
+    int w = image1.width();
+    int h = image1.height();
+
+    int s = mStep ; // pixels per cell
+    int bw = w/s ;
+    int bh = h/s ;
+
+    bitfield1.clear();
+
+    bitfield1.resize(bw*bh,0);
+
+    for(int i=0;i<bw;++i)
+        for(int j=0;j<bh;++j)
+            if((image1.pixel((i+0.0)*s,(j+0.0)*s) & 0xff) < 0x80)
+                bitfield1[i+bw*j] = 1 ;
+}
+
+void AWidget::drawBitField()
+{
+    image2.fill(palette().color(QPalette::Background));
+    QPainter p(&image2) ;
+
+    p.setPen(QColor(200,200,200));
+
+    int w = image1.width();
+    int h = image1.height();
+
+    int s = mStep ; // pixels per cell
+    int bw = w/s ;
+    int bh = h/s ;
+
+    if(bitfield1.size() != (unsigned int)bw*bh)
+        initGoL();
+
+    if(mStep >= mMaxStep)
+	{
+		for(int i=0;i<=bh;++i) p.drawLine(0,i*s,bw*s,i*s) ;
+		for(int i=0;i<=bw;++i) p.drawLine(i*s,0,i*s,bh*s) ;
+	}
+
+    p.setPen(Qt::black);
+
+	for(int i=0;i<bw;++i)
+		for(int j=0;j<bh;++j)
+			if(bitfield1[i+bw*j] == 1)
+                if(mStep >= mMaxStep)
+					p.fillRect(QRect(i*s+1,j*s+1,s-2,s-2),QBrush(QColor(50,50,50)));
+				else
+					p.fillRect(QRect(i*s,j*s,s,s),QBrush(QColor(50,50,50)));
+
+    p.end();
+}
+
+AWidget::AWidget() {
+    setMouseTracking(true);
+
+	density = 5;
+    page = 0;
+    mMaxStep = QFontMetricsF(font()).width(' ') ;
+    mStep = 1.0f ;
+    mState = 0 ;
+    mImagesReady = false ;
+
+//    startTimer(15);
+}
+
+void AWidget::computeNextState()
+{
+	int w = image1.width();
+	int h = image1.height();
+
+	int s = mStep ; // pixels per cell
+	int bw = w/s ;
+	int bh = h/s ;
+
+    if(bitfield1.size() != (unsigned int)bw*bh)
+    {
+        initGoL();
+    }
+
+	bitfield2.clear();
+	bitfield2.resize(bw*bh,0);
+
+	for(int i=0;i<bw;++i)
+		for(int j=0;j<h;++j)
+			if(bitfield1[i+bw*j] == 1)
+				for(int k=-1;k<2;++k)
+					for(int l=-1;l<2;++l)
+						if(k!=0 || l!=0)
+							++bitfield2[ ((i+k+bw)%bw )+ ((j+l+bh)%bh )*bw];
+
+	for(int i=0;i<bh*bw;++i)
+		if(bitfield1[i] == 1)
+			if(bitfield2[i] == 2 || bitfield2[i] == 3)
+				bitfield1[i] = 1;
+			else
+				bitfield1[i] = 0;
+		else
+			if(bitfield2[i] == 3)
+				bitfield1[i] = 1 ;
+
+}
+
+
+void AWidget::timerEvent(QTimerEvent* e)
+{
+    if(mStep >= mMaxStep)
+		computeNextState();
+    else
+    {
+        initGoL();
+        mStep+=0.2f ;
+    }
+
+    drawBitField();
+
+#ifdef REMOVED
+    drawWater((QRgb*)image1.bits(), (QRgb*)image2.bits());
+    calcWater(page, density);
+    page ^= 1;
+
+    if (qrand()  % 128 == 0) {
+        int r = 3 + qRound((double) qrand() * 4 / RAND_MAX);
+        int h = 300 + qrand() * 200 / RAND_MAX;
+        int x = 1 + r + qrand()%(image1.width() -2*r-1);
+        int y = 1 + r + qrand()%(image1.height()-2*r-1);
+        addBlob(x, y, r, h);
+    }
+#endif
+
+    update();
+    QObject::timerEvent(e);
+}
+
+
+void AWidget::paintEvent(QPaintEvent* e)
+{
+	QWidget::paintEvent(e);
+
+		if(!mImagesReady) initImages();
+
+	switch(mState)
+	{
+	default:
+	case 0:
+	{
+		QPainter p(this);
+		p.drawImage(0, 0, image1);
+	}
+		break;
+
+	case 1:
+	{
+		QPainter p(this);
+		p.drawImage(0, 0, image2);
+	}
+		break;
+	}
+}
+
+#ifdef REMOVED
+void AWidget::mouseMoveEvent(QMouseEvent* e) {
+    QPoint point = e->pos();
+    addBlob(point.x() - 15,point.y(), 5, 400);
+}
+
+
+void AWidget::calcWater(int npage, int density) { 
+    int w = image1.width();
+    int h = image1.height();
+    int count = w + 1;
+
+
+    // Set up the pointers
+    int *newptr;
+    int *oldptr;
+    if(npage == 0) {
+        newptr = &bitfield1.front();
+        oldptr = &bitfield2.front();
+    } else {
+        newptr = &bitfield2.front();
+        oldptr = &bitfield1.front();
+    }
+
+    for (int y = (h-1)*w; count < y; count += 2) {
+        for (int x = count+w-2; count < x; ++count) {
+            // This does the eight-pixel method.  It looks much better.
+            int newh  = ((oldptr[count + w]
+            + oldptr[count - w]
+            + oldptr[count + 1]
+            + oldptr[count - 1]
+            + oldptr[count - w - 1]
+            + oldptr[count - w + 1]
+            + oldptr[count + w - 1]
+            + oldptr[count + w + 1]
+            ) >> 2 ) - newptr[count];
+
+            newptr[count] =  newh - (newh >> density);
+        }
+    }
+}
+
+void AWidget::addBlob(int x, int y, int radius, int height) {
+    int w = image1.width();
+    int h = image1.height();
+
+    // Set up the pointers
+    int *newptr;
+//    int *oldptr;
+    if (page == 0) {
+        newptr = &bitfield1.front();
+//        oldptr = &heightField2.front();
+    } else {
+        newptr = &bitfield2.front();
+//        oldptr = &heightField1.front();
+    }
+
+    int rquad = radius * radius;
+
+    int left=-radius, right = radius;
+    int top=-radius, bottom = radius;
+
+    // Perform edge clipping...
+    if (x - radius < 1) left -= (x-radius-1);
+    if (y - radius < 1) top  -= (y-radius-1);
+    if (x + radius > w-1) right -= (x+radius-w+1);
+    if (y + radius > h-1) bottom-= (y+radius-h+1);
+
+    for(int cy = top; cy < bottom; ++cy) {
+        int cyq = cy*cy;
+        for(int cx = left; cx < right; ++cx) {
+            if (cx*cx + cyq < rquad) {
+                newptr[w*(cy+y) + (cx+x)] += height;
+            }
+        }
+    }
+}
+
+
+void AWidget::drawWater(QRgb* srcImage,QRgb* dstImage) {
+    int w = image1.width();
+    int h = image1.height();
+
+    int offset = w + 1;
+    int lIndex;
+    int lBreak = w * h;
+
+    int *ptr = &bitfield1.front();
+
+    for (int y = (h-1)*w; offset < y; offset += 2) {
+        for (int x = offset+w-2; offset < x; ++offset) {
+            int dx = ptr[offset] - ptr[offset+1];
+            int dy = ptr[offset] - ptr[offset+w];
+
+            lIndex = offset + w*(dy>>3) + (dx>>3);
+            if(lIndex < lBreak && lIndex > 0) {
+                QRgb c = srcImage[lIndex];
+                c = shiftColor(c, dx);
+                dstImage[offset] = c;
+            }
+            ++offset;
+            dx = ptr[offset] - ptr[offset+1];
+            dy = ptr[offset] - ptr[offset+w];
+
+            lIndex = offset + w*(dy>>3) + (dx>>3);
+            if(lIndex < lBreak && lIndex > 0) {
+                QRgb c = srcImage[lIndex];
+                c = shiftColor(c, dx);
+                dstImage[offset] = c;
+            }
+        }
+    }
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+// T
+TBoard::TBoard(QWidget *parent) {
+    Q_UNUSED(parent);
+    
+    setFocusPolicy(Qt::StrongFocus);
+    isStarted = false;
+    isWaitingAfterLine = false;
+    numLinesRemoved = 0;
+    numPiecesDropped = 0;
+    isPaused = false;
+    clearBoard();
+    nextPiece.setRandomShape();
+    score = 0;
+    level = 0;
+    curX = 0;
+    curY = 0;
+
+    maxScore = Settings->value("/about/maxsc").toInt();
+}
+TBoard::~TBoard() {
+    int oldMax = Settings->value("/about/maxsc").toInt();
+    int newMax = qMax(maxScore, score);
+    if (oldMax < newMax) {
+        Settings->setValue("/about/maxsc", newMax);
+    }
+}
+
+int TBoard::heightForWidth ( int w ) const {
+    return qRound(BoardHeight * float(w)/BoardWidth);
+}
+
+
+void TBoard::start() {
+    if (isPaused) {
+        return;
+    }
+
+    isStarted = true;
+    isWaitingAfterLine = false;
+    numLinesRemoved = 0;
+    numPiecesDropped = 0;
+    maxScore = qMax(score, maxScore);
+    score = 0;
+    level = 1;
+    clearBoard();
+
+    emit linesRemovedChanged(numLinesRemoved);
+    emit scoreChanged(score);
+    emit levelChanged(level);
+
+    newPiece();
+    timer.start(timeoutTime(), this);
+}
+
+void TBoard::pause() {
+    if (!isStarted) {
+        return;
+    }
+
+    isPaused = !isPaused;
+    if (isPaused) {
+        timer.stop();
+    } else {
+        timer.start(timeoutTime(), this);
+    }
+    update();
+}
+
+void TBoard::paintEvent(QPaintEvent *event) {
+    QWidget::paintEvent(event);
+
+    QPainter painter(this);
+    
+    painter.setPen(Qt::black);
+    painter.drawRect(frameRect());  
+    QRect rect = boardRect();
+    painter.fillRect(rect, Qt::white);
+    
+    if (isPaused) {
+        painter.drawText(rect, Qt::AlignCenter, tr("Pause"));
+        return;
+    }
+
+    int boardTop = rect.bottom() - BoardHeight*squareHeight();
+
+    for (int i = 0; i < BoardHeight; ++i) {
+        for (int j = 0; j < BoardWidth; ++j) {
+            TPiece::Shape shape = shapeAt(j, BoardHeight - i - 1);
+            if (shape != TPiece::NoShape) {
+                drawSquare(painter, rect.left() + j * squareWidth(), boardTop + i * squareHeight(), shape);
+            }
+        }
+    }
+    if (curPiece.shape() != TPiece::NoShape) {
+        for (int i = 0; i < 4; ++i) {
+            int x = curX + curPiece.x(i);
+            int y = curY - curPiece.y(i);
+            drawSquare(painter, rect.left() + x * squareWidth(), boardTop + (BoardHeight - y - 1) * squareHeight(), curPiece.shape());
+        }
+    }
+}
+
+void TBoard::keyPressEvent(QKeyEvent *event) {
+    if (!isStarted || isPaused || curPiece.shape() == TPiece::NoShape) {
+        QWidget::keyPressEvent(event);
+        return;
+    }
+
+    switch (event->key()) {
+    case Qt::Key_Left:
+        tryMove(curPiece, curX - 1, curY);
+        break;
+    case Qt::Key_Right:
+        tryMove(curPiece, curX + 1, curY);
+        break;
+    case Qt::Key_Down:
+        tryMove(curPiece.rotatedRight(), curX, curY);
+        break;
+    case Qt::Key_Up:
+        tryMove(curPiece.rotatedLeft(), curX, curY);
+        break;
+    case Qt::Key_Space:
+        dropDown();
+        break;
+    case Qt::Key_Control:
+        oneLineDown();
+        break;
+    default:
+        QWidget::keyPressEvent(event);
+    }
+}
+
+void TBoard::timerEvent(QTimerEvent *event) {
+    if (event->timerId() == timer.timerId()) {
+        if (isWaitingAfterLine) {
+            isWaitingAfterLine = false;
+            newPiece();
+            timer.start(timeoutTime(), this);
+        } else {
+            oneLineDown();
+        }
+    } else {
+        QWidget::timerEvent(event);
+    }
+}
+void TBoard::clearBoard() {
+    for (int i = 0; i < BoardHeight * BoardWidth; ++i) {
+        board[i] = TPiece::NoShape;
+    }
+}
+
+void TBoard::dropDown() {
+    int dropHeight = 0;
+    int newY = curY;
+    while (newY > 0) {
+        if (!tryMove(curPiece, curX, newY - 1)) {
+            break;
+        }
+        newY--;
+        ++dropHeight;
+    }
+    pieceDropped(dropHeight);
+}
+void TBoard::oneLineDown() {
+    if (!tryMove(curPiece, curX, curY - 1))
+        pieceDropped(0);
+}
+void TBoard::pieceDropped(int dropHeight) {
+    for (int i = 0; i < 4; ++i) {
+        int x = curX + curPiece.x(i);
+        int y = curY - curPiece.y(i);
+        shapeAt(x, y) = curPiece.shape();
+    }
+
+    ++numPiecesDropped;
+    if (numPiecesDropped % 50 == 0) {
+        ++level;
+        timer.start(timeoutTime(), this);
+        emit levelChanged(level);
+    }
+
+    score += dropHeight + 7;
+    emit scoreChanged(score);
+    removeFullLines();
+
+    if (!isWaitingAfterLine) {
+        newPiece();
+    }
+}
+
+void TBoard::removeFullLines() {
+    int numFullLines = 0;
+
+    for (int i = BoardHeight - 1; i >= 0; --i) {
+        bool lineIsFull = true;
+
+        for (int j = 0; j < BoardWidth; ++j) {
+            if (shapeAt(j, i) == TPiece::NoShape) {
+                lineIsFull = false;
+                break;
+            }
+        }
+
+        if (lineIsFull) {
+            ++numFullLines;
+            for (int k = i; k < BoardHeight - 1; ++k) {
+                for (int j = 0; j < BoardWidth; ++j) {
+                    shapeAt(j, k) = shapeAt(j, k + 1);
+                }
+            }
+            for (int j = 0; j < BoardWidth; ++j) {
+                shapeAt(j, BoardHeight - 1) = TPiece::NoShape;
+            }
+        }
+    }
+
+    if (numFullLines > 0) {
+        numLinesRemoved += numFullLines;
+        score += 10 * numFullLines;
+        emit linesRemovedChanged(numLinesRemoved);
+        emit scoreChanged(score);
+
+        timer.start(500, this);
+        isWaitingAfterLine = true;
+        curPiece.setShape(TPiece::NoShape);
+        update();
+    }
+}
+void TBoard::newPiece() {
+    curPiece = nextPiece;
+    nextPiece.setRandomShape();
+    showNextPiece();
+    curX = BoardWidth / 2 + 1;
+    curY = BoardHeight - 1 + curPiece.minY();
+
+    if (!tryMove(curPiece, curX, curY)) {
+        curPiece.setShape(TPiece::NoShape);
+        timer.stop();
+        isStarted = false;
+    }
+}
+
+void TBoard::showNextPiece() {
+    if (!nextPieceLabel) {
+        return;
+    }
+
+    int dx = nextPiece.maxX() - nextPiece.minX() + 1;
+    int dy = nextPiece.maxY() - nextPiece.minY() + 1;
+
+    QPixmap pixmap(dx * squareWidth(), dy * squareHeight());
+    QPainter painter(&pixmap);
+    painter.fillRect(pixmap.rect(), nextPieceLabel->palette().background());
+
+    for (int i = 0; i < 4; ++i) {
+        int x = nextPiece.x(i) - nextPiece.minX();
+        int y = nextPiece.y(i) - nextPiece.minY();
+        drawSquare(painter, x * squareWidth(), y * squareHeight(), nextPiece.shape());
+    }
+    nextPieceLabel->setPixmap(pixmap);
+}
+
+bool TBoard::tryMove(const TPiece &newPiece, int newX, int newY) {
+    for (int i = 0; i < 4; ++i) {
+        int x = newX + newPiece.x(i);
+        int y = newY - newPiece.y(i);
+        if (x < 0 || x >= BoardWidth || y < 0 || y >= BoardHeight) {
+            return false;
+        }
+        if (shapeAt(x, y) != TPiece::NoShape) {
+            return false;
+        }
+    }
+
+    curPiece = newPiece;
+    curX = newX;
+    curY = newY;
+    update();
+    return true;
+}
+
+void TBoard::drawSquare(QPainter &painter, int x, int y, TPiece::Shape shape) {
+    static const QRgb colorTable[8] = { 0x000000, 0xCC6666, 0x66CC66, 0x6666CC, 0xCCCC66, 0xCC66CC, 0x66CCCC, 0xDAAA00};
+
+    QColor color = colorTable[int(shape)];
+    painter.fillRect(x + 1, y + 1, squareWidth() - 2, squareHeight() - 2, color);
+
+    painter.setPen(color.light());
+    painter.drawLine(x, y + squareHeight() - 1, x, y);
+    painter.drawLine(x, y, x + squareWidth() - 1, y);
+
+    painter.setPen(color.dark());
+    painter.drawLine(x + 1, y + squareHeight() - 1, x + squareWidth() - 1, y + squareHeight() - 1);
+    painter.drawLine(x + squareWidth() - 1, y + squareHeight() - 1, x + squareWidth() - 1, y + 1);
+}
+
+
+void TPiece::setRandomShape() {
+    setShape(TPiece::Shape(qrand() % 7 + 1));
+}
+
+
+void TPiece::setShape(TPiece::Shape shape) {
+    static const int coordsTable[8][4][2] = {
+        { { 0, 0 },   { 0, 0 },   { 0, 0 },   { 0, 0 } },
+        { { 0, -1 },  { 0, 0 },   { -1, 0 },  { -1, 1 } },
+        { { 0, -1 },  { 0, 0 },   { 1, 0 },   { 1, 1 } },
+        { { 0, -1 },  { 0, 0 },   { 0, 1 },   { 0, 2 } },
+        { { -1, 0 },  { 0, 0 },   { 1, 0 },   { 0, 1 } },
+        { { 0, 0 },   { 1, 0 },   { 0, 1 },   { 1, 1 } },
+        { { -1, -1 }, { 0, -1 },  { 0, 0 },   { 0, 1 } },
+        { { 1, -1 },  { 0, -1 },  { 0, 0 },   { 0, 1 } }
+    };
+
+    for (int i = 0; i < 4 ; i++) {
+        for (int j = 0; j < 2; ++j) {
+            coords[i][j] = coordsTable[shape][i][j];
+        }
+    }
+    pieceShape = shape;
+}
+int TPiece::minX() const {
+    int min = coords[0][0];
+    for (int i = 1; i < 4; ++i) {
+        min = qMin(min, coords[i][0]);
+    }
+    return min;
+}
+
+int TPiece::maxX() const {
+    int max = coords[0][0];
+    for (int i = 1; i < 4; ++i) {
+        max = qMax(max, coords[i][0]);
+    }
+    return max;
+}
+
+int TPiece::minY() const {
+    int min = coords[0][1];
+    for (int i = 1; i < 4; ++i) {
+        min = qMin(min, coords[i][1]);
+    }
+    return min;
+}
+
+int TPiece::maxY() const {
+    int max = coords[0][1];
+    for (int i = 1; i < 4; ++i) {
+        max = qMax(max, coords[i][1]);
+    }
+    return max;
+}
+
+TPiece TPiece::rotatedLeft() const {
+    if (pieceShape == SquareShape) {
+        return *this;
+    }
+
+    TPiece result;
+    result.pieceShape = pieceShape;
+    for (int i = 0; i < 4; ++i) {
+        result.setX(i, y(i));
+        result.setY(i, -x(i));
+    }
+    return result;
+}
+
+TPiece TPiece::rotatedRight() const {
+    if (pieceShape == SquareShape) {
+        return *this;
+    }
+    TPiece result;
+    result.pieceShape = pieceShape;
+    for (int i = 0; i < 4; ++i) {
+        result.setX(i, -y(i));
+        result.setY(i, x(i));
+    }
+    return result;
+}
+
+NextPieceLabel::NextPieceLabel( QWidget* parent /* = 0*/ ) : QLabel(parent)
+{
+    QPalette p = palette();
+    p.setColor(QPalette::Background, Qt::white);
+    setPalette(p);
+    setFrameShape(QFrame::Box);
+    setAlignment(Qt::AlignCenter);
+    setAutoFillBackground(true);
+}
+
+static QString addLibraries(const std::string &name, const std::list<RsLibraryInfo> &libraries)
+{
+    QString mTextEdit;
+    mTextEdit+=QString::fromUtf8(name.c_str());
+    mTextEdit+="\n";
+
+    std::list<RsLibraryInfo>::const_iterator libraryIt;
+    for (libraryIt = libraries.begin(); libraryIt != libraries.end(); ++libraryIt) {
+
+        mTextEdit+=" - ";
+        mTextEdit+=QString::fromUtf8(libraryIt->mName.c_str());
+        mTextEdit+=": ";
+        mTextEdit+=QString::fromUtf8(libraryIt->mVersion.c_str());
+        mTextEdit+="\n";
+    }
+    mTextEdit+="\n";
+    return mTextEdit;
+}
+
+
+void AboutWidget::on_copy_button_clicked()
+{
+    QString verInfo;
+    QString rsVerString = "RetroShare Version: ";
+    rsVerString+=Rshare::retroshareVersion(true);
+    verInfo+=rsVerString;
+    verInfo+="\n";
+
+
+#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
+	#if QT_VERSION >= QT_VERSION_CHECK (5, 4, 0)
+		verInfo+=QSysInfo::prettyProductName();
+	#endif
+#else
+	#ifdef Q_OS_LINUX
+	verInfo+="Linux";
+	#endif
+	#ifdef Q_OS_WIN
+	verInfo+="Windows";
+	#endif
+	#ifdef Q_OS_MAC
+	verInfo+="Mac";
+	#endif
+#endif
+	verInfo+=" ";
+    QString qtver = QString("QT ")+QT_VERSION_STR;
+    verInfo+=qtver;
+    verInfo+="\n\n";
+
+    /* Add version numbers of libretroshare */
+    std::list<RsLibraryInfo> libraries;
+    RsControl::instance()->getLibraries(libraries);
+    verInfo+=addLibraries("libretroshare", libraries);
+
+#ifdef ENABLE_WEBUI
+    /* Add version numbers of RetroShare */
+    // Add versions here. Find a better place.
+    libraries.clear();
+    libraries.push_back(RsLibraryInfo("Libmicrohttpd", MHD_get_version()));
+    verInfo+=addLibraries("RetroShare", libraries);
+#endif // ENABLE_WEBUI
+
+    /* Add version numbers of plugins */
+    if (rsPlugins) {
+        for (int i = 0; i < rsPlugins->nbPlugins(); ++i) {
+            RsPlugin *plugin = rsPlugins->plugin(i);
+            if (plugin) {
+                libraries.clear();
+                plugin->getLibraries(libraries);
+                verInfo+=addLibraries(plugin->getPluginName(), libraries);
+            }
+        }
+    }
+
+
+    QApplication::clipboard()->setText(verInfo);
+}
diff --git a/retroshare-gui/src/gui/AboutWidget.h b/retroshare-gui/src/gui/AboutWidget.h
new file mode 100644
index 000000000..532170a97
--- /dev/null
+++ b/retroshare-gui/src/gui/AboutWidget.h
@@ -0,0 +1,220 @@
+/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2009, RetroShare Team
+ * Copyright (C) 2008 Unipro, Russia (http://ugene.unipro.ru)
+ *
+ *  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.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************/
+
+#ifndef _GB2_ABOUT_DIALOG_
+#define _GB2_ABOUT_DIALOG_
+
+#include "ui_AboutWidget.h"
+
+#include <QBasicTimer>
+#include <QResizeEvent>
+#include <QPointer>
+
+#include <QDialog>
+#include <QLabel>
+#include <QPaintEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+
+
+class AWidget;
+class TBoard;
+class NextPieceLabel;
+
+class AboutWidget : public QWidget, public Ui::AboutWidget
+{
+    Q_OBJECT
+public:
+    AboutWidget(QWidget *parent = 0);
+
+private slots:
+    void sl_scoreChanged(int);
+    void sl_levelChanged(int);
+    void on_help_button_clicked();
+    void on_copy_button_clicked();
+
+signals:
+    void si_scoreChanged(QString);
+    void si_maxScoreChanged(QString);
+    void si_levelChanged(QString);
+
+protected:
+    //void keyPressEvent(QKeyEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+private:
+    void switchPages();
+    void installAWidget();
+    void installTWidget();
+    void updateTitle();
+
+    AWidget*     aWidget;
+    TBoard*     tWidget;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// A
+class AWidget : public QWidget {
+    Q_OBJECT
+
+public:
+    AWidget();
+
+    void switchState() ;
+
+protected:
+    void timerEvent(QTimerEvent* e);
+    void paintEvent(QPaintEvent* e);
+    //void mouseMoveEvent(QMouseEvent* e);
+    void resizeEvent(QResizeEvent *);
+	//void keyPressEvent(QKeyEvent *e);
+
+private:
+	void initImages();
+	void computeNextState();
+    void calcWater(int npage, int density);
+
+    void addBlob(int x, int y, int radius, int height);
+
+    void drawWater(QRgb* srcImage, QRgb* dstImage);
+
+    static QRgb shiftColor(QRgb color,int shift) {
+        return qRgb(qBound(0, qRed(color) - shift,  255),
+            qBound(0, qGreen(color) - shift,255),
+            qBound(0, qBlue(color) - shift, 255));
+    }
+	void initGoL();
+	void drawBitField();
+
+    int			    page;
+    int			    density;
+    std::vector<int>    bitfield1;
+    std::vector<int>    bitfield2;
+    QImage          image1;
+    QImage          image2;
+
+    bool			mImagesReady ;
+    int				mState;
+    int 			mTimerId;
+    float			mStep;
+    int 			mMaxStep;
+};
+
+//////////////////////////////////////////////////////////////////////////
+// T
+
+class TPiece {
+public:
+    enum Shape { NoShape, ZShape, SShape, LineShape, TShape, SquareShape, LShape, MirroredLShape };
+
+    TPiece() { setShape(NoShape); }
+
+    void setRandomShape();
+    void setShape(Shape shape);
+
+    Shape shape() const { return pieceShape; }
+    int x(int index) const { return coords[index][0]; }
+    int y(int index) const { return coords[index][1]; }
+    int minX() const;
+    int maxX() const;
+    int minY() const;
+    int maxY() const;
+    TPiece rotatedLeft() const;
+    TPiece rotatedRight() const;
+
+private:
+    void setX(int index, int x) { coords[index][0] = x; }
+    void setY(int index, int y) { coords[index][1] = y; }
+
+    Shape pieceShape;
+    int coords[4][2];
+};
+
+class TBoard : public QWidget {
+    Q_OBJECT
+
+public:
+    TBoard(QWidget *parent = 0);
+    ~TBoard();
+    int heightForWidth ( int w ) const;
+    int getScore() const {return score;}
+    int getMaxScore() const {return qMax(maxScore, score);}
+    int getLevel() const {return level;}
+    void setNextPieceLabel(QLabel *label) {nextPieceLabel = label;}
+    int squareWidth() const { return  boardRect().width()  / BoardWidth; }
+    int squareHeight() const { return boardRect().height() / BoardHeight; }
+
+public slots:
+    void start();
+    void pause();
+    
+signals:
+    void scoreChanged(int score);
+    void levelChanged(int level);
+    void linesRemovedChanged(int numLines);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void timerEvent(QTimerEvent *event);
+
+private:
+
+    enum { BoardWidth = 10, BoardHeight = 22 };
+
+    TPiece::Shape &shapeAt(int x, int y) { return board[(y * BoardWidth) + x]; }
+    int timeoutTime() const { return 1000 / (1 + level); }
+    QRect boardRect() const {return QRect(1, 1, width()-2, height()-2);}
+    QRect frameRect() const {return QRect(0, 0, width()-1, height()-1);}
+    void clearBoard();
+    void dropDown();
+    void oneLineDown();
+    void pieceDropped(int dropHeight);
+    void removeFullLines();
+    void newPiece();
+    void showNextPiece();
+    bool tryMove(const TPiece &newPiece, int newX, int newY);
+    void drawSquare(QPainter &painter, int x, int y, TPiece::Shape shape);
+
+    QBasicTimer timer;
+    QPointer<QLabel> nextPieceLabel;
+    bool isStarted;
+    bool isPaused;
+    bool isWaitingAfterLine;
+    TPiece curPiece;
+    TPiece nextPiece;
+    int curX;
+    int curY;
+    int numLinesRemoved;
+    int numPiecesDropped;
+    int score;
+    int maxScore;
+    int level;
+    TPiece::Shape board[BoardWidth * BoardHeight];
+};
+
+class NextPieceLabel : public QLabel {
+public:
+    NextPieceLabel(QWidget* parent = 0);
+};
+
+
+#endif
diff --git a/retroshare-gui/src/gui/AboutWidget.ui b/retroshare-gui/src/gui/AboutWidget.ui
new file mode 100644
index 000000000..95fc79e05
--- /dev/null
+++ b/retroshare-gui/src/gui/AboutWidget.ui
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AboutWidget</class>
+ <widget class="QWidget" name="AboutWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>594</width>
+    <height>594</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="help_button">
+       <property name="text">
+        <string>About</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="copy_button">
+       <property name="text">
+        <string>Copy Info</string>
+       </property>
+       <property name="icon">
+        <iconset resource="images.qrc">
+         <normaloff>:/images/copy.png</normaloff>:/images/copy.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="close_button">
+       <property name="text">
+        <string>close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 3f810857e..26204dea9 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -442,7 +442,9 @@ void MainWindow::initStackedPage()
   //addAction(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add"), ui->toolBarAction), &MainWindow::addFriend, SLOT(addFriend()));
   //addAction(new QAction(QIcon(IMAGE_NEWRSCOLLECTION), tr("New"), ui->toolBarAction), &MainWindow::newRsCollection, SLOT(newRsCollection()));
   addAction(new QAction(QIcon(IMAGE_PREFERENCES), tr("Options"), ui->toolBarAction), &MainWindow::showSettings, SLOT(showSettings()));
-  addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), ui->toolBarAction), &MainWindow::showabout, SLOT(showabout()));
+
+  // Removed About because it's now in options.
+  //addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), ui->toolBarAction), &MainWindow::showabout, SLOT(showabout()));
   addAction(new QAction(QIcon(IMAGE_QUIT), tr("Quit"), ui->toolBarAction), &MainWindow::doQuit, SLOT(doQuit()));
 
   QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::iterator notifyIt;
diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index 0a3e8dbc4..7267299c8 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -39,6 +39,7 @@
 #include "PeoplePage.h"
 #include "MessagePage.h"
 #include "ForumPage.h"
+#include "AboutPage.h"
 #include "PostedPage.h"
 #include "PluginsPage.h"
 #include "ServicePermissionsPage.h"
@@ -167,6 +168,7 @@ RSettingsWin::initStackedWidget()
 				addPage(cp) ;
 		}
 	}
+    addPage(new AboutPage() );
 
 	 // make the first page the default.
 
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 94949c38c..34924c60f 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -343,6 +343,7 @@ HEADERS +=  rshare.h \
             gui/MainWindow.h \
             gui/RSHumanReadableDelegate.h \
             gui/AboutDialog.h \
+            gui/AboutWidget.h \
             gui/NetworkView.h \
             gui/MessengerWindow.h \
             gui/FriendsDialog.h \
@@ -442,6 +443,7 @@ HEADERS +=  rshare.h \
             gui/settings/GeneralPage.h \
             gui/settings/PeoplePage.h \
             gui/settings/DirectoriesPage.h \
+            gui/settings/AboutPage.h \
             gui/settings/ServerPage.h \
             gui/settings/NetworkPage.h \
             gui/settings/NotifyPage.h \
@@ -586,6 +588,7 @@ FORMS +=    gui/StartDialog.ui \
             gui/HomePage.ui\
             gui/GenCertDialog.ui \
             gui/AboutDialog.ui \
+            gui/AboutWidget.ui \
             gui/QuickStartWizard.ui \
             gui/NetworkDialog.ui \
             gui/common/AvatarDialog.ui \
@@ -632,6 +635,7 @@ FORMS +=    gui/StartDialog.ui \
             gui/settings/MessagePage.ui \
             gui/settings/NewTag.ui \
             gui/settings/ForumPage.ui \
+            gui/settings/AboutPage.ui \
             gui/settings/PluginsPage.ui \
             gui/settings/AppearancePage.ui \
             gui/settings/TransferPage.ui \
@@ -703,6 +707,7 @@ SOURCES +=  main.cpp \
             rshare.cpp \
             gui/notifyqt.cpp \
             gui/AboutDialog.cpp \
+            gui/AboutWidget.cpp \
             gui/QuickStartWizard.cpp \
             gui/StartDialog.cpp \
             gui/HomePage.cpp\
@@ -846,6 +851,7 @@ SOURCES +=  main.cpp \
             gui/settings/rsettingswin.cpp \
             gui/settings/GeneralPage.cpp \
             gui/settings/DirectoriesPage.cpp \
+            gui/settings/AboutPage.cpp \
             gui/settings/ServerPage.cpp \
             gui/settings/NetworkPage.cpp \
             gui/settings/NotifyPage.cpp \