2025-07-20 05:11:02 -04:00
259 changed files with 69425 additions and 59759 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,7 +21,7 @@ Thumbs.db
 !supportlibs/libsam3/Makefile

 # QtCreator cruft
-*CMakeLists.txt.user*
+*CMakeLists.txt.user

 # Build artifacts
 /jsonapi-generator/src/jsonapi-generator
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,7 +1,7 @@
-image: docker:latest
+image: docker:stable

 services:
-  - docker:dind
+  - docker:stable-dind

 stages:
  - build
@ -18,7 +18,6 @@ variables:
 build-ubuntu-test-image:
    stage: build
    script:
-        - docker --version
        - > 
          docker login "$CI_REGISTRY"
          --username "$CI_REGISTRY_USER"
@ -36,7 +35,6 @@ build-ubuntu-test-image:
 test-ubuntu:
    stage: test
    script:
-        - docker --version
        - > 
          docker login "$CI_REGISTRY"
          --username "$CI_REGISTRY_USER"
--- a/.gitmodules
+++ b/.gitmodules
@ -36,8 +36,3 @@
 [submodule "retroshare-webui"]
 	path = retroshare-webui
 	url = https://github.com/RetroShare/RSNewWebUI.git
-	branch = master
-[submodule "supportlibs/librnp"]
-	path = supportlibs/librnp
-	url = https://github.com/rnpgp/rnp.git
-	branch = main
--- a/README.asciidoc
+++ b/README.asciidoc
@ -7,9 +7,6 @@ RetroShare is a decentralized, private, secure, cross-platform, communication
 toolkit.
 RetroShare provides file sharing, chat, messages, forums, channels and more.

-|===============================================================================
-| Developer Documentation | image:https://deepwiki.com/badge.svg[link="https://deepwiki.com/RetroShare/RetroShare",title="Ask DeepWiki"]
-|===============================================================================
 .Build Status
 |===============================================================================
 |GNU/Linux (via Gitlab CI) | image:https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/RetroShare/-/commits/master",title="pipeline status"]
--- a/RetroShare.pro
+++ b/RetroShare.pro
@ -25,6 +25,9 @@ CONFIG += c++14

 TEMPLATE = subdirs

+SUBDIRS += openpgpsdk
+openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
+
 rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
    SUBDIRS += jsonapi-generator
    jsonapi-generator.file = jsonapi-generator/src/jsonapi-generator.pro
@ -33,7 +36,7 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {

 SUBDIRS += libbitdht
 libbitdht.file = libbitdht/src/libbitdht.pro
-libretroshare.depends += libbitdht
+libretroshare.depends += openpgpsdk libbitdht

 SUBDIRS += libretroshare
 libretroshare.file = libretroshare/src/libretroshare.pro
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@ -40,23 +40,18 @@ RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
 	rm -rf pHash-build pHash

 ARG FRESHCLONE=0
-ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 ARG REPO_DEPTH="--depth 2000"
-RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && \
-	cd RetroShare && \
+RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && cd RetroShare && \
 	git fetch --tags && \
-	git submodule update --init \
-		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ \
-		supportlibs/restbed/ && \
-	cd supportlibs/restbed/ && \
-	git submodule update --init \
-		dependency/asio/ dependency/kashmir/ && \
-	cd ../../../
+	git submodule update --init --remote --force \
+		libbitdht/ libretroshare/ openpgpsdk/ && \
+	cd ..

 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
--- a/build_scripts/GitlabCI/gitlabCI.Dockerfile
+++ b/build_scripts/GitlabCI/gitlabCI.Dockerfile
@ -2,19 +2,19 @@ FROM registry.gitlab.com/retroshare/retroshare:base

 RUN apt-get update -y && apt-get upgrade -y

-ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 RUN \
 	cd RetroShare && git remote add testing $REPO_URL && \
 	git fetch --tags testing $REPO_BRANCH && \
 	git reset --hard testing/$REPO_BRANCH && \
-	git submodule update --init \
-		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && \
+	git submodule update --init --remote --force \
+		libbitdht/ libretroshare/ openpgpsdk/ && \
 	git --no-pager log --max-count 1
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON \
 		-DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@ -1 +1 @@
-Subproject commit 0a3997cc1355b2c848161dca015b7e2df039707b
+Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@ -2,15 +2,13 @@

 ## Qt Installation

-Qt 5.15 is not available as install package.
+Install Qt via: [Qt Download](http://www.qt.io/download/)

-Download Qt 5.15.x from here: [Qt 5.15.17](https://download.qt.io/archive/qt/5.15/5.15.17/single/qt-everywhere-opensource-src-5.15.17.tar.xz)
+Use default options. And add Qt Script support.

-Instruction howto Build Qt 5.15.x on macOS: [macOS Building](https://doc.qt.io/archives/qt-5.15/macos-building.html)
-## Set the Environment Variables
 Add to the PATH environment variable by editing your *~/.profile* file.

-       export PATH="/users/$USER/Qt/5.15.17/clang_64/bin:$PATH"
+       export PATH="/users/$USER/Qt/5.14.1/clang_64/bin:$PATH"

 Depends on which version of Qt you use.

@ -32,20 +30,32 @@ In GitHub Desktop -> Clone Repository -> URL

       Add Repository URL: https://github.com/RetroShare/RetroShare.git and Clone

-## ***Get XCode & MacOSX SDK***
+## ***Choose if you use MacPort or HomeBrew***

-To identify the correct version of Xcode to install, you need to know which OS you are running. Go to the [x] menu -> "About This Mac" and read the macOS version number.
+### MacPort Installation

-If you are running macOS Ventura 13.5 or later, you can install Xcode directly from App Store using the instructions below. 
+Install MacPort and XCode following this guide: [MacPort and XCode](http://guide.macports.org/#installing.xcode)

-You can find older versions of Xcode at [Apple Developer Downloads](https://developer.apple.com/downloads/). Find the appropriate .xip file for your macOS version
+Start XCode to get it updated and to able C compiler to create executables.

-To install from App Store:
+#### Install libraries  

-Select [x] menu - > "App Store…".
-Search for Xcode. Download and install.
+       $ sudo port -v selfupdate
+       $ sudo port install openssl
+       $ sudo port install miniupnpc
+       $ sudo port install libmicrohttpd
+       
+For VOIP Plugin: 

-Once Xcode has installed, you must drag the XCode icon into your Applications folder. After you have done this, open Xcode from the Applications folder by double-clicking on the icon and then follow the remaining instructions below. 
+       $ sudo port install speex-devel
+       $ sudo port install opencv
+       $ sudo port install ffmpeg
+
+Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
+
+### HOMEBREW Installation
+
+Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)

 Install XCode command line developer tools:

@ -53,33 +63,13 @@ Install XCode command line developer tools:

 Start XCode to get it updated and to able C compiler to create executables.

-Older MacOSX SDK is available from here: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
-
-### MacPort Installation
-
-Install MacPort following this guide: [MacPort](http://guide.macports.org/#installing.xcode)
-
-### HOMEBREW Installation
-
-Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
-
 #### Install libraries  

       $ brew install openssl
       $ brew install miniupnpc
+       $ brew install libmicrohttpd
       $ brew install rapidjson
       $ brew install sqlcipher
-
-For RNP lib:
-
-	   $ brew install bzip2
-	   $ brew install zlib
-	   $ brew install json-c
-	   $ brew install botan@2
-
-#### Install CMake 
-
-       $ brew install cmake
       
 If you have error in linking, run this:

@ -95,7 +85,8 @@ For VOIP Plugin:
 For FeedReader Plugin:

       $ brew install libxslt
-       $ brew install libxml2
+
+Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)

 ## Last Settings

@ -113,8 +104,11 @@ In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additiona

 ## Set your Mac OS SDK version

+Edit RetroShare.pro  

-Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_macos11.1 (line 135:)
+    CONFIG += c++14 rs_macos11.1
+
+and then retroshare.pri

    macx:CONFIG *= rs_macos11.1
    rs_macos10.8:CONFIG -= rs_macos11.1
@ -128,7 +122,7 @@ Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_ma

 ## Link Include & Libraries

-When required edit your retroshare.pri macx-* section, check if the Include and Lib path are correct (macx-* section)
+Edit your retroshare.pri and add to macx-*  section

    INCLUDEPATH += "/usr/local/opt/openssl/include"
    QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
@ -137,21 +131,13 @@ When required edit your retroshare.pri macx-* section, check if the Include and

 alternative via Terminal

-    $ qmake 
-    INCLUDEPATH+="/usr/local/opt/openssl/include" \
-    QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
-    QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" \
-    QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" \
-    CONFIG+=rs_autologin \
-    CONFIG+=rs_use_native_dialogs \
-    CONFIG+=release \
-    ..
+    $ qmake INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib"

 For FeedReader Plugin:

    INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"

-With plugins:
+For building RetroShare with plugins:

    $ qmake \
    INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
@ -173,30 +159,13 @@ With plugins:

 You can now compile RetroShare into Qt Creator or with Terminal

-       $ cd /path/to/retroshare
-       $ qmake ..
-       $ make
+       cd retroshare
+       qmake; make

 You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK

 You can find the compiled application at *./retroshare/retroshare-gui/src/retroshare.app*

-## Issues
-
-If you have issues with openssl (Undefined symbols for architecture x86_64) try to add to *~/.profile* file this or via Terminal
-
-       export PATH="/usr/local/opt/openssl/bin:$PATH"
-       export LDFLAGS="-L/usr/local/opt/openssl/lib"
-       export CPPFLAGS="-I/usr/local/opt/openssl/include"
-       export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
-
-For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments:
-
-       LDFLAGS="-L/usr/local/opt/openssl/lib"
-       CPPFLAGS="-I/usr/local/opt/openssl/include"
-
-
-
 ## Copy Plugins

    $ cp \
@ -204,13 +173,3 @@ For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -
    ./plugins/VOIP/lib/libVOIP.dylib \
    ./plugins/RetroChess/lib/libRetroChess.dylib \
    ./retroshare-gui/src/RetroShare.app/Contents/Resources/
-
-### Compile Retroshare-Service & Webui with CMake
-before you can compile overwrite the file "asio/include/asio/detail/config.hpp" here is a fix for macos [
-asio fix](https://github.com/chriskohlhoff/asio/commit/68df16d560c68944809bb2947360fe8035e9ae0a)   
-
-       $ cd retroshare-service
-       $ mkdir build-dir
-       $ cd build-dir
-       $ cmake -DRS_WEBUI=ON -DCMAKE_BUILD_TYPE=Release ..
-       $ make
--- a/build_scripts/OSX/makeOSXPackage.sh
+++ b/build_scripts/OSX/makeOSXPackage.sh
@ -1,51 +0,0 @@
-#!/bin/sh
-
-APP="RetroShare"
-RSVERSION="0.6.7a"
-QTVERSION="Qt-5.15.11"
-
-# Install the 7z to create dmg archives.
-#brew list p7zip || brew install p7zip
-
-# Package your app
-echo "Packaging retroshare..."
-#cd ${project_dir}/build/macOS/clang/x86_64/release/
-cd retroshare-gui/src/
-
-# Remove build directories that you don't want to deploy
-rm -rf moc
-rm -rf obj
-rm -rf qrc
-
-# This sets the CFBundleVersion & CFBundleShortVersionString string
-/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
-/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $RSVERSION" retroshare.app/Contents/Info.plist
-/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $RSVERSION" retroshare.app/Contents/Info.plist
-/usr/libexec/PlistBuddy -c "Delete :NSRequiresAquaSystemAppearance" retroshare.app/Contents/Info.plist
-
-# This automatically creates retroshare.dmg
-
-echo "Creating dmg archive..."
-macdeployqt retroshare.app -dmg
-
-DATE=`date +"%m-%d-%Y"`
-MACVERSION=`sw_vers -productVersion`
-#RSVERSION=`git describe --abbrev=0 --tags`
-GITHEAD=`git rev-parse --short HEAD`
-
-mv $APP.dmg "$APP-$RSVERSION-$GITHEAD-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
-
-# You can use the appdmg command line app to create your dmg file if
-# you want to use a custom background and icon arrangement. I'm still
-# working on this for my apps, myself. If you want to do this, you'll
-# remove the -dmg option above.
-# appdmg json-path YourApp_${TRAVIS_TAG}.dmg
-
-# Copy other project files
-cp "../../libbitdht/src/bitdht/bdboot.txt" "retroshare.app/Contents/Resources/"
-cp "../../plugins/FeedReader/lib/libFeedReader.dylib" "retroshare.app/Contents/Resources/"
-cp -R "sounds" "retroshare.app/Contents/Resources/sounds"
-
-# cp "${project_dir}/README.md" "README.md"
-# cp "${project_dir}/LICENSE" "LICENSE"
-# cp "${project_dir}/Qt License" "Qt License"
--- a/build_scripts/RedHat+Fedora/data/retroshare.desktop
+++ b/build_scripts/RedHat+Fedora/data/retroshare.desktop
@ -1,11 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Name=RetroShare
-Comment=Securely communicate with your friends
+Comment=Securely share files with your friends
 Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
+Categories=Network;P2P;
 MimeType=x-scheme-handler/retroshare;
--- a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
+++ b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
@ -18,8 +18,8 @@ At the end, you'll get at ..\\*-msys2\deploy\ the Portable 7zip file.

 ### MSYS2 INSTALLATION (for editing or debugging)

-Download MSYS2 from [MSYS2](http://www.msys2.org/). Installing 
-MSYS2 requires 64 bit Windows 10 or newer.
+Download MSYS2 from [MSYS2](http://www.msys2.org/). Get the i686 version
+if you run a 32-bit Windows or the x86_64 if you run a 64-bit Windows.

 Run the installer and install MSYS2.

@ -40,29 +40,26 @@ Run MSYS2 MSYS again and finish updating with:

 Install the default programs needed to build:

-	pacman -S base-devel git wget p7zip gcc perl ruby doxygen cmake
+	pacman -S base-devel git wget p7zip gcc perl ruby python2 doxygen cmake

-Install the 64-bit toolchain:
+Install the 32-bit toolchain:

-	pacman -S mingw-w64-x86_64-toolchain
+	pacman -S mingw-w64-i686-toolchain

 Install all needed dependencies:

-	pacman -S mingw-w64-x86_64-miniupnpc
-	pacman -S mingw-w64-x86_64-libxslt
-	pacman -S mingw-w64-x86_64-xapian-core
-	pacman -S mingw-w64-x86_64-sqlcipher
-	pacman -S mingw-w64-x86_64-qt5-base
-	pacman -S mingw-w64-x86_64-qt5-multimedia
-	pacman -S mingw-w64-x86_64-ccmake
-	pacman -S mingw-w64-x86_64-rapidjson
-	pacman -S mingw-w64-x86_64-json-c
-	pacman -S mingw-w64-x86_64-libbotan
-	pacman -S mingw-w64-x86_64-asio
+	pacman -S mingw-w64-i686-miniupnpc
+	pacman -S mingw-w64-i686-libmicrohttpd
+	pacman -S mingw-w64-i686-libxslt
+	pacman -S mingw-w64-i686-xapian-core
+	pacman -S mingw-w64-i686-sqlcipher
+	pacman -S mingw-w64-i686-qt5
+	pacman -S mingw32/mingw-w64-i686-cmake
+	pacman -S mingw-w64-i686-rapidjson

 If you want to use QtCreator as IDE, prefer using this one publish by MSYS2 as all build Kit are already setted.

-	pacman -S mingw-w64-x86_64-qt-creator
+	pacman -S mingw-w64-i686-qt-creator
 *You can start it from MSYS2 terminal.*


@ -70,7 +67,7 @@ We're done installing MSYS2, close the shell terminal.

 ### BUILDING RETROSHARE

-Now run the MSYS2 MinGW 64-bit shell terminal (it's in the start menu).
+Now run the MSYS2 MinGW 32-bit shell terminal (it's in the start menu).
 We will use it to checkout Retroshare and build it:

 	git clone https://github.com/RetroShare/RetroShare.git
--- a/build_scripts/Windows-msys2/build/build-installer.bat
+++ b/build_scripts/Windows-msys2/build/build-installer.bat
@ -43,7 +43,6 @@ set NSIS_PARAM=%NSIS_PARAM% /DDEPLOYDIR="%RsDeployPath%"
 set NSIS_PARAM=%NSIS_PARAM% /DOUTDIR="%RsPackPath%"
 set NSIS_PARAM=%NSIS_PARAM% /DINSTALLERADD="%RsArchiveAdd%"
 set NSIS_PARAM=%NSIS_PARAM% /DARCHITECTURE="%RsArchitecture%"
-set NSIS_PARAM=%NSIS_PARAM% /DTOOLCHAIN="%RsToolchain%"
 set NSIS_PARAM=%NSIS_PARAM% /DREVISION=%RsVersion.Extra%

 set QtMainVersion=%QtVersion:~0,1%
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@ -18,17 +18,15 @@ if errorlevel 1 goto error_env
 if not "%ParamNoupdate%"=="1" (
 	:: Install needed things
 	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S make git mingw-w64-%RsMSYS2Architecture%-toolchain mingw-w64-%RsMSYS2Architecture%-qt5 mingw-w64-%RsMSYS2Architecture%-miniupnpc mingw-w64-%RsMSYS2Architecture%-sqlcipher mingw-w64-%RsMSYS2Architecture%-cmake mingw-w64-%RsMSYS2Architecture%-rapidjson"
-	:: rnp
-	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-json-c mingw-w64-%RsMSYS2Architecture%-libbotan"

 	:: Webui
-	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen mingw-w64-%RsMSYS2Architecture%-asio"
+	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen"

 	:: Plugins
 	if "%ParamPlugins%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-speex mingw-w64-%RsMSYS2Architecture%-speexdsp mingw-w64-%RsMSYS2Architecture%-curl mingw-w64-%RsMSYS2Architecture%-libxslt mingw-w64-%RsMSYS2Architecture%-opencv mingw-w64-%RsMSYS2Architecture%-ffmpeg"

 	:: Clang
-	if "%ClangCompiler%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"
+	if "%ParamClang%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"

 	:: Indexing
 	if "%ParamIndexing%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-xapian-core mingw-w64-%RsMSYS2Architecture%-libvorbis mingw-w64-%RsMSYS2Architecture%-flac mingw-w64-%RsMSYS2Architecture%-taglib"
@ -79,10 +77,11 @@ echo %RsBuildConfig% >> buildinfo.txt
 echo %RsArchitecture% >> buildinfo.txt
 echo Qt %QtVersion% >> buildinfo.txt
 echo %RsToolchain% >> buildinfo.txt
+echo %RsCompiler% >> buildinfo.txt

 call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath
 call "%ToolsPath%\msys2-path.bat" "%EnvMSYS2Path%" MSYS2EnvMSYS2Path
-if "%ClangCompiler%"=="1" (
+if "%ParamClang%"=="1" (
 	%EnvMSYS2Cmd% "qmake "%MSYS2SourcePath%/RetroShare.pro" -r -spec win32-clang-g++ %RS_QMAKE_CONFIG%"
 ) else (
 	%EnvMSYS2Cmd% "qmake "%MSYS2SourcePath%/RetroShare.pro" -r -spec win32-g++ %RS_QMAKE_CONFIG%"
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@ -5,7 +5,7 @@ set ParamAutologin=0
 set ParamPlugins=0
 set ParamTor=0
 set ParamWebui=0
-set ClangCompiler=0
+set ParamClang=0
 set ParamIndexing=0
 set ParamFriendserver=0
 set ParamNoupdate=0
@ -55,6 +55,8 @@ if "%~1" NEQ "" (
 			set ParamWebui=1
 		) else if "%%~a"=="singlethread" (
 			set CoreCount=1
+		) else if "%%~a"=="clang" (
+			set ParamClang=1
 		) else if "%%~a"=="indexing" (
 			set ParamIndexing=1
 		) else if "%%~a"=="friendserver" (
@ -94,18 +96,24 @@ if "%RsToolchain%"=="mingw32" (
 	set RsArchitecture=x64
 	set RsMSYS2Architecture=clang-x86_64
 	set MSYSTEM=CLANG64
-	set ClangCompiler=1
+	set ParamClang=1
 ) else if "%RsToolchain%"=="clang32" (
 	set RsArchitecture=x86
 	set RsMSYS2Architecture=clang-i686
 	set MSYSTEM=CLANG32
-	set ClangCompiler=1
+	set ParamClang=1
 ) else if "%RsToolchain%"=="clangarm64" (
 	set RsArchitecture=arm64
 	set RsMSYS2Architecture=clang-aarch64
 	set MSYSTEM=CLANGARM64
 )

+if "%ParamClang%"=="1" (
+	set RsCompiler=Clang
+) else (
+	set RsCompiler=GCC
+)
+
 if "%ParamRelease%"=="1" (
 	if "%ParamDebug%"=="1" (
 		echo.
@ -154,6 +162,7 @@ echo autologin          Build with autologin
 echo plugins            Build plugins
 echo webui              Enable JsonAPI and pack webui files
 echo singlethread       Use only 1 thread for building
+echo clang              Use clang compiler instead of GCC
 echo indexing           Build with deep channel and file indexing support
 echo friendserver       Enable friendserver support
 echo noupdate           Skip updating the libraries
--- a/build_scripts/Windows-msys2/build/env.bat
+++ b/build_scripts/Windows-msys2/build/env.bat
@ -14,8 +14,8 @@ if "%QtVersion%"=="" %cecho% error "Cannot get Qt version." & exit /B 1

 set RsMinGWPath=%EnvMSYS2BasePath%\%RsToolchain%

-set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsBuildConfig%
-set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%RsToolchain%%RsType%-%RsBuildConfig%
+set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
+set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
 set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
--- a/build_scripts/Windows-msys2/build/pack.bat
+++ b/build_scripts/Windows-msys2/build/pack.bat
@ -71,9 +71,9 @@ if "%QtMainVersion%"=="4" set QtMainVersion2=4
 if "%QtMainVersion%"=="5" set QtMainVersion1=5

 if "%RsBuildConfig%" NEQ "release" (
-	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsToolchain%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z
+	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z
 ) else (
-	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsToolchain%-msys2%RsType%%RsArchiveAdd%.7z
+	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%.7z
 )

 if exist "%Archive%" del /Q "%Archive%"
@ -105,7 +105,6 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
 copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
-if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
 	copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
 )
--- a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
@ -16,7 +16,7 @@ if "%~1"=="clean" (
 	goto exit
 )

-set MSYS2Version=20241208
+set MSYS2Version=20231026

 set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
 set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
--- a/build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi
@ -9,7 +9,6 @@
 ;!define REVISION ""
 ;!define DEPLOYDIR ""
 ;!define ARCHITECTURE ""
-;!define TOOLCHAIN ""

 # Optional defines
 ;!define OUTDIR ""
@ -22,9 +21,6 @@
 !ifndef ARCHITECTURE
 !error "ARCHITECTURE is not defined"
 !endif
-!ifndef TOOLCHAIN
-!error "TOOLCHAIN is not defined"
-!endif

 # Check optional defines
 !ifdef OUTDIR
@ -76,7 +72,7 @@ ${!defineifexist} TOR_EXISTS "${DEPLOYDIR}\tor.exe"
 # Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-${TOOLCHAIN}-msys2${RSTYPE}${INSTALLERADD}-setup.exe"
+OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-${ARCHITECTURE}${RSTYPE}${INSTALLERADD}-setup.exe"
 BrandingText "${APPNAMEANDVERSION}"
 RequestExecutionlevel highest
 # Use compression
--- a/build_scripts/Windows-msys2/readme.md
+++ b/build_scripts/Windows-msys2/readme.md
@ -55,6 +55,7 @@ Run the scripts in this order:
  * "CONFIG+=..."       enable other extra compile time features, you can find the almost complete list in file *&lt;sourcefolder&gt;\retroshare.pri*
 * For fixing compile problems (optional)
  * singlethread:       use only 1 thread for building, slow but useful if you don't find the error message in the console
+  * clang:              use clang compiler instead of GCC
  * noupdate:           skip the msys2 update step, sometimes some msys2 packages are broken, you can manually switch back to the older package, and this option will prevent updating to the broken version again

 Example:
--- a/build_scripts/Windows/build-libs/Makefile
+++ b/build_scripts/Windows/build-libs/Makefile
@ -2,32 +2,23 @@ ZLIB_VERSION=1.2.11
 BZIP2_VERSION=1.0.8
 MINIUPNPC_VERSION=2.2.3
 OPENSSL_VERSION=1.1.1w
-SPEEX_VERSION=1.2.1
-SPEEXDSP_VERSION=1.2.1
-LIBXML2_MAIN_VERSION=2.14
-LIBXML2_VERSION=$(LIBXML2_MAIN_VERSION).5
-LIBXSLT_MAIN_VERSION=1.1
-LIBXSLT_VERSION=$(LIBXSLT_MAIN_VERSION).43
-CURL_VERSION=8.9.1
+SPEEX_VERSION=1.2.0
+SPEEXDSP_VERSION=1.2.0
+LIBXML2_VERSION=2.9.12
+LIBXSLT_VERSION=1.1.34
+CURL_VERSION=7.81.0
 TCL_VERSION=8.6.10
 SQLCIPHER_VERSION=4.5.0
 LIBMICROHTTPD_VERSION=0.9.75
-FFMPEG_VERSION=4.4.6
+FFMPEG_VERSION=4.4
 RAPIDJSON_VERSION=1.1.0
-XAPIAN_VERSION=1.4.29
-ASIO_VERSION=1-34-2
-#RNP_VERSION=0.17.1
-
-# libaries for rnp
-JSON_C_VERSION=0.18
-BOTAN_VERSION=2.19.5
+XAPIAN_VERSION=1.4.19

 DOWNLOAD_PATH?=download
 BUILD_PATH=build
 LIBS_PATH?=libs

-all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian jsonc botan asio copylibs
-#rnp
+all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian copylibs

 download: \
 	$(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz \
@ -36,13 +27,13 @@ download: \
 	$(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz \
-	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz \
+	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz \
+	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz \
 	$(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz \
+	$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/rapidjson-$(RAPIDJSON_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/xapian-core-$(XAPIAN_VERSION).tar.xz

@ -193,52 +184,50 @@ $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP
 	rm -r -f speexdsp-$(SPEEXDSP_VERSION)
 	mv $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tmp $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION)

-libxml: \
-	$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION) \
-	$(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
+libxml2: $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)

-$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz:
-	wget --no-check-certificate https://download.gnome.org/sources/libxml2/$(LIBXML2_MAIN_VERSION)/libxml2-$(LIBXML2_VERSION).tar.xz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
+$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz:
+	wget ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz

-$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz:
-	wget --no-check-certificate https://download.gnome.org/sources/libxslt/$(LIBXSLT_MAIN_VERSION)/libxslt-$(LIBXSLT_VERSION).tar.xz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
-
-$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION) $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION): \
-	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz \
-	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
-	# libxml2: prepare
-	pacman --needed --noconfirm -S python3 pkg-config
+$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
+	# prepare
 	rm -r -f $(BUILD_PATH)/libxml2-*
-	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
-	# libxslt: prepare
-	rm -r -f $(BUILD_PATH)/libxslt-*
-	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
-	tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
-	# libxml2: build
+	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
+	# build
 	cd libxml2-$(LIBXML2_VERSION) && ./configure --without-iconv -enable-shared=no
 	#cd libxml2-$(LIBXML2_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd libxml2-$(LIBXML2_VERSION) && make libxml2.la
-	# libxslt: build
-	cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC
-	cd libxslt-$(LIBXSLT_VERSION)/libxslt && make
-	cd libxslt-$(LIBXSLT_VERSION)/libexslt && make
-	# libxml2: copy files
+	cd libxml2-$(LIBXML2_VERSION) && make
+	# copy files
 	mkdir -p $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/include/libxml
 	cp libxml2-$(LIBXML2_VERSION)/include/libxml/*.h $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/include/libxml/
 	mkdir -p $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/lib
 	cp libxml2-$(LIBXML2_VERSION)/.libs/libxml2.a $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/lib/
-	# libxslt: copy files
+	# cleanup
+	#rm -r -f libxml2-$(LIBXML2_VERSION) # see libxslt
+	mv $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
+
+libxslt: $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
+
+$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz:
+	wget ftp://xmlsoft.org/libxml2/libxslt-$(LIBXSLT_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
+
+$(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
+	# prepare
+	rm -r -f $(BUILD_PATH)/libxslt-*
+	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
+	tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
+	# build
+	cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC
+	cd libxslt-$(LIBXSLT_VERSION) && make
+	# copy files
 	mkdir -p $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt
 	cp libxslt-$(LIBXSLT_VERSION)/libxslt/*.h $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt/
 	mkdir -p $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib
 	cp libxslt-$(LIBXSLT_VERSION)/libxslt/.libs/libxslt.a $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib/
 	cp libxslt-$(LIBXSLT_VERSION)/libexslt/.libs/libexslt.a $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib/
-	# libxml2: cleanup
+	# cleanup
 	rm -r -f libxml2-$(LIBXML2_VERSION)
-	# libxslt: cleanup
 	rm -r -f libxslt-$(LIBXSLT_VERSION)
-	# finish
-	mv $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
 	mv $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)

 curl: $(BUILD_PATH)/curl-$(CURL_VERSION)
@ -253,7 +242,7 @@ $(BUILD_PATH)/curl-$(CURL_VERSION): $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz
 	# build
 	cd curl-$(CURL_VERSION) && ./configure --disable-shared --with-ssl="`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)"
 	#cd curl-$(CURL_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd curl-$(CURL_VERSION)/lib && make
+	cd curl-$(CURL_VERSION) && make
 	# copy files
 	mkdir -p $(BUILD_PATH)/curl-$(CURL_VERSION).tmp/include/curl
 	cp curl-$(CURL_VERSION)/include/curl/*.h $(BUILD_PATH)/curl-$(CURL_VERSION).tmp/include/curl/
@ -316,13 +305,13 @@ $(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION): $(DOWNLOAD_PATH)/libmicroh

 ffmpeg: $(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION)

-$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz:
-	wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.xz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
+$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz:
+	wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.gz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz

-$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
+$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
 	# prepare
 	rm -r -f $(BUILD_PATH)/ffmpeg-*
-	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
+	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
 	# build
 	cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp"
 	cd ffmpeg-$(FFMPEG_VERSION) && make install
@ -374,73 +363,8 @@ $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION): $(DOWNLOAD_PATH)/xapian-core-$(XAPI
 	rm -r -f xapian-core-$(XAPIAN_VERSION)
 	mv $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION)

-jsonc: $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
-
-$(BUILD_PATH)/json-c-$(JSON_C_VERSION):
-	# prepare
-	rm -r -f $(BUILD_PATH)/json-c-*
-	[ -d "json-c-$(JSON_C_VERSION)" ] || git clone https://github.com/json-c/json-c.git --depth=1 --branch json-c-$(JSON_C_VERSION) "json-c-$(JSON_C_VERSION)"
-	# build
-	mkdir -p json-c-$(JSON_C_VERSION)/build
-	cd json-c-$(JSON_C_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_BUILD_TYPE="release" -DBUILD_SHARED_LIBS=off -DBUILD_STATIC_LIBS=on -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT" -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DCMAKE_INSTALL_PREFIX="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp"
-	cd json-c-$(JSON_C_VERSION)/build && make install
-	# cleanup
-	rm -r -f json-c-$(JSON_C_VERSION)
-	mv $(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
-
-botan: $(BUILD_PATH)/botan-$(BOTAN_VERSION)
-
-$(BUILD_PATH)/botan-$(BOTAN_VERSION):
-	# prepare
-	pacman --needed --noconfirm -S python3
-	rm -r -f $(BUILD_PATH)/botan-*
-	[ -d "botan-$(BOTAN_VERSION)" ] || git clone https://github.com/randombit/botan.git --depth=1 --branch $(BOTAN_VERSION) "botan-$(BOTAN_VERSION)"
-	# build
-	if [ $(MSYSTEM) = "MINGW32" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_32 --disable-shared-library --enable-static-library --extra-cxxflags="-D__MINGW_USE_VC2005_COMPAT" --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
-	if [ $(MSYSTEM) = "MINGW64" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_64 --disable-shared-library --enable-static-library --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
-	cd botan-$(BOTAN_VERSION) && make install
-	# cleanup
-	rm -r -f botan-$(BOTAN_VERSION)
-	mv $(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp $(BUILD_PATH)/botan-$(BOTAN_VERSION)
-
-asio: $(BUILD_PATH)/asio-$(ASIO_VERSION)
-
-$(BUILD_PATH)/asio-$(ASIO_VERSION):
-	# prepare
-	rm -r -f $(BUILD_PATH)/asio-*
-	[ -d "asio-$(ASIO_VERSION)" ] || git clone https://github.com/chriskohlhoff/asio.git --depth=1 --branch asio-$(ASIO_VERSION) "asio-$(ASIO_VERSION)"
-	# copy files
-	mkdir -p $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio
-	cp asio-$(ASIO_VERSION)/asio/include/*.hpp $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/
-	cp -r asio-$(ASIO_VERSION)/asio/include/asio/* $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio/
-	# cleanup
-	rm -r -f asio-$(ASIO_VERSION)
-	mv $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp $(BUILD_PATH)/asio-$(ASIO_VERSION)
-
-rnp: $(BUILD_PATH)/rnp-$(RNP_VERSION)
-
-$(BUILD_PATH)/rnp-$(RNP_VERSION):
-	# prepare
-	rm -r -f $(BUILD_PATH)/rnp-*
-	[ -d "rnp-$(RNP_VERSION)" ] || git clone https://github.com/rnpgp/rnp.git --depth=1 --branch v$(RNP_VERSION) --recurse-submodules --shallow-submodules "rnp-$(RNP_VERSION)"
-	# build
-	mkdir -p rnp-$(RNP_VERSION)/build
-	cd rnp-$(RNP_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DBUILD_SHARED_LIBS=yes -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT -D__STDC_FORMAT_MACROS" -DBZIP2_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/include" -DBZIP2_LIBRARY_RELEASE="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DBZIP2_LIBRARIES="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DZLIB_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/include" -DZLIB_LIBRARY="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/lib/libz.a" -DJSON-C_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/include/json-c" -DJSON-C_LIBRARY="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/lib/libjson-c.a" -DBOTAN_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/include/botan-`echo $(BOTAN_VERSION) | cut -c1-1`" -DBOTAN_LIBRARY="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/lib/libbotan-`echo $(BOTAN_VERSION) | cut -c1-1`.a"
-	cmake --build rnp-$(RNP_VERSION)/build
-	# copy files
-	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp
-	cp -r rnp-$(RNP_VERSION)/include/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
-	cp -r rnp-$(RNP_VERSION)/build/src/lib/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
-	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib
-	cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll.a $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib/
-	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin
-	cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin/
-	# cleanup
-	rm -r -f rnp-$(RNP_VERSION)
-	mv $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp $(BUILD_PATH)/rnp-$(RNP_VERSION)
-
 copylibs:
 	rm -r -f $(LIBS_PATH) ; \
 	mkdir -p $(LIBS_PATH) ; \
-	cp -p $(BUILD_PATH)/gcc-version $(LIBS_PATH) ; \
-	find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r -p {}/. $(LIBS_PATH) \; ; \
+	cp $(BUILD_PATH)/gcc-version $(LIBS_PATH) ; \
+	find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r {}/. $(LIBS_PATH) \; ; \
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@ -96,7 +96,6 @@ copy nul "%RsDeployPath%\portable" %Quite%
 echo copy binaries
 copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare*.exe" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
-if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%

 if "%ParamService%"=="1" (
 	copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
--- a/build_scripts/Windows/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys2.bat
@ -16,13 +16,13 @@ if "%~1"=="clean" (
 	goto exit
 )

-set MSYS2Version=20241208
+set MSYS2Version=20231026

 set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
 set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
 set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
-set CMakeInstall=cmake-3.31.3-windows-i386.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
+set CMakeInstall=cmake-3.19.0-win32-x86.zip
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%

 if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@ -19,9 +19,9 @@ set MinGitInstallPath=%EnvToolsPath%\MinGit
 set DoxygenInstall=doxygen-1.9.6.windows.x64.bin.zip
 set DoxygenUrl=https://github.com/doxygen/doxygen/releases/download/Release_1_9_6/%DoxygenInstall%
 set DoxygenInstallPath=%EnvToolsPath%\doxygen
-set CMakeVersion=cmake-3.31.3-windows-i386
+set CMakeVersion=cmake-3.19.0-win32-x86
 set CMakeInstall=%CMakeVersion%.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
 set CMakeInstallPath=%EnvToolsPath%\cmake
 set TorProjectUrl=https://www.torproject.org
 set TorDownloadIndexUrl=%TorProjectUrl%/download/tor
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@ -247,7 +247,6 @@ Section $(Section_Main) Section_Main

  ; External binaries
  File "${EXTERNAL_LIB_DIR}\bin\miniupnpc.dll"
-  File "${RELEASEDIR}\supportlibs\librnp\Build\src\lib\librnp.dll"
  !if ${ARCHITECTURE} == "x86"
    File "${EXTERNAL_LIB_DIR}\bin\libcrypto-1_1.dll"
    File "${EXTERNAL_LIB_DIR}\bin\libssl-1_1.dll"
--- a/build_scripts/git_tag_cleaner.sh
+++ b/build_scripts/git_tag_cleaner.sh
@ -1,20 +0,0 @@
-#!/bin/bash
-
-function git_del_tag()
-{
-	mTag=$1
-
-	for mRemote in $(git remote); do
-		echo "Attempting tag $mTag removal from remote $mRemote"
-		GIT_TERMINAL_PROMPT=0 git push $mRemote :$mTag || true
-	done
-	git tag --delete $mTag
-}
-
-for mModule in . build_scripts/OBS/ libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ ; do
-	pushd $mModule
-	git_del_tag v0.6.7a
-	git tag --list | grep untagged | while read mTag; do git_del_tag $mTag ; done
-	popd
-done
-
--- a/data/retroshare.desktop
+++ b/data/retroshare.desktop
@ -7,5 +7,5 @@ Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
+Categories=Application;Network;P2P;Feed;Chat;InstantMessaging
 MimeType=x-scheme-handler/retroshare;
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ac83e00ea7a26cd6cf57cefef745d6dcfd07e5da
+Subproject commit bfa91bdef24f2339f1db053d155a6ef169027a95
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 178aa8ebcef47e3271d5a5ca5c07e45d3b71c81d
+Subproject commit b41667912751a453e8e5d4733215a0609277a26f
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@ -45,7 +45,6 @@ SOURCES =	FeedReaderPlugin.cpp \
 			gui/FeedReaderUserNotify.cpp \
 			gui/FeedReaderFeedItem.cpp \
 			gui/FeedTreeWidget.cpp \
-			gui/ProxyWidget.cpp \
 			util/CURLWrapper.cpp \
 			util/XMLWrapper.cpp \
 			util/HTMLWrapper.cpp \
@ -67,7 +66,6 @@ HEADERS =	FeedReaderPlugin.h \
 			gui/FeedReaderUserNotify.h \
 			gui/FeedReaderFeedItem.h \
 			gui/FeedTreeWidget.h \
-			gui/ProxyWidget.h \
 			util/CURLWrapper.h \
 			util/XMLWrapper.h \
 			util/HTMLWrapper.h \
@ -78,8 +76,7 @@ FORMS =		gui/FeedReaderDialog.ui \
 			gui/AddFeedDialog.ui \
 			gui/PreviewFeedDialog.ui \
 			gui/FeedReaderConfig.ui \
-			gui/FeedReaderFeedItem.ui \
-			gui/ProxyWidget.ui
+			gui/FeedReaderFeedItem.ui

 TARGET = FeedReader

@ -128,7 +125,7 @@ win32 {

 	isEmpty(QMAKE_SH) {
 		# MinGW
-		LIBS += -lcrypt32 -lbcrypt
+		LIBS += -lcrypt32
 	}

 	# Check for msys2
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@ -180,7 +180,8 @@ void AddFeedDialog::useStandardUpdateIntervalToggled()
 void AddFeedDialog::useStandardProxyToggled()
 {
 	bool checked = ui->useStandardProxyCheckBox->isChecked();
-	ui->proxyWidget->setEnabled(!checked);
+	ui->proxyAddressLineEdit->setEnabled(!checked);
+	ui->proxyPortSpinBox->setEnabled(!checked);
 }

 void AddFeedDialog::typeForumToggled()
@ -334,8 +335,8 @@ bool AddFeedDialog::fillFeed(uint32_t feedId)
 		ui->passwordLineEdit->setText(QString::fromUtf8(feedInfo.password.c_str()));

 		ui->useStandardProxyCheckBox->setChecked(feedInfo.flag.standardProxy);
-		ui->proxyWidget->setAddress(QString::fromUtf8(feedInfo.proxyAddress.c_str()));
-		ui->proxyWidget->setPort(feedInfo.proxyPort);
+		ui->proxyAddressLineEdit->setText(QString::fromUtf8(feedInfo.proxyAddress.c_str()));
+		ui->proxyPortSpinBox->setValue(feedInfo.proxyPort);

 		ui->useStandardUpdateInterval->setChecked(feedInfo.flag.standardUpdateInterval);
 		ui->updateIntervalSpinBox->setValue(feedInfo.updateInterval / 60);
@ -424,8 +425,8 @@ void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
 	feedInfo.password = ui->passwordLineEdit->text().toUtf8().constData();

 	feedInfo.flag.standardProxy = ui->useStandardProxyCheckBox->isChecked();
-	feedInfo.proxyAddress = ui->proxyWidget->address().toUtf8().constData();
-	feedInfo.proxyPort = ui->proxyWidget->port();
+	feedInfo.proxyAddress = ui->proxyAddressLineEdit->text().toUtf8().constData();
+	feedInfo.proxyPort = ui->proxyPortSpinBox->value();

 	feedInfo.flag.standardUpdateInterval = ui->useStandardUpdateInterval->isChecked();
 	feedInfo.updateInterval = ui->updateIntervalSpinBox->value() * 60;
--- a/plugins/FeedReader/gui/AddFeedDialog.ui
+++ b/plugins/FeedReader/gui/AddFeedDialog.ui
@ -133,16 +133,37 @@
        <property name="title">
         <string>Proxy</string>
        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <item>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0" colspan="2">
          <widget class="QCheckBox" name="useStandardProxyCheckBox">
           <property name="text">
            <string>Use standard proxy</string>
           </property>
          </widget>
         </item>
-         <item>
-          <widget class="ProxyWidget" name="proxyWidget" native="true"/>
+         <item row="1" column="0">
+          <widget class="QLabel" name="serverLabel">
+           <property name="text">
+            <string>Server</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="proxyAddressLineEdit"/>
+         </item>
+         <item row="1" column="2">
+          <widget class="QLabel" name="portLabel">
+           <property name="text">
+            <string>:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QSpinBox" name="proxyPortSpinBox">
+           <property name="maximum">
+            <number>65535</number>
+           </property>
+          </widget>
         </item>
        </layout>
       </widget>
@ -444,12 +465,6 @@
   <extends>QComboBox</extends>
   <header>gui/common/RSComboBox.h</header>
  </customwidget>
-  <customwidget>
-   <class>ProxyWidget</class>
-   <extends>QWidget</extends>
-   <header>gui/ProxyWidget.h</header>
-   <container>1</container>
-  </customwidget>
 </customwidgets>
 <tabstops>
  <tabstop>urlLineEdit</tabstop>
@ -479,7 +494,8 @@
  <tabstop>useStandardUpdateInterval</tabstop>
  <tabstop>updateIntervalSpinBox</tabstop>
  <tabstop>useStandardProxyCheckBox</tabstop>
-  <tabstop>proxyWidget</tabstop>
+  <tabstop>proxyAddressLineEdit</tabstop>
+  <tabstop>proxyPortSpinBox</tabstop>
 </tabstops>
 <resources/>
 <connections/>
--- a/plugins/FeedReader/gui/FeedReaderConfig.cpp
+++ b/plugins/FeedReader/gui/FeedReaderConfig.cpp
@ -31,7 +31,8 @@ FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
 	/* Invoke the Qt Designer generated object setup routine */
 	ui->setupUi(this);

-	ui->proxyWidget->setEnabled(false);
+	ui->proxyAddressLineEdit->setEnabled(false);
+	ui->proxyPortSpinBox->setEnabled(false);

 	/* Connect signals */
 	connect(ui->updateIntervalSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, [this]() {
@ -50,7 +51,8 @@ FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
 		Settings->setValueToGroup("FeedReaderDialog", "OpenAllInNewTab", ui->openAllInNewTabCheckBox->isChecked());
 	});
 	connect(ui->useProxyCheckBox, &QCheckBox::toggled, this, &FeedReaderConfig::updateProxy);
-	connect(ui->proxyWidget, &ProxyWidget::changed, this, &FeedReaderConfig::updateProxy);
+	connect(ui->proxyAddressLineEdit, &QLineEdit::textChanged, this, &FeedReaderConfig::updateProxy);
+	connect(ui->proxyPortSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &FeedReaderConfig::updateProxy);

 	connect(ui->useProxyCheckBox, SIGNAL(toggled(bool)), this, SLOT(useProxyToggled()));
 }
@ -73,8 +75,8 @@ void FeedReaderConfig::load()
 	std::string proxyAddress;
 	uint16_t proxyPort;
 	whileBlocking(ui->useProxyCheckBox)->setChecked(rsFeedReader->getStandardProxy(proxyAddress, proxyPort));
-	whileBlocking(ui->proxyWidget)->setAddress(QString::fromUtf8(proxyAddress.c_str()));
-	whileBlocking(ui->proxyWidget)->setPort(proxyPort);
+	whileBlocking(ui->proxyAddressLineEdit)->setText(QString::fromUtf8(proxyAddress.c_str()));
+	whileBlocking(ui->proxyPortSpinBox)->setValue(proxyPort);

 	loaded = true;

@ -85,10 +87,11 @@ void FeedReaderConfig::useProxyToggled()
 {
 	bool enabled = ui->useProxyCheckBox->isChecked();

-	ui->proxyWidget->setEnabled(enabled);
+	ui->proxyAddressLineEdit->setEnabled(enabled);
+	ui->proxyPortSpinBox->setEnabled(enabled);
 }

 void FeedReaderConfig::updateProxy()
 {
-	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyWidget->address().toUtf8().constData(), ui->proxyWidget->port());
+	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyAddressLineEdit->text().toUtf8().constData(), ui->proxyPortSpinBox->value());
 }
--- a/plugins/FeedReader/gui/FeedReaderConfig.ui
+++ b/plugins/FeedReader/gui/FeedReaderConfig.ui
@ -77,16 +77,37 @@
     <property name="title">
      <string>Proxy</string>
     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="4">
       <widget class="QCheckBox" name="useProxyCheckBox">
        <property name="text">
         <string>Use proxy</string>
        </property>
       </widget>
      </item>
-      <item>
-       <widget class="ProxyWidget" name="proxyWidget" native="true"/>
+      <item row="1" column="0">
+       <widget class="QLabel" name="serverLabel">
+        <property name="text">
+         <string>Server</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="proxyAddressLineEdit"/>
+      </item>
+      <item row="1" column="3">
+       <widget class="QSpinBox" name="proxyPortSpinBox">
+        <property name="maximum">
+         <number>65535</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="potLabel">
+        <property name="text">
+         <string>:</string>
+        </property>
+       </widget>
      </item>
     </layout>
    </widget>
@ -136,19 +157,12 @@
   </item>
  </layout>
 </widget>
- <customwidgets>
-  <customwidget>
-   <class>ProxyWidget</class>
-   <extends>QWidget</extends>
-   <header>gui/ProxyWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
 <tabstops>
  <tabstop>updateIntervalSpinBox</tabstop>
  <tabstop>storageTimeSpinBox</tabstop>
  <tabstop>useProxyCheckBox</tabstop>
-  <tabstop>proxyWidget</tabstop>
+  <tabstop>proxyAddressLineEdit</tabstop>
+  <tabstop>proxyPortSpinBox</tabstop>
  <tabstop>saveInBackgroundCheckBox</tabstop>
  <tabstop>setMsgToReadOnActivate</tabstop>
  <tabstop>openAllInNewTabCheckBox</tabstop>
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@ -129,8 +129,6 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
 	settingsChanged();

 	feedTreeItemActivated(NULL);
-
-	mFontSizeHandler.registerFontSize(ui->feedTreeWidget);
 }

 FeedReaderDialog::~FeedReaderDialog()
--- a/plugins/FeedReader/gui/FeedReaderDialog.h
+++ b/plugins/FeedReader/gui/FeedReaderDialog.h
@ -23,7 +23,6 @@

 #include <retroshare-gui/mainpage.h>
 #include "interface/rsFeedReader.h"
-#include "util/FontSizeHandler.h"

 namespace Ui {
 class FeedReaderDialog;
@ -99,8 +98,6 @@ private:
 	RsFeedReader *mFeedReader;
 	FeedReaderNotify *mNotify;

-	FontSizeHandler mFontSizeHandler;
-
 	/** Qt Designer generated object */
 	Ui::FeedReaderDialog *ui;
 };
--- a/plugins/FeedReader/gui/FeedReaderDialog.ui
+++ b/plugins/FeedReader/gui/FeedReaderDialog.ui
@ -57,10 +57,10 @@
       <item row="0" column="0">
        <widget class="QFrame" name="toolBarFrame">
         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
         </property>
         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <property name="leftMargin">
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
@ -154,8 +154,6 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(uint32_t feedId, RsFeedReader *
 	ui->msgTreeWidget->installEventFilter(this);

 	setFeedId(feedId);
-
-	mFontSizeHandler.registerFontSize(ui->msgTreeWidget);
 }

 FeedReaderMessageWidget::~FeedReaderMessageWidget()
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.h
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
@ -24,7 +24,6 @@
 #include <QWidget>

 #include "interface/rsFeedReader.h"
-#include "util/FontSizeHandler.h"

 namespace Ui {
 class FeedReaderMessageWidget;
@ -108,8 +107,6 @@ private:
 	RsFeedReader *mFeedReader;
 	FeedReaderNotify *mNotify;

-	FontSizeHandler mFontSizeHandler;
-
 	Ui::FeedReaderMessageWidget *ui;
 };

--- a/plugins/FeedReader/gui/ProxyWidget.cpp
+++ b/plugins/FeedReader/gui/ProxyWidget.cpp
@ -1,142 +0,0 @@
-#include "ProxyWidget.h"
-#include "ui_ProxyWidget.h"
-
-ProxyWidget::ProxyWidget(QWidget *parent)
-	: QWidget(parent)
-	, ui(new Ui::ProxyWidget)
-{
-	ui->setupUi(this);
-
-	/* Connect signals */
-	connectUi(true);
-	connect(ui->portSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &ProxyWidget::changed);
-
-	/* Initialize types */
-	ui->schemeComboBox->addItem("", "");
-	ui->schemeComboBox->addItem("HTTP", "http://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("HTTP Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("HTTPS", "https://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("HTTPS Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS4", "socks4://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS4 Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS4a", "socks4a://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS4a Proxy. Proxy resolves URL hostname."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS5", "socks5://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS5 Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS5h", "socks5h://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS5 Proxy. Proxy resolves URL hostname."), Qt::ToolTipRole);
-}
-
-ProxyWidget::~ProxyWidget()
-{
-	delete ui;
-}
-
-void ProxyWidget::connectUi(bool doConnect)
-{
-	if (doConnect) {
-		if (!mAddressConnection) {
-			mAddressConnection = connect(ui->addressLineEdit, &QLineEdit::textChanged, this, &ProxyWidget::addressChanged);
-		}
-		if (!mSchemeConnection) {
-			mSchemeConnection = connect(ui->schemeComboBox, (void(QComboBox::*)(int))&QComboBox::currentIndexChanged, this, &ProxyWidget::changed);
-		}
-	} else {
-		if (mAddressConnection) {
-			disconnect(mAddressConnection);
-		}
-		if (mSchemeConnection) {
-			disconnect(mSchemeConnection);
-		}
-	}
-}
-
-QString ProxyWidget::address()
-{
-	QString host = ui->addressLineEdit->text();
-	if (host.isEmpty()) {
-		return "";
-	}
-
-	QString value;
-
-	QString scheme = ui->schemeComboBox->currentData().toString();
-	if (!scheme.isEmpty()) {
-		value = scheme;
-	}
-
-	value += ui->addressLineEdit->text();
-
-	return value;
-}
-
-void ProxyWidget::setAddress(const QString &value)
-{
-	int schemeIndex;
-	QString host;
-
-	splitAddress(value, schemeIndex, host);
-
-	connectUi(false);
-	ui->schemeComboBox->setCurrentIndex(schemeIndex);
-	ui->addressLineEdit->setText(host);
-	connectUi(true);
-}
-
-int ProxyWidget::port()
-{
-	return ui->portSpinBox->value();
-}
-
-void ProxyWidget::setPort(int value)
-{
-	ui->portSpinBox->setValue(value);
-}
-
-void ProxyWidget::addressChanged(const QString &value)
-{
-	int schemeIndex;
-	QString host;
-
-	splitAddress(value, schemeIndex, host);
-
-	connectUi(false);
-	ui->schemeComboBox->setCurrentIndex(schemeIndex);
-	if (host != ui->addressLineEdit->text()) {
-		ui->addressLineEdit->setText(host);
-	}
-	connectUi(true);
-
-	emit changed();
-}
-
-void ProxyWidget::splitAddress(const QString &value, int &schemeIndex, QString &host)
-{
-	if (value.isEmpty()) {
-		schemeIndex = ui->schemeComboBox->currentIndex();
-		host = value;
-		return;
-	}
-
-	QString scheme;
-	int index = value.indexOf("://");
-	if (index >= 0) {
-		scheme = value.left(index + 3);
-		host = value.mid(index + 3);
-	} else {
-		if (ui->schemeComboBox->currentIndex() == 0) {
-			// Default to HTTP
-			scheme = "http://";
-		} else {
-			scheme = ui->schemeComboBox->currentData().toString();
-		}
-		host = value;
-	}
-
-	schemeIndex = ui->schemeComboBox->findData(scheme);
-	if (schemeIndex < 0) {
-		/* Unknown scheme */
-		schemeIndex = 0;
-		host = value;
-	}
-}
--- a/plugins/FeedReader/gui/ProxyWidget.h
+++ b/plugins/FeedReader/gui/ProxyWidget.h
@ -1,40 +0,0 @@
-#ifndef PROXYWIDGET_H
-#define PROXYWIDGET_H
-
-#include <QWidget>
-
-namespace Ui {
-class ProxyWidget;
-}
-
-class ProxyWidget : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit ProxyWidget(QWidget *parent = nullptr);
-	~ProxyWidget();
-
-	QString address();
-	void setAddress(const QString &value);
-
-	int port();
-	void setPort(int value);
-
-Q_SIGNALS:
-	void changed();
-
-private Q_SLOTS:
-	void addressChanged(const QString &value);
-
-private:
-	void connectUi(bool doConnect);
-	void splitAddress(const QString &value, int &schemeIndex, QString &host);
-
-private:
-	Ui::ProxyWidget *ui;
-	QMetaObject::Connection mAddressConnection;
-	QMetaObject::Connection mSchemeConnection;
-};
-
-#endif // PROXYWIDGET_H
--- a/plugins/FeedReader/gui/ProxyWidget.ui
+++ b/plugins/FeedReader/gui/ProxyWidget.ui
@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxyWidget</class>
- <widget class="QWidget" name="ProxyWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>22</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true"/>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QComboBox" name="schemeComboBox"/>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="addressLineEdit"/>
-   </item>
-   <item>
-    <widget class="QLabel" name="portLabel">
-     <property name="text">
-      <string notr="true">:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QSpinBox" name="portSpinBox">
-     <property name="maximum">
-      <number>65535</number>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@ -9,7 +9,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+377"/>
+        <location line="+398"/>
        <source>Board</source>
        <translation type="unfinished"></translation>
    </message>
@ -34,7 +34,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="-370"/>
+        <location line="-391"/>
        <source>Authentication (not yet supported)</source>
        <translation type="unfinished"></translation>
    </message>
@ -59,7 +59,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+29"/>
+        <location line="+50"/>
        <source>Update interval</source>
        <translation type="unfinished"></translation>
    </message>
@ -89,7 +89,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="-195"/>
+        <location line="-216"/>
        <source>Storage time</source>
        <translation type="unfinished"></translation>
    </message>
@ -114,7 +114,17 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+196"/>
+        <location line="+7"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
        <source>Type</source>
        <translation type="unfinished"></translation>
    </message>
@ -189,7 +199,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+208"/>
+        <location line="+211"/>
        <location line="+152"/>
        <location line="+15"/>
        <source>Edit feed</source>
@ -254,7 +264,17 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+13"/>
+        <location line="+7"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
        <source>Misc</source>
        <translation type="unfinished"></translation>
    </message>
@ -297,12 +317,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="+105"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="+101"/>
        <source>Message Folders</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+199"/>
+        <location line="+197"/>
        <source>New</source>
        <translation type="unfinished"></translation>
    </message>
@ -352,7 +372,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+259"/>
+        <location line="+241"/>
        <source>Add new folder</source>
        <translation type="unfinished"></translation>
    </message>
@ -515,7 +535,7 @@
    </message>
    <message>
        <location line="+26"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+126"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+117"/>
        <source>Title</source>
        <translation type="unfinished"></translation>
    </message>
@ -531,11 +551,6 @@
        <source>Author</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location line="+121"/>
-        <source>Copy Link Location</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <location filename="../gui/FeedReaderMessageWidget.cpp" line="-2"/>
        <source>Search Title</source>
@ -552,7 +567,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+16"/>
+        <location line="+12"/>
        <source>Open link in browser</source>
        <translation type="unfinished"></translation>
    </message>
@ -562,7 +577,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+131"/>
+        <location line="+127"/>
        <source>The messages will be added to the forum</source>
        <translation type="unfinished"></translation>
    </message>
@ -622,7 +637,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location line="+412"/>
+        <location line="+374"/>
        <source>Hide</source>
        <translation type="unfinished"></translation>
    </message>
@ -942,37 +957,4 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>ProxyWidget</name>
-    <message>
-        <location filename="../gui/ProxyWidget.cpp" line="+17"/>
-        <source>HTTP Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>HTTPS Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS4 Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS4a Proxy. Proxy resolves URL hostname.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS5 Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS5 Proxy. Proxy resolves URL hostname.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@ -848,22 +848,6 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,

 	RsFeedReaderErrorState result = RS_FEED_ERRORSTATE_OK;

-	time_t minimumPubDate = 0;
-	if (feed.lastUpdate == 0) {
-		// Get all items on first scan
-	} else {
-		// Get storage time
-		uint32_t storageTime = 0;
-		if (feed.flag & RS_FEED_FLAG_STANDARD_STORAGE_TIME) {
-			storageTime = mFeedReader->getStandardStorageTime();
-		} else {
-			storageTime = feed.storageTime;
-		}
-		if (storageTime > 0) {
-			minimumPubDate = time(NULL) - storageTime;
-		}
-	}
-
 	XMLWrapper xml;
 	if (xml.readXML(feed.content.c_str())) {
 		xmlNodePtr root = xml.getRootElement();
@ -1022,13 +1006,6 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
 							}
 						}

-						if (minimumPubDate) {
-							if (item->pubDate < minimumPubDate) {
-								// pubDate is less than storage time, don't add as new item
-								continue;
-							}
-						}
-
 						entries.push_back(item);
 					}
 				} else {
@ -1120,7 +1097,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 	std::string url;
 	if (feed.flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE) {
 #ifdef FEEDREADER_DEBUG
-		std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") download page " << msg->link << std::endl;
+		std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") download page " << msg->link << std::endl;
 #endif
 		std::string content;
 		CURLWrapper CURL(proxy);
@ -1157,7 +1134,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe

 		if (result != RS_FEED_ERRORSTATE_OK) {
 #ifdef FEEDREADER_DEBUG
-			std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot download page, CURLCode = " << code << ", error = " << errorString << std::endl;
+			std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot download page, CURLCode = " << code << ", error = " << errorString << std::endl;
 #endif
 			return result;
 		}
@ -1303,7 +1280,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 										if (!src.empty()) {
 											/* download image */
 #ifdef FEEDREADER_DEBUG
-											std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") download image " << src << std::endl;
+											std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") download image " << src << std::endl;
 #endif
 											std::vector<unsigned char> data;
 											CURLWrapper CURL(proxy);
@ -1371,7 +1348,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 								if (!html.saveHTML(msg->postedDescriptionWithoutFirstImage)) {
 									errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-									std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+									std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
 									std::cerr << "  Error: " << errorString << std::endl;
 #endif
 									result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
@ -1380,7 +1357,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 						} else {
 							errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-							std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+							std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
 							std::cerr << "  Error: " << errorString << std::endl;
 #endif
 							result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
@ -1389,14 +1366,14 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 				}
 			} else {
 #ifdef FEEDREADER_DEBUG
-				std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") no root element" << std::endl;
+				std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") no root element" << std::endl;
 #endif
 				result = RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR;
 			}
 		} else {
 			errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-			std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot read html" << std::endl;
+			std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot read html" << std::endl;
 			std::cerr << "  Error: " << errorString << std::endl;
 #endif
 			result = RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR;
--- a/plugins/VOIP/gui/QVideoDevice.cpp
+++ b/plugins/VOIP/gui/QVideoDevice.cpp
@ -37,7 +37,6 @@ QVideoInputDevice::QVideoInputDevice(QWidget *parent)
 	_capture_device = NULL ;
 	_video_processor = NULL ;
 	_echo_output_device = NULL ;
-	_image_capture = NULL;
 }

 QVideoInputDevice::~QVideoInputDevice()
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@ -8,11 +8,7 @@

 #include "pgp/pgpkeyutil.h"
 #include "pgp/rscertificate.h"
-#ifdef USE_OPENPGPSDK
 #include "pgp/openpgpsdkhandler.h"
-#else
-#include "pgp/rnppgphandler.h"
-#endif

 #include "friendserver.h"
 #include "friend_server/fsitem.h"
@ -397,11 +393,7 @@ FriendServer::FriendServer(const std::string& base_dir,const std::string& listen
    std::string pgp_private_keyring_path = RsDirUtil::makePath(base_dir,"pgp_private_keyring") ;	// not used.
    std::string pgp_trustdb_path         = RsDirUtil::makePath(base_dir,"pgp_trustdb") ;	        // not used.

-#ifdef USE_OPENPGPSDK
    mPgpHandler = new OpenPGPSDKHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
-#else
-    mPgpHandler = new RNPPGPHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
-#endif

    // Random bias. Should be cryptographically safe.

--- a/retroshare-gui/src/README.txt
+++ b/retroshare-gui/src/README.txt
@ -2,14 +2,17 @@
 README for RetroShare
 =======================================================================================

-RetroShare web site . . . . https://retroshare.cc/
+RetroShare web site . . . . http://retroshare.net/index.html
 Developer's blog  . . . . . https://retroshareteam.wordpress.com
-Documentation . . . . . . . https://retrosharedocs.readthedocs.io/en/latest/
+Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/
+Support . . . . . . . . . . http://retroshare.net/support.html
+Forums  . . . . . . . . . . http://retroshare.sourceforge.net/forum/
 Wiki  . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki 
+Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
 Project site  . . . . . . . https://github.com/RetroShare/RetroShare
-Related projects/plugins . .https://github.com/RetroShare
+Relted projects/plugins . . https://github.com/RetroShare

-Contact:  . . . . . . . . . retroshare.project@gmail.com
+Contact:  . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net

 =========================================================================================
 Compiling RetroShare
@ -19,9 +22,9 @@ Build Scripts are avaible on GIT:
 https://github.com/RetroShare/RetroShare/tree/master/build_scripts

 You can find here instructions howto compile RetroShare:
-https://retrosharedocs.readthedocs.io/en/latest/developer/compilation/
+https://retroshare.readthedocs.io/en/latest/developer/compilation/

-You can go on over to our forum or chat room when you have trouble with compiling:
+You can go on over to our forum or chat lobby when you have trouble with compiling:
 retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995
 retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5
-
+http://retroshare.sourceforge.net/forum/
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@ -142,7 +142,7 @@ void AboutWidget::updateTitle()
 {
    if (tWidget == NULL)
    {
-        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), RsApplication::retroshareVersion(true)));
+        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), Rshare::retroshareVersion(true)));
    }
    else
    {
@ -228,7 +228,7 @@ void AWidget::initImages()
 #ifdef RS_ONLYHIDDENNODE
    p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
 #else
-    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
 #endif

    /* Draw Qt's version number */
@ -936,7 +936,7 @@ void AboutWidget::on_copy_button_clicked()
 {
 	QString verInfo;
 	QString rsVerString = "RetroShare Version: ";
-    rsVerString+=RsApplication::retroshareVersion(true);
+	rsVerString+=Rshare::retroshareVersion(true);
 	verInfo+=rsVerString;
 #ifdef RS_ONLYHIDDENNODE
 	verInfo+=" " + tr("Only Hidden Node");
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@ -143,28 +143,28 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	QHeaderView_setSectionResizeModeColumn(header, COLUMN_TOPIC, QHeaderView::Interactive);

    privateSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-    privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed"));
+    privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed chat rooms"));
 	privateSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "1");
 	//	privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
    privateSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
 	ui.lobbyTreeWidget->insertTopLevelItem(0, privateSubLobbyItem);

 	publicSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed"));
+	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed chat rooms"));
 	publicSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "2");
 	//	publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
    publicSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
 	ui.lobbyTreeWidget->insertTopLevelItem(1, publicSubLobbyItem);

 	privateLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	privateLobbyItem->setText(COLUMN_NAME, tr("Private"));
+	privateLobbyItem->setText(COLUMN_NAME, tr("Private chat rooms"));
 	privateLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "3");
 	//	privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
    privateLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
 	ui.lobbyTreeWidget->insertTopLevelItem(2, privateLobbyItem);

 	publicLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	publicLobbyItem->setText(COLUMN_NAME, tr("Public"));
+	publicLobbyItem->setText(COLUMN_NAME, tr("Public chat rooms"));
 	publicLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "4");
 	//	publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
    publicLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
@ -230,8 +230,6 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	
 	int ltwH = misc::getFontSizeFactor("LobbyTreeWidget", 1.5).height();
 	ui.lobbyTreeWidget->setIconSize(QSize(ltwH,ltwH));
-
-	mFontSizeHandler.registerFontSize(ui.lobbyTreeWidget);
 }

 ChatLobbyWidget::~ChatLobbyWidget()
@ -422,7 +420,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby
    if(lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED)
 	{
        tooltipstr += QObject::tr("\nSecurity: no anonymous IDs") ;
-		QColor foreground = QColor(16, 157, 0); // green
+		QColor foreground = QColor(0, 128, 0); // green
 		for (int column = 0; column < COLUMN_COUNT; ++column)
 			item->setData(column, Qt::ForegroundRole, foreground);
 	}
@ -723,9 +721,9 @@ void ChatLobbyWidget::updateDisplay()
        }
 	}
 	publicSubLobbyItem->setHidden(publicSubLobbyItem->childCount()==0);
-	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed")+ QString(" (") + QString::number(publicSubLobbyItem->childCount())+QString(")"));
+	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed chat rooms")+ QString(" (") + QString::number(publicSubLobbyItem->childCount())+QString(")"));
 	privateSubLobbyItem->setHidden(privateSubLobbyItem->childCount()==0);
-	publicLobbyItem->setText(COLUMN_NAME, tr("Public")+ " (" + QString::number(publicLobbyItem->childCount())+QString(")"));
+	publicLobbyItem->setText(COLUMN_NAME, tr("Public chat rooms")+ " (" + QString::number(publicLobbyItem->childCount())+QString(")"));
 }

 void ChatLobbyWidget::createChatLobby()
--- a/retroshare-gui/src/gui/ChatLobbyWidget.h
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.h
@ -25,7 +25,6 @@

 #include "chat/ChatLobbyUserNotify.h"
 #include "gui/gxs/GxsIdChooser.h"
-#include "util/FontSizeHandler.h"


 #include <retroshare/rsmsgs.h>
@ -147,8 +146,6 @@ private:
 	QAbstractButton* myInviteYesButton;
 	GxsIdChooser* myInviteIdChooser;

-	FontSizeHandler mFontSizeHandler;
-
 	/* UI - from Designer */
 	Ui::ChatLobbyWidget ui;
 };
--- a/retroshare-gui/src/gui/ChatLobbyWidget.ui
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui
@ -73,7 +73,7 @@
       <widget class="QLabel" name="titleBarLabel">
        <property name="font">
         <font>
-	   <pointsize>12</pointsize>
+          <pointsize>12</pointsize>
          <weight>75</weight>
          <bold>true</bold>
         </font>
@ -191,6 +191,11 @@
       </item>
       <item>
        <widget class="RSTreeWidget" name="lobbyTreeWidget">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
         <property name="iconSize">
          <size>
           <width>16</width>
@ -459,7 +464,7 @@
  <customwidget>
   <class>LineEditClear</class>
   <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <header location="global">gui/common/LineEditClear.h</header>
  </customwidget>
  <customwidget>
   <class>RSTreeWidget</class>
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
@ -102,7 +102,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_REMAINING:
 			remaining = index.data().toLongLong();
@ -121,7 +121,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_COMPLETED:
 			completed = index.data().toLongLong();
@ -140,7 +140,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_DLSPEED:
                        dlspeed = index.data().toDouble();
@ -151,7 +151,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                            temp.sprintf("%.2f", dlspeed/1024.);
                            temp += " KB/s";
                        }
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_PROGRESS:
 			{
@ -236,7 +236,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
 				p.setX( p.x() + pixOffset);
 				painter->drawPixmap(p, pixmap);
 				temp = " " + temp;
@ -247,13 +247,13 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
 				p.setX( p.x() + pixOffset);
 				painter->drawPixmap(p, pixmap);
 				temp = " " + temp;
 				pixOffset += pixmap.size().width();
 			}
-			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft, temp);
 		}
 		break;
    case COLUMN_LASTDL:
@ -279,7 +279,7 @@ QSize DLListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModel
 {
    float w = QFontMetricsF(option.font).width(index.data(Qt::DisplayRole).toString());

-    int S = QFontMetricsF(option.font).height()*1.5 ;
+    int S = QFontMetricsF(option.font).height() ;
    return QSize(w,S);
 }

--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@ -30,7 +30,7 @@
 #include "gui/RetroShareLink.h"
 #include "retroshare-gui/RsAutoUpdatePage.h"
 #include "gui/msgs/MessageComposer.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/settings/rsharesettings.h"
@ -38,7 +38,6 @@
 #include "gui/common/RSTreeWidgetItem.h"
 #include "util/QtVersion.h"
 #include "util/qtthreadsutils.h"
-#include "util/misc.h"

 #include <retroshare/rsfiles.h>
 #include <retroshare/rsturtle.h>
@ -202,6 +201,10 @@ SearchDialog::SearchDialog(QWidget *parent)

    ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);

+    QFontMetricsF fontMetrics(ui.searchResultWidget->font());
+    int iconHeight = fontMetrics.height() * 1.4;
+    ui.searchResultWidget->setIconSize(QSize(iconHeight, iconHeight));
+
    /* Set initial size the splitter */
    QList<int> sizes;
    sizes << 250 << width(); // Qt calculates the right sizes
@ -236,8 +239,6 @@ SearchDialog::SearchDialog(QWidget *parent)
        RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
    }, mEventHandlerId, RsEventType::FILE_TRANSFER );

-    mFontSizeHandler.registerFontSize(ui.searchSummaryWidget);
-    mFontSizeHandler.registerFontSize(ui.searchResultWidget, 1.4f);
 }

 SearchDialog::~SearchDialog()
@ -324,7 +325,7 @@ void SearchDialog::checkText(const QString& txt)
 	ui.searchButton->setDisabled(txt.length() < 3);
 	ui.searchLineFrame->setProperty("valid", (txt.length() >= 3));
 	ui.searchLineFrame->style()->unpolish(ui.searchLineFrame);
-	RsApplication::refreshStyleSheet(ui.searchLineFrame, false);
+	Rshare::refreshStyleSheet(ui.searchLineFrame, false);
 }

 void SearchDialog::initialiseFileTypeMappings()
@ -496,23 +497,25 @@ void SearchDialog::collCreate()
 	int selectedCount = selectedItems.size() ;
 	QTreeWidgetItem * item ;

-    RsFileTree tree;
-
-    for (int i = 0; i < selectedCount; ++i)
-    {
+	for (int i = 0; i < selectedCount; ++i) {
 		item = selectedItems.at(i) ;

-        if (!item->text(SR_HASH_COL).isEmpty())
-        {
+		if (!item->text(SR_HASH_COL).isEmpty()) {
 			std::string name = item->text(SR_NAME_COL).toUtf8().constData();
 			RsFileHash hash( item->text(SR_HASH_COL).toStdString() );
 			uint64_t count = item->text(SR_SIZE_COL).toULongLong();

-            tree.addFile(tree.root(),name,hash,count);
+			DirDetails details;
+			details.name = name;
+			details.hash = hash;
+            details.size = count;
+			details.type = DIR_TYPE_FILE;
+
+			dirVec.push_back(details);
 		}
 	}

-    RsCollectionDialog::openNewCollection(tree);
+	RsCollection(dirVec,RS_FILE_HINTS_LOCAL).openNewColl(this);
 }

 void SearchDialog::collModif()
@ -539,8 +542,12 @@ void SearchDialog::collModif()
 	/* open file with a suitable application */
 	QFileInfo qinfo;
 	qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
+	if (qinfo.exists()) {
+		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+			RsCollection collection;
+			collection.openColl(qinfo.absoluteFilePath());
+		}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
+	}//if (qinfo.exists())
 }

 void SearchDialog::collView()
@ -567,8 +574,12 @@ void SearchDialog::collView()
 	/* open file with a suitable application */
 	QFileInfo qinfo;
 	qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-        RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
+	if (qinfo.exists()) {
+		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+			RsCollection collection;
+			collection.openColl(qinfo.absoluteFilePath(), true);
+		}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
+	}//if (qinfo.exists())
 }

 void SearchDialog::collOpen()
@ -586,35 +597,32 @@ void SearchDialog::collOpen()

 			if (rsFiles->FileDetails(hash, RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL
 			                               | RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE
-                                     | RS_FILE_HINTS_SPEC_ONLY, info))
-            {
+                                     | RS_FILE_HINTS_SPEC_ONLY, info)) {
+
 				/* make path for downloaded files */
 				std::string path;
 				path = info.path;

 				/* open file with a suitable application */
 				QFileInfo qinfo;
-                RsCollection::RsCollectionErrorCode err;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                    RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),err));
+				if (qinfo.exists()) {
+					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+						RsCollection collection;
+						if (collection.load(qinfo.absoluteFilePath())) {
+							collection.downloadFiles();
+							return;
+						}
+					}
+				}
 			}
 		}
 	}

-    QString fileName;
-    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    RsCollection::RsCollectionErrorCode err;
-    RsCollection collection(fileName, err);
-
-    if(err == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-        RsCollectionDialog::downloadFiles(collection);
-    else
-        QMessageBox::information(nullptr,tr("Error open RsCollection file"),RsCollection::errorString(err));
+	RsCollection collection;
+	if (collection.load(this)) {
+		collection.downloadFiles();
+	}//if (collection.load(this))
 }

 void SearchDialog::downloadDirectory(const QTreeWidgetItem *item, const QString &base)
@ -898,7 +906,7 @@ void SearchDialog::searchKeywords(const QString& keywords)
 	if (keywords.length() < 3)
 		return ;

-	QStringList qWords = keywords.split(" ", QtSkipEmptyParts);
+	QStringList qWords = keywords.split(" ", QString::SkipEmptyParts);
 	std::list<std::string> words;
 	QStringListIterator qWordsIter(qWords);
 	while (qWordsIter.hasNext())
@ -1040,7 +1048,7 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons

 		child->setText(SR_SOURCES_COL, QString::number(1));
 		child->setData(SR_SOURCES_COL, ROLE_SORT, 1);
-		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );

 		child->setText(SR_SEARCH_ID_COL, sid_hexa);
 		setIconAndType(child, QString::fromUtf8(dir.name.c_str()));
@ -1065,7 +1073,7 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons
 		child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
 		child->setText(SR_SOURCES_COL, QString::number(1));
 		child->setData(SR_SOURCES_COL, ROLE_SORT, 1);
-		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
 		child->setText(SR_SEARCH_ID_COL, sid_hexa);
 		child->setText(SR_TYPE_COL, tr("Folder"));

@ -1134,7 +1142,7 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons
    child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
    child->setText(SR_SOURCES_COL, QString::number(1));
    child->setData(SR_SOURCES_COL, ROLE_SORT, 1);
-    child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+    child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
    child->setText(SR_SEARCH_ID_COL, sid_hexa);
    child->setText(SR_TYPE_COL, tr("Folder"));

@ -1236,7 +1244,7 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s
 			int friendSource = 0;
 			int anonymousSource = 0;
 			QString resultCount = it->text(SR_SOURCES_COL);
-			QStringList modifiedResultCount = resultCount.split("/", QtSkipEmptyParts);
+			QStringList modifiedResultCount = resultCount.split("/", QString::SkipEmptyParts);
 			if(searchType == FRIEND_SEARCH)
 			{
 				friendSource = modifiedResultCount.at(0).toInt() + 1;
@ -1326,11 +1334,9 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s

 		item->setText(SR_SIZE_COL, QString::number(file.size));
 		item->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) file.size);
-		item->setText(SR_AGE_COL, QString::number(file.mtime));
-		item->setData(SR_AGE_COL, ROLE_SORT, file.mtime);
+        item->setText(SR_AGE_COL, QString::number(file.mtime));
+        item->setData(SR_AGE_COL, ROLE_SORT, file.mtime);
 		item->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
-		item->setTextAlignment( SR_AGE_COL, Qt::AlignCenter );
-
 		int friendSource = 0;
 		int anonymousSource = 0;
 		if(searchType == FRIEND_SEARCH)
@ -1349,7 +1355,7 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s
 		item->setText(SR_SOURCES_COL,modifiedResult);
 		item->setToolTip(SR_SOURCES_COL, tr("Obtained via ")+QString::fromStdString(rsPeers->getPeerName(file.id)) );
 		item->setData(SR_SOURCES_COL, ROLE_SORT, fltRes);
-		item->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+		item->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
 		item->setText(SR_SEARCH_ID_COL, sid_hexa);

 		QColor foreground;
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
@ -25,7 +25,6 @@
 #include "retroshare/rsevents.h"
 #include "ui_SearchDialog.h"
 #include "retroshare-gui/mainpage.h"
-#include "util/FontSizeHandler.h"

 class AdvancedSearchDialog;
 class RSTreeWidgetItemCompareRole;
@ -174,8 +173,6 @@ private:
 	QAction *collViewAct;
 	QAction *collOpenAct;

-	FontSizeHandler mFontSizeHandler;
-
 /** Qt Designer generated object */
    Ui::SearchDialog ui;

--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@ -27,7 +27,7 @@
 #include "gui/RetroShareLink.h"
 #include "gui/ShareManager.h"
 #include "gui/common/PeerDefs.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/gxschannels/GxsChannelDialog.h"
 #include "gui/gxsforums/GxsForumsDialog.h"
@ -652,7 +652,7 @@ void SharedFilesDialog::copyLinks(const QModelIndexList& lst, bool remote,QList<

            QString dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();

-            RetroShareLink link = RetroShareLink::createFileTree(dir_name,ft->totalFileSize(),ft->numFiles(),QString::fromStdString(ft->toRadix64())) ;
+            RetroShareLink link = RetroShareLink::createFileTree(dir_name,ft->mTotalSize,ft->mTotalFiles,QString::fromStdString(ft->toRadix64())) ;

 			if(link.valid())
 				urls.push_back(link) ;
@ -734,32 +734,7 @@ void SharedFilesDialog::sendLinkTo()
 void SharedFilesDialog::collCreate()
 {
    QModelIndexList lst = getSelected();
-
-    std::vector <DirDetails> dirVec;
-    model->getDirDetailsFromSelect(lst, dirVec);
-
-    auto RemoteMode = isRemote();
-    FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
-
-    QString dir_name;
-
-    if(!RemoteMode)
-    {
-        if(!dirVec.empty())
-        {
-            const DirDetails& details = dirVec[0];
-            dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
-        }
-    }
-
-    RsFileTree tree;
-
-    for(uint32_t i=0;i<dirVec.size();++i)
-        tree.addFileTree(tree.root(),*RsFileTree::fromDirDetails(dirVec[i],RemoteMode,true));
-
-    RsCollectionDialog::openNewCollection(tree);
-
-            //auto ft = RsFileTree::fromDirDetails(details,remote);
+    model->createCollectionFile(this, lst);
 }

 void SharedFilesDialog::collModif()
@ -784,8 +759,12 @@ void SharedFilesDialog::collModif()
    /* open file with a suitable application */
    QFileInfo qinfo;
    qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::editExistingCollection(qinfo.absoluteFilePath());
+    if (qinfo.exists()) {
+        if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+            RsCollection collection;
+            collection.openColl(qinfo.absoluteFilePath());
+        }
+    }
 }

 void SharedFilesDialog::collView()
@ -810,8 +789,12 @@ void SharedFilesDialog::collView()
    /* open file with a suitable application */
    QFileInfo qinfo;
    qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-        RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
+    if (qinfo.exists()) {
+        if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+            RsCollection collection;
+            collection.openColl(qinfo.absoluteFilePath(), true);
+        }
+    }
 }

 void SharedFilesDialog::collOpen()
@ -838,24 +821,20 @@ void SharedFilesDialog::collOpen()
            qinfo.setFile(QString::fromUtf8(path.c_str()));
            if (qinfo.exists()) {
                if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-
-                    RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(),true);
+                    RsCollection collection;
+                    if (collection.load(qinfo.absoluteFilePath())) {
+                        collection.downloadFiles();
+                        return;
+                    }
                }
            }
        }
    }

-    QString fileName;
-    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    RsCollection::RsCollectionErrorCode err;
-    RsCollection collection(fileName,err);
-
-    if(err == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-        RsCollectionDialog::downloadFiles(collection);
+    RsCollection collection;
+    if (collection.load(this)) {
+        collection.downloadFiles();
+    }
 }

 void LocalSharedFilesDialog::playselectedfiles()
@ -1166,14 +1145,12 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point )
    collViewAct->setEnabled(bIsRsColl);
    collOpenAct->setEnabled(true);

-    QMenu collectionMenu(tr("Retroshare Collection"), this);
+    QMenu collectionMenu(tr("Collection"), this);
    collectionMenu.setIcon(QIcon(IMAGE_LIBRARY));
    collectionMenu.addAction(collCreateAct);
-
-    if(bIsRsColl)
-        collectionMenu.addAction(collModifAct);
-    //collectionMenu.addAction(collViewAct);
-    //collectionMenu.addAction(collOpenAct);
+    collectionMenu.addAction(collModifAct);
+    collectionMenu.addAction(collViewAct);
+    collectionMenu.addAction(collOpenAct);

    switch (type) {
        case DIR_TYPE_DIR :
@ -1619,7 +1596,7 @@ void SharedFilesDialog::FilterItems()
        return ;

    //FileSearchFlags flags = isRemote()?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL;
-    QStringList lst = text.split(" ",QtSkipEmptyParts) ;
+    QStringList lst = text.split(" ",QString::SkipEmptyParts) ;
    std::list<std::string> keywords ;

    for(auto it(lst.begin());it!=lst.end();++it)
@ -1711,16 +1688,12 @@ bool SharedFilesDialog::tree_FilterItem(const QModelIndex &index, const QString

 void SharedFilesDialog::updateFontSize()
 {
-#if defined(Q_OS_DARWIN)
-    int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 13).toInt();
-#else
    int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 11).toInt();
-#endif
    QFont newFont = ui.dirTreeView->font();
    if (newFont.pointSize() != customFontSize) {
        newFont.setPointSize(customFontSize);
        QFontMetricsF fontMetrics(newFont);
-        int iconHeight = fontMetrics.height()*1.5;
+        int iconHeight = fontMetrics.height();
        ui.dirTreeView->setFont(newFont);
        ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight));
    }
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@ -23,10 +23,10 @@
      </sizepolicy>
     </property>
     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
     </property>
     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <property name="leftMargin">
@ -399,8 +399,8 @@ border-image: url(:/images/closepressed.png)
  </customwidget>
 </customwidgets>
 <resources>
-  <include location="../icons.qrc"/>
  <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
 </resources>
 <connections/>
 </ui>
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@ -24,7 +24,7 @@
 #include "gui/SoundManager.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/FilesDefs.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/common/RSTreeView.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/FileTransfer/DetailsDialog.h"
@ -1975,7 +1975,7 @@ void TransfersDialog::pasteLink()
 	for(auto &it : links)
 		col.merge_in(it.name(),it.size(),RsFileHash(it.hash().toStdString())) ;

-    RsCollectionDialog::downloadFiles(col);
+	col.downloadFiles();
 }

 void TransfersDialog::getDLSelectedItems(std::set<RsFileHash> *ids, std::set<int> *rows)
@ -2466,17 +2466,21 @@ void TransfersDialog::collCreate()
 	std::set<RsFileHash>::iterator it ;
 	getDLSelectedItems(&items, NULL);

-    RsFileTree tree;
-
 	for (it = items.begin(); it != items.end(); ++it)
 	{
 		FileInfo info;
 		if (!rsFiles->FileDetails(*it, RS_FILE_HINTS_DOWNLOAD, info)) continue;

-        tree.addFile(tree.root(),info.fname,info.hash,info.size);
+		DirDetails details;
+		details.name = info.fname;
+		details.hash = info.hash;
+        details.size = info.size;
+		details.type = DIR_TYPE_FILE;
+
+		dirVec.push_back(details);
 	}

-    RsCollectionDialog::openNewCollection(tree);
+	RsCollection(dirVec,RS_FILE_HINTS_LOCAL).openNewColl(this);
 }

 void TransfersDialog::collModif()
@ -2500,8 +2504,12 @@ void TransfersDialog::collModif()
 		/* open collection */
 		QFileInfo qinfo;
 		qinfo.setFile(QString::fromUtf8(path.c_str()));
-        if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
+		if (qinfo.exists()) {
+			if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+				RsCollection collection;
+				collection.openColl(qinfo.absoluteFilePath());
+			}
+		}
 	}
 }

@ -2526,8 +2534,12 @@ void TransfersDialog::collView()
 		/* open collection  */
 		QFileInfo qinfo;
 		qinfo.setFile(QString::fromUtf8(path.c_str()));
-        if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
+		if (qinfo.exists()) {
+			if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+				RsCollection collection;
+				collection.openColl(qinfo.absoluteFilePath(), true);
+			}
+		}
 	}
 }

@ -2552,29 +2564,23 @@ void TransfersDialog::collOpen()
 				/* open file with a suitable application */
 				QFileInfo qinfo;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                {
-                        RsCollection::RsCollectionErrorCode code;
-                        RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),code));
-                        return;
-                }
+				if (qinfo.exists()) {
+					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+						RsCollection collection;
+						if (collection.load(qinfo.absoluteFilePath())) {
+							collection.downloadFiles();
+							return;
+						}
+					}
+				}
 			}
 		}
 	}

-    QString fileName;
-    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    RsCollection::RsCollectionErrorCode code;
-    RsCollection collection(fileName,code);
-
-    if(code == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-        RsCollectionDialog::downloadFiles(collection);
-    else
-        QMessageBox::information(nullptr,tr("Error openning collection file"),RsCollection::errorString(code));
+	RsCollection collection;
+	if (collection.load(this)) {
+		collection.downloadFiles();
+	}
 }

 void TransfersDialog::collAutoOpen(const QString &fileHash)
@ -2586,18 +2592,21 @@ void TransfersDialog::collAutoOpen(const QString &fileHash)
 		if (rsFiles->FileDetails(hash, RS_FILE_HINTS_DOWNLOAD, info)) {

 			/* make path for downloaded files */
-            if (info.downloadStatus == FT_STATE_COMPLETE)
-            {
+			if (info.downloadStatus == FT_STATE_COMPLETE) {
 				std::string path;
 				path = info.path + "/" + info.fname;

 				/* open file with a suitable application */
 				QFileInfo qinfo;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-                RsCollection::RsCollectionErrorCode err;
-
-                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                    RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),err));
+				if (qinfo.exists()) {
+					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+						RsCollection collection;
+						if (collection.load(qinfo.absoluteFilePath(), false)) {
+							collection.autoDownloadFiles();
+						}
+					}
+				}
 			}
 		}
 	}
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
@ -101,7 +101,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_UTRANSFERRED:
 			transferred = index.data().toLongLong();
@ -120,7 +120,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_ULSPEED:
                        ulspeed = index.data().toDouble();
@ -131,7 +131,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                            temp.sprintf("%.2f", ulspeed/1024.);
                            temp += " KB/s";
                        }
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
        case COLUMN_UPROGRESS:
 			{
@ -164,10 +164,10 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
 				painter->drawPixmap(p, pixmap);
 			}
-			painter->drawText(option.rect.translated(pixmap.size().width(), 0), Qt::AlignLeft | Qt::AlignVCenter, index.data().toString());
+			painter->drawText(option.rect.translated(pixmap.size().width(), 0), Qt::AlignLeft, index.data().toString());
 			break;
 		default:
 			painter->drawText(option.rect, Qt::AlignCenter, index.data().toString());
@ -181,7 +181,7 @@ QSize ULListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModel
 {
    float w = QFontMetricsF(option.font).width(index.data(Qt::DisplayRole).toString());

-    int S = QFontMetricsF(option.font).height()*1.5 ;
+    int S = QFontMetricsF(option.font).height() ;
    return QSize(w,S);
 }

--- a/retroshare-gui/src/gui/FriendsDialog.ui
+++ b/retroshare-gui/src/gui/FriendsDialog.ui
@ -102,7 +102,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="icon">
-         <iconset resource="icons.qrc">
+         <iconset resource="images.qrc">
          <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
        </property>
        <property name="checkable">
@ -132,10 +132,10 @@
          <string notr="true"/>
         </property>
         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
         </property>
         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
         </property>
         <layout class="QGridLayout" name="headerBFrame_GL">
          <property name="leftMargin">
@ -401,8 +401,8 @@
  </customwidget>
 </customwidgets>
 <resources>
-  <include location="icons.qrc"/>
  <include location="images.qrc"/>
+  <include location="icons.qrc"/>
 </resources>
 <connections/>
 </ui>
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@ -251,7 +251,7 @@ void GenCertDialog::initKeyList()

 void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
 {
-    //std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
+	std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;

 	QDialog::mouseMoveEvent(e) ;
 }
@ -649,7 +649,7 @@ void GenCertDialog::genPerson()
 	{
 		/* complete the process */
 		RsInit::LoadPassword(sslPasswd);
-		if (RsApplication::loadCertificate(sslId, false)) {
+		if (Rshare::loadCertificate(sslId, false)) {

            // Normally we should clear the cached passphrase as soon as possible. However,some other GUI components may still need it at start.
            // (csoler) This is really bad: we have to guess that 30 secs will be enough. I have no better way to do this.
--- a/retroshare-gui/src/gui/GetStartedDialog.cpp
+++ b/retroshare-gui/src/gui/GetStartedDialog.cpp
@ -421,7 +421,7 @@ void GetStartedDialog::emailSupport()
 	sysVersion = "Linux";
  #endif
 #endif
-	text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(RsApplication::retroshareVersion(true)
+	text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(Rshare::retroshareVersion(true)
 	                                                                    , sysVersion
 	                                                                    ).arg(static_cast<typename std::underlying_type<RsConfigUserLvl>::type>(userLevel)) + "\n";
 	text += "\n";
--- a/retroshare-gui/src/gui/HelpDialog.cpp
+++ b/retroshare-gui/src/gui/HelpDialog.cpp
@ -80,7 +80,7 @@ HelpDialog::HelpDialog(QWidget *parent) :
 		ui->thanks->setHtml(in.readAll());
 	}

-	ui->version->setText(RsApplication::retroshareVersion(true));
+	ui->version->setText(Rshare::retroshareVersion(true));

 	/* Add version numbers of libretroshare */
 	std::list<RsLibraryInfo> libraries;
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@ -27,13 +27,11 @@
 #include "util/misc.h"

 #include "gui/notifyqt.h"
-#include "gui/common/FilesDefs.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/connect/ConnectFriendWizard.h"
 #include "gui/connect/ConfCertDialog.h"
 #include <gui/QuickStartWizard.h>
 #include "gui/connect/FriendRecommendDialog.h"
-#include "settings/rsharesettings.h"

 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 #include <QUrlQuery>
@ -65,9 +63,6 @@ HomePage::HomePage(QWidget *parent) :
    QAction *RecAction = new QAction(QIcon(),tr("Recommend friends to each others"), this);
    connect(RecAction, SIGNAL(triggered()), this, SLOT(recommendFriends()));

-    QAction *SaveAction = new QAction(QIcon(),tr("Save to File"), this);
-    connect(SaveAction, SIGNAL(triggered()), this, SLOT(saveCert()));
-
    QAction *SendAction = new QAction(QIcon(),tr("Send via Email"), this);
    connect(SendAction, SIGNAL(triggered()), this, SLOT(runEmailClient()));

@ -78,7 +73,6 @@ HomePage::HomePage(QWidget *parent) :
    menu->addAction(CopyIdAction);

    menu->addSeparator();
-    menu->addAction(SaveAction);
    menu->addAction(SendAction);
    menu->addAction(WebMailAction);
    menu->addAction(RecAction);
@ -141,8 +135,6 @@ HomePage::HomePage(QWidget *parent) :
    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { handleEvent(event); }, mEventHandlerId, RsEventType::NETWORK );

    updateOwnCert();
-
-    updateHomeLogo();
 }

 void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
@ -385,18 +377,3 @@ void HomePage::openWebHelp()
 {
    QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
 }
-
-void HomePage::showEvent(QShowEvent *event)
-{
-	if (!event->spontaneous()) {
-		updateHomeLogo();
-	}
-}
-
-void HomePage::updateHomeLogo()
-{
-	if (Settings->getSheetName() == ":Standard_Dark")
-		ui->label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":images/logo/logo_web_nobackground_black.png"));
-	else
-		ui->label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":images/logo/logo_web_nobackground.png"));
-}
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@ -51,8 +51,6 @@ public:
    void getOwnCert(QString& invite,QString& description) const;
    RetroshareInviteFlags currentInviteFlags() const ;

-    virtual void showEvent(QShowEvent *) override;
-
 private slots:
 #ifdef DEAD_CODE
    void certContextMenu(QPoint);
@ -65,8 +63,7 @@ private slots:
 	void addFriend();
 	void webMail();
 	void openWebHelp() ;
-	void recommendFriends();
-	void updateHomeLogo();
+    void recommendFriends();

 private:
 	Ui::HomePage *ui;
--- a/retroshare-gui/src/gui/HomePage.ui
+++ b/retroshare-gui/src/gui/HomePage.ui
@ -43,6 +43,7 @@
        <property name="font">
         <font>
          <family>Courier New</family>
+          <pointsize>10</pointsize>
          <weight>75</weight>
          <bold>true</bold>
         </font>
@ -87,6 +88,7 @@
        </property>
        <property name="font">
         <font>
+          <pointsize>11</pointsize>
          <weight>75</weight>
          <bold>true</bold>
         </font>
@ -105,7 +107,7 @@
         <string>...</string>
        </property>
        <property name="icon">
-         <iconset resource="icons.qrc">
+         <iconset resource="images.qrc">
          <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
        </property>
        <property name="checkable">
@ -231,6 +233,11 @@
   </item>
   <item row="1" column="0" colspan="5">
    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+      </font>
+     </property>
     <property name="text">
      <string>Open Source cross-platform, 
 private and secure decentralized communication platform.
@ -310,6 +317,11 @@ private and secure decentralized communication platform.
      </item>
      <item row="0" column="0" colspan="3">
       <widget class="QLabel" name="label_3">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
        <property name="styleSheet">
         <string notr="true"/>
        </property>
@ -393,6 +405,11 @@ private and secure decentralized communication platform.
      </item>
      <item row="0" column="0" colspan="3">
       <widget class="QLabel" name="label_4">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
        <property name="text">
         <string>Do you need help with Retroshare?</string>
        </property>
@ -407,8 +424,8 @@ private and secure decentralized communication platform.
  </layout>
 </widget>
 <resources>
-  <include location="icons.qrc"/>
  <include location="images.qrc"/>
+  <include location="icons.qrc"/>
 </resources>
 <connections/>
 </ui>
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
--- a/retroshare-gui/src/gui/Identity/IdDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdDialog.h
@ -22,10 +22,8 @@
 #define IDENTITYDIALOG_H

 #include "gui/gxs/RsGxsUpdateBroadcastPage.h"
-#include "util/FontSizeHandler.h"

-#include "retroshare/rsidentity.h"
-#include "IdentityListModel.h"
+#include <retroshare/rsidentity.h>

 #include <QTimer>

@ -36,11 +34,7 @@ class IdDialog;
 }

 class UIStateHelper;
-class QStyledItemDelegate;
 class QTreeWidgetItem;
-class RsIdentityListModel;
-class IdListSortFilterProxyModel;
-class QItemSelection;

 class IdDialog : public MainPage
 {
@ -64,7 +58,6 @@ protected:
 	void loadIdentity(RsGxsIdGroup id_data);

 	void loadCircles(const std::list<RsGroupMetaData>& circle_metas);
-    void updateIdListRequest();

 	//void requestCircleGroupData(const RsGxsCircleId& circle_id);
 	bool getItemCircleId(QTreeWidgetItem *item,RsGxsCircleId& id) ;
@ -73,13 +66,13 @@ protected:


 private slots:
-    void updateIdList();
-    void updateCircles();
-    void createExternalCircle();
+	void updateIdList();
+	void updateCircles();
+
+	void createExternalCircle();
 	void showEditExistingCircle();
 	void updateCirclesDisplay();
 	void toggleAutoBanIdentities(bool b);
-    void sortColumn(int col,Qt::SortOrder so);

 	void acceptCircleSubscription() ;
 	void cancelCircleSubscription() ;
@ -93,20 +86,17 @@ private slots:
 	void removeIdentity();
 	void editIdentity();
 	void chatIdentity();
-    void chatIdentityItem(const QModelIndex &indx);
-    void chatIdentity(const RsGxsId& toGxsId);
-    void sendMsg();
+	void chatIdentityItem(QTreeWidgetItem* item);
+	void sendMsg();
 	void copyRetroshareLink();
 	void on_closeInfoFrameButton_Invite_clicked();

-    void updateSelection(const QItemSelection &new_sel, const QItemSelection &old_sel);
+	void updateSelection();

 	void modifyReputation();

 	/** Create the context popup menu and it's submenus */
 	void IdListCustomPopupMenu( QPoint point );
-    void headerContextMenuRequested(QPoint);
-    void toggleColumnVisible();

 	void CircleListCustomPopupMenu(QPoint point) ;
 #ifdef SUSPENDED
@ -127,12 +117,7 @@ private:
 	void processSettings(bool load);
 	QString createUsageString(const RsIdentityUsage& u) const;

-    void saveExpandedPathsAndSelection_idTreeView(std::set<QStringList> &expanded, std::set<QStringList> &selected);
-    void restoreExpandedPathsAndSelection_idTreeView(const std::set<QStringList>& expanded, const std::set<QStringList>& selelected);
-    void recursSaveExpandedItems_idTreeView(const QModelIndex& index, const QStringList& parent_path, std::set<QStringList>& expanded, std::set<QStringList>& selected);
-    void recursRestoreExpandedItems_idTreeView(const QModelIndex& index,const QStringList& parent_path,const std::set<QStringList>& expanded,const std::set<QStringList>& selected);
-
-    void requestIdData(std::list<RsGxsGroupId> &ids);
+	void requestIdData(std::list<RsGxsGroupId> &ids);
 	bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept);
 	void insertIdList(uint32_t token);
 	void filterIds();
@ -149,32 +134,20 @@ private:
 private:
 	UIStateHelper *mStateHelper;

+	QTreeWidgetItem *contactsItem;
+	QTreeWidgetItem *allItem;
+	QTreeWidgetItem *ownItem;
 	QTreeWidgetItem *mExternalBelongingCircleItem;
 	QTreeWidgetItem *mExternalOtherCircleItem;
 	QTreeWidgetItem *mMyCircleItem;
 	RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ;

-    int mLastSortColumn;
-    Qt::SortOrder mLastSortOrder;
-
-    void saveExpandedCircleItems(std::vector<bool> &expanded_root_items, std::set<RsGxsCircleId>& expanded_circle_items) const;
+	void saveExpandedCircleItems(std::vector<bool> &expanded_root_items, std::set<RsGxsCircleId>& expanded_circle_items) const;
 	void restoreExpandedCircleItems(const std::vector<bool>& expanded_root_items,const std::set<RsGxsCircleId>& expanded_circle_items);

-    void applyWhileKeepingTree(std::function<void()> predicate);
-
-    RsGxsId getSelectedIdentity() const;
-    std::list<RsGxsId> getSelectedIdentities() const;
-
-    RsGxsGroupId mId;
+	RsGxsGroupId mId;
 	RsGxsGroupId mIdToNavigate;
 	int filter;
-    bool mColumnSizeAlreadySet; // remembers if we already did some size set. If not, automatically stretch to content.
-
-    QStyledItemDelegate *mElidedLabelDelegate;
-    QStyledItemDelegate *mReputationDelegate;
-
-    RsIdentityListModel *mIdListModel;
-    IdListSortFilterProxyModel *mProxyModel;

 	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 	RsEventsHandlerId_t mEventHandlerId_identity;
@ -184,8 +157,6 @@ private:
 	bool needUpdateIdsOnNextShow;
 	bool needUpdateCirclesOnNextShow;

-	FontSizeHandler mFontSizeHandler;
-
 	/* UI -  Designer */
 	Ui::IdDialog *ui;
 };
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@ -700,10 +700,10 @@ void IdEditDialog::removeAvatar()

 void IdEditDialog::updateInterface()
 {
-	QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
-	if (!pixmap.isNull()) {
+	const QPixmap *pixmap = ui->avatarLabel->pixmap();
+	if (pixmap && !pixmap->isNull()) {
 		ui->removeButton->setEnabled(true);
-    } else if (mEditGroup.mImage.mSize > 0) {
+	} else if (mEditGroup.mImage.mSize != NULL) {
 		ui->removeButton->setEnabled(true);
 	} else {
 		ui->removeButton->setEnabled(false);
--- a/retroshare-gui/src/gui/Identity/IdentityListModel.cpp
+++ b/retroshare-gui/src/gui/Identity/IdentityListModel.cpp
@ -1,968 +0,0 @@
-/*******************************************************************************
- * retroshare-gui/src/gui/msgs/RsFriendListModel.cpp                           *
- *                                                                             *
- * Copyright 2019 by Cyril Soler <csoler@users.sourceforge.net>                *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include <list>
-
-#include <QApplication>
-#include <QDateTime>
-#include <QFontMetrics>
-#include <QModelIndex>
-#include <QTreeView>
-#include <QPainter>
-#include <QIcon>
-
-#include "gui/common/AvatarDefs.h"
-#include "util/qtthreadsutils.h"
-#include "util/HandleRichText.h"
-#include "util/DateTime.h"
-#include "gui/gxs/GxsIdDetails.h"
-#include "retroshare/rsexpr.h"
-
-#include "IdentityListModel.h"
-
-//#define DEBUG_MODEL
-//#define DEBUG_MODEL_INDEX
-
-std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere
-
-const QString RsIdentityListModel::FilterString("filtered");
-
-const uint32_t MAX_INTERNAL_DATA_UPDATE_DELAY = 300 ; 	// re-update the internal data every 5 mins. Should properly cover sleep/wake-up changes.
-const uint32_t MAX_NODE_UPDATE_DELAY = 10 ; 			// re-update the internal data every 5 mins. Should properly cover sleep/wake-up changes.
-
-static const uint32_t ID_DETAILS_UPDATE_DELAY = 5;	// update each node every 5 secs.
-
-RsIdentityListModel::RsIdentityListModel(QObject *parent)
-    : QAbstractItemModel(parent)
-    , mLastInternalDataUpdate(0), mLastNodeUpdate(0)
-{
-    mFontSize = QApplication::font().pointSize();
-
-	mFilterStrings.clear();
-    mIdentityUpdateTimer = new QTimer();
-    connect(mIdentityUpdateTimer,SIGNAL(timeout()),this,SLOT(timerUpdate()));
-}
-
-void RsIdentityListModel::timerUpdate()
-{
-    emit dataChanged(index(0,0,QModelIndex()),index(2,0,QModelIndex()));
-}
-RsIdentityListModel::EntryIndex::EntryIndex()
-   : type(ENTRY_TYPE_INVALID),category_index(0),identity_index(0)
-{
-}
-
-// The index encodes the whole hierarchy of parents. This allows to very efficiently compute indices of the parent of an index.
-//
-// On 32 bits and 64 bits architectures the format is the following:
-//
-//     0x [2 bits] 00000 [24 bits] [2 bits]
-//            |              |        |
-//            |              |        +-------------- type (0=top level, 1=category, 2=identity)
-//            |              +----------------------- identity index
-//            +-------------------------------------- category index
-//
-
-bool RsIdentityListModel::convertIndexToInternalId(const EntryIndex& e,quintptr& id)
-{
-    // the internal id is set to the place in the table of items. We simply shift to allow 0 to mean something special.
-
-    if(e.type == ENTRY_TYPE_INVALID)
-    {
-        RsErr() << "ERROR: asked for the internal id of an invalid EntryIndex" ;
-        id = 0;
-        return true;
-    }
-    if(bool(e.identity_index >> 24))
-    {
-        RsErr() << "Cannot encode more than 2^24 identities. Somthing's wrong. e.identity_index = " << std::hex << e.identity_index << std::dec ;
-        id = 0;
-        return false;
-    }
-
-    id = ((0x3 & (uint32_t)e.category_index) << 30) + ((uint32_t)e.identity_index << 2) + (0x3 & (uint32_t)e.type);
-
-    return true;
-}
-bool RsIdentityListModel::convertInternalIdToIndex(quintptr ref,EntryIndex& e)
-{
-    // Compatible with ref=0 since it will cause type=TOP_LEVEL
-
-    e.type            = static_cast<RsIdentityListModel::EntryType>((ref >>  0) & 0x3) ;// 2 bits
-    e.identity_index  = (ref >>  2) & 0xffffff;// 24 bits
-    e.category_index  = (ref >> 30) & 0x3 ;// 2 bits
-
-    return true;
-}
-
-static QIcon createAvatar(const QPixmap &avatar, const QPixmap &overlay)
-{
-	int avatarWidth = avatar.width();
-	int avatarHeight = avatar.height();
-
-	QPixmap pixmap(avatar);
-
-	int overlaySize = (avatarWidth > avatarHeight) ? (avatarWidth/2.5) :  (avatarHeight/2.5);
-	int overlayX = avatarWidth - overlaySize;
-	int overlayY = avatarHeight - overlaySize;
-
-	QPainter painter(&pixmap);
-	painter.drawPixmap(overlayX, overlayY, overlaySize, overlaySize, overlay);
-
-	QIcon icon;
-	icon.addPixmap(pixmap);
-	return icon;
-}
-
-void RsIdentityListModel::preMods()
-{
-	emit layoutAboutToBeChanged();
-}
-void RsIdentityListModel::postMods()
-{
-	emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,columnCount()-1,(void*)NULL));
-	emit layoutChanged();
-}
-
-int RsIdentityListModel::rowCount(const QModelIndex& parent) const
-{
-	if(parent.column() >= COLUMN_THREAD_NB_COLUMNS)
-		return 0;
-
-    EntryIndex index;
-
-    if(!parent.isValid() || !convertInternalIdToIndex(parent.internalId(),index))
-        return mCategories.size();
-
-    switch(index.type)
-    {
-    case ENTRY_TYPE_CATEGORY: return mCategories[index.category_index].child_identity_indices.size();
-    case ENTRY_TYPE_TOP_LEVEL: return mCategories.size();
-    default:
-        return 0;
-    }
-}
-
-int RsIdentityListModel::columnCount(const QModelIndex &/*parent*/) const
-{
-	return COLUMN_THREAD_NB_COLUMNS ;
-}
-
-bool RsIdentityListModel::hasChildren(const QModelIndex &parent) const
-{
-    if(!parent.isValid())
-        return true;
-
-    EntryIndex parent_index ;
-    convertInternalIdToIndex(parent.internalId(),parent_index);
-
-    if(parent_index.type == ENTRY_TYPE_TOP_LEVEL)
-        return true;
-
-    if(parent_index.type == ENTRY_TYPE_IDENTITY)
-        return false;
-
-    if(parent_index.type == ENTRY_TYPE_CATEGORY)
-        return !mCategories[parent_index.category_index].child_identity_indices.empty();
-
-    return false;
-}
-
-RsIdentityListModel::EntryIndex RsIdentityListModel::EntryIndex::parent() const
-{
-	EntryIndex i(*this);
-
-	switch(type)
-	{
-        case ENTRY_TYPE_CATEGORY: i.type = ENTRY_TYPE_TOP_LEVEL;
-                                  i.category_index = 0;
-                                  i.identity_index = 0;
-        break;
-
-        case ENTRY_TYPE_IDENTITY: 	i.type = ENTRY_TYPE_CATEGORY;
-                                    i.identity_index = 0;
-		break;
-        case ENTRY_TYPE_TOP_LEVEL:
-                std::cerr << "ERROR: calling parent() on entryindex with no parent!" << std::endl;
-
-    default:
-			//Can be when request root index.
-		break;
-	}
-
-	return i;
-}
-
-RsIdentityListModel::EntryIndex RsIdentityListModel::EntryIndex::child(int row) const
-{
-    EntryIndex i;
-
-	switch(type)
-    {
-    case ENTRY_TYPE_TOP_LEVEL:
-                            i.type = ENTRY_TYPE_CATEGORY;
-                           i.category_index = row;
-                           i.identity_index = 0;
-
-						   break;
-
-    case ENTRY_TYPE_CATEGORY: i.type = ENTRY_TYPE_IDENTITY;
-                           i.category_index = category_index;
-                           i.identity_index = row;
-						   break;
-
-    case ENTRY_TYPE_IDENTITY:  i = EntryIndex();
-                std::cerr << "ERROR: calling child() on entryindex with no children!" << std::endl;
-    default:
-						   break;
-    }
-
-    return i;
-
-}
-uint32_t   RsIdentityListModel::EntryIndex::parentRow() const
-{
-    switch(type)
-    {
-    default:
-        case ENTRY_TYPE_TOP_LEVEL: return -1;
-        case ENTRY_TYPE_CATEGORY : return -1;
-        case ENTRY_TYPE_IDENTITY : return category_index;
-    }
-}
-
-QModelIndex RsIdentityListModel::index(int row, int column, const QModelIndex& parent) const
-{
-    if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
-		return QModelIndex();
-
-    EntryIndex parent_index ;
-    convertInternalIdToIndex(parent.internalId(),parent_index);
-#ifdef DEBUG_MODEL_INDEX
-    RsDbg() << "Index row=" << row << " col=" << column << " parent=" << parent << std::endl;
-#endif
-
-    quintptr ref;
-    EntryIndex new_index = parent_index.child(row);
-    convertIndexToInternalId(new_index,ref);
-
-#ifdef DEBUG_MODEL_INDEX
-    RsDbg() << "  returning " << createIndex(row,column,ref) << std::endl;
-#endif
-
-    return createIndex(row,column,ref);
-}
-
-QModelIndex RsIdentityListModel::parent(const QModelIndex& index) const
-{
-	if(!index.isValid())
-		return QModelIndex();
-
-	EntryIndex I ;
-    convertInternalIdToIndex(index.internalId(),I);
-
-	EntryIndex p = I.parent();
-
-    if(p.type == ENTRY_TYPE_TOP_LEVEL)
-		return QModelIndex();
-
-	quintptr i;
-    convertIndexToInternalId(p,i);
-
-    return createIndex(I.parentRow(),0,i);
-}
-
-Qt::ItemFlags RsIdentityListModel::flags(const QModelIndex& index) const
-{
-	if (!index.isValid())
-		return Qt::ItemFlags();
-
-	return QAbstractItemModel::flags(index);
-}
-
-QVariant RsIdentityListModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const
-{
-	if(role == Qt::DisplayRole)
-		switch(section)
-		{
-		case COLUMN_THREAD_NAME:         return tr("Name");
-		case COLUMN_THREAD_ID:           return tr("Id");
-        case COLUMN_THREAD_REPUTATION:   return QVariant();
-        case COLUMN_THREAD_OWNER_ID:     return tr("Owner Id");
-        case COLUMN_THREAD_OWNER_NAME:   return tr("Owner");
-        default:
-			return QVariant();
-		}
-    if(role == Qt::DecorationRole && section == COLUMN_THREAD_REPUTATION)
-        return QIcon(":/icons/flag-green.png");
-
-    return QVariant();
-}
-
-QVariant RsIdentityListModel::data(const QModelIndex &index, int role) const
-{
-#ifdef DEBUG_MESSAGE_MODEL
-    std::cerr << "calling data(" << index << ") role=" << role << std::endl;
-#endif
-
-	if(!index.isValid())
-		return QVariant();
-
-	quintptr ref = (index.isValid())?index.internalId():0 ;
-
-#ifdef DEBUG_MESSAGE_MODEL
-	std::cerr << "data(" << index << ")" ;
-#endif
-
-	if(!ref)
-	{
-#ifdef DEBUG_MESSAGE_MODEL
-		std::cerr << " [empty]" << std::endl;
-#endif
-		return QVariant() ;
-	}
-
-	EntryIndex entry;
-
-    if(!convertInternalIdToIndex(ref,entry))
-	{
-#ifdef DEBUG_MESSAGE_MODEL
-		std::cerr << "Bad pointer: " << (void*)ref << std::endl;
-#endif
-		return QVariant() ;
-	}
-
-	switch(role)
-	{
-	case Qt::SizeHintRole:   return sizeHintRole(entry,index.column()) ;
-	case Qt::DisplayRole:    return displayRole(entry,index.column()) ;
-	case Qt::FontRole:       return fontRole(entry,index.column()) ;
-    case Qt::ForegroundRole: return foregroundRole(entry,index.column()) ;
-    case Qt::DecorationRole: return decorationRole(entry,index.column()) ;
-
- 	case FilterRole:         return filterRole(entry,index.column()) ;
- 	case SortRole:           return sortRole(entry,index.column()) ;
-    case TreePathRole:       return treePathRole(entry,index.column()) ;
-
-	default:
-		return QVariant();
-	}
-}
-
-bool RsIdentityListModel::passesFilter(const EntryIndex& e,int /*column*/) const
-{
-	QString s ;
-
-    if(mFilterStrings.empty() || e.type != ENTRY_TYPE_IDENTITY)
-        return true;
-
-    auto passes_strings = [&](const QString& s) -> bool {
-        bool res = true;
-
-        for(auto iter(mFilterStrings.begin()); iter != mFilterStrings.end(); ++iter)
-            res = res && s.contains(*iter,Qt::CaseInsensitive);
-
-        return res;
-    };
-
-    if((mFilterType & FilterType::FILTER_TYPE_ID)         && passes_strings(displayRole(e,COLUMN_THREAD_ID        ).toString())) return true;
-    if((mFilterType & FilterType::FILTER_TYPE_NAME)       && passes_strings(displayRole(e,COLUMN_THREAD_NAME      ).toString())) return true;
-    if((mFilterType & FilterType::FILTER_TYPE_OWNER_ID)   && passes_strings(displayRole(e,COLUMN_THREAD_OWNER_ID  ).toString())) return true;
-    if((mFilterType & FilterType::FILTER_TYPE_OWNER_NAME) && passes_strings(displayRole(e,COLUMN_THREAD_OWNER_NAME).toString())) return true;
-
-    return false;
-}
-
-QVariant RsIdentityListModel::filterRole(const EntryIndex& e,int column) const
-{
-	if(passesFilter(e,column))
-		return QVariant(FilterString);
-
-	return QVariant(QString());
-}
-
-uint32_t RsIdentityListModel::updateFilterStatus(ForumModelIndex /*i*/,int /*column*/,const QStringList& /*strings*/)
-{
-	return 0;
-}
-
-
-void RsIdentityListModel::setFilter(uint8_t filter_type, const QStringList& strings)
-{
-#ifdef DEBUG_MODEL
-    std::cerr << "Setting filter to filter_type=" << int(filter_type) << " and strings to " ;
-    foreach(const QString& str,strings)
-        std::cerr << "\"" << str.toStdString() << "\" " ;
-    std::cerr << std::endl;
-#endif
-
-    preMods();
-
-    mFilterType = filter_type;
-	mFilterStrings = strings;
-
-	postMods();
-}
-
-QVariant RsIdentityListModel::toolTipRole(const EntryIndex& fmpe,int /*column*/) const
-{
-    switch(fmpe.type)
-    {
-    case ENTRY_TYPE_IDENTITY:
-    {
-        auto id_info = getIdentityInfo(fmpe);
-
-        if(!id_info)
-            return QVariant();
-
-        if(id_info->flags & RS_IDENTITY_FLAGS_IS_DEPRECATED)
-            return QVariant( tr("\nThis identity has a insecure fingerprint (It's probably quite old).\nYou should get rid of it now and use a new one.\nThese identities are not supported anymore.") ) ;
-
-        if(rsIdentity->isOwnId(id_info->id))
-            return QVariant(tr("This identity is owned by you"));
-
-        if(id_info->owner.isNull())
-            return QVariant("Anonymous identity");
-        else
-        {
-            RsPeerDetails dd;
-            if(rsPeers->getGPGDetails(id_info->owner,dd))
-                return QVariant(tr("Identity owned by profile")+" \""+ QString::fromUtf8(dd.name.c_str()) +"\" ("+QString::fromStdString(id_info->owner.toStdString()));
-            else
-                return QVariant(tr("Identity possibly owned by unknown profile")+" \""+ QString::fromUtf8(dd.name.c_str()) +"\" ("+QString::fromStdString(id_info->owner.toStdString()));
-        }
-    }
-
-        break;
-    case ENTRY_TYPE_CATEGORY: ; // fallthrough
-    default:
-        return QVariant();
-    }
-}
-
-QVariant RsIdentityListModel::sizeHintRole(const EntryIndex& e,int col) const
-{
-	float x_factor = QFontMetricsF(QApplication::font()).height()/14.0f ;
-	float y_factor = QFontMetricsF(QApplication::font()).height()/14.0f ;
-
-    if(e.type == ENTRY_TYPE_IDENTITY)
-        y_factor *= 1.0;
-
-    if(e.type == ENTRY_TYPE_CATEGORY)
-		y_factor *= 1.5;
-
-    std::cerr << "sizeHintRole()" << std::endl;
-	switch(col)
-	{
-	default:
-    case COLUMN_THREAD_REPUTATION: return QVariant( QSize(x_factor * 14 , y_factor*14*1.1f ));
-
-    case COLUMN_THREAD_NAME:
-    case COLUMN_THREAD_ID:
-    case COLUMN_THREAD_OWNER_NAME:
-    case COLUMN_THREAD_OWNER_ID:   return QFontMetricsF(QApplication::font()).boundingRect(displayRole(e,col).toString()).size();
-    }
-}
-
-QString RsIdentityListModel::indexIdentifier(QModelIndex index)
-{
-    quintptr ref = (index.isValid())?index.internalId():0 ;
-
-#ifdef DEBUG_MESSAGE_MODEL
-    std::cerr << "data(" << index << ")" ;
-#endif
-
-    if(!ref)
-    {
-#ifdef DEBUG_MESSAGE_MODEL
-        std::cerr << " [empty]" << std::endl;
-#endif
-        return QString();
-    }
-
-    EntryIndex entry;
-    if(!convertInternalIdToIndex(ref,entry))
-        return QString();
-
-    return treePathRole(entry,0).toString();
-}
-QVariant RsIdentityListModel::treePathRole(const EntryIndex& entry,int /*column*/) const
-{
-    if(entry.type == ENTRY_TYPE_CATEGORY)
-        return QString::number((int)entry.category_index);
-    else
-        return QString::fromStdString(mIdentities[mCategories[entry.category_index].child_identity_indices[entry.identity_index]].id.toStdString());
-}
-QVariant RsIdentityListModel::sortRole(const EntryIndex& entry,int column) const
-{
-    switch(column)
-    {
-    case COLUMN_THREAD_REPUTATION:  return decorationRole(entry,column);
-
-    case COLUMN_THREAD_ID:
-    case COLUMN_THREAD_OWNER_ID:
-    case COLUMN_THREAD_OWNER_NAME:
-    case COLUMN_THREAD_NAME: [[__fallthrough__]];
-    default:
-        return displayRole(entry,column);
-    }
-}
-
-QModelIndex RsIdentityListModel::getIndexOfIdentity(const RsGxsId& id) const
-{
-    for(uint i=0;i<mCategories.size();++i)
-        for(uint j=0;j<mCategories[i].child_identity_indices.size();++j)
-            if(mIdentities[mCategories[i].child_identity_indices[j]].id == id)
-            {
-                EntryIndex e;
-                e.category_index = i;
-                e.identity_index = j;
-                e.type = ENTRY_TYPE_IDENTITY;
-                quintptr idx;
-                convertIndexToInternalId(e,idx);
-
-                return createIndex(j,0,idx);
-            }
-    return QModelIndex();
-}
-
-QModelIndex RsIdentityListModel::getIndexOfCategory(Category id) const
-{
-    EntryIndex e;
-    e.category_index = id;
-    e.type = ENTRY_TYPE_CATEGORY;
-
-    quintptr idx;
-    convertIndexToInternalId(e,idx);
-
-    return createIndex((int)id,0,idx);
-}
-QVariant RsIdentityListModel::foregroundRole(const EntryIndex& e, int /*col*/) const
-{
-    auto it = getIdentityInfo(e);
-    if(!it)
-        return QVariant();
-
-    if(it->flags & RS_IDENTITY_FLAGS_IS_DEPRECATED)
-        return QVariant(QColor(Qt::red));
-
-    return QVariant();
-}
-QVariant RsIdentityListModel::fontRole(const EntryIndex& e, int /*col*/) const
-{
-    QFont f;
-    f.setPointSize(mFontSize);
-
-    auto it = getIdentityInfo(e);
-
-    if(it)
-    {
-        RsGxsId id(it->id);
-
-        if(rsIdentity->isOwnId(id))
-            f.setBold(true);
-    }
-
-    return QVariant(f);
-}
-void RsIdentityListModel::setFontSize(int s)
-{
-    if(s != mFontSize)
-    {
-        mFontSize = s;
-        emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mCategories.size()-1,columnCount()-1,(void*)NULL));
-    }
-}
-
-#ifdef DEBUG_MODEL_INDEX
-	std::cerr << "  font role " << e.type << ", (" << (int)e.group_index << ","<< (int)e.profile_index << ","<< (int)e.node_index << ") col="<< col<<": " << std::endl;
-#endif
-
-#ifdef TODO
-	int status = onlineRole(e,col).toInt();
-
-	switch (status)
-	{
-		case RS_STATUS_INACTIVE:
-		{
-			QFont font ;
-			QTreeView* myParent = dynamic_cast<QTreeView*>(QAbstractItemModel::parent());
-			if (myParent)
-				font = myParent->font();
-
-			font.setBold(true);
-
-			return QVariant(font);
-		}
-		default:
-		return QVariant();
-	}
-#endif
-
-QVariant RsIdentityListModel::displayRole(const EntryIndex& e, int col) const
-{
-#ifdef DEBUG_MODEL_INDEX
-	std::cerr << "  Display role " << e.type << ", (" << (int)e.group_index << ","<< (int)e.profile_index << ","<< (int)e.node_index << ") col="<< col<<": ";
-#endif
-
-	switch(e.type)
-	{
-        case ENTRY_TYPE_CATEGORY:
-		{
-            const HierarchicalCategoryInformation *cat = getCategoryInfo(e);
-
-            if(!cat)
-				return QVariant();
-
-			switch(col)
-			{
-				case COLUMN_THREAD_NAME:
-#ifdef DEBUG_MODEL_INDEX
-					std::cerr <<   group->group_info.name.c_str() ;
-#endif
-
-                    if(!cat->child_identity_indices.empty())
-                        return QVariant(cat->category_name+" (" + QString::number(cat->child_identity_indices.size()) + ")");
-					else
-                        return QVariant(cat->category_name);
-
-				default:
-				return QVariant();
-			}
-		}
-		break;
-
-        case ENTRY_TYPE_IDENTITY:
-        {
-                const HierarchicalIdentityInformation *idinfo = getIdentityInfo(e);
-                const QString loading_string = "["+tr("Loading...")+"]";
-
-#ifdef DEBUG_MODEL_INDEX
-                std::cerr << profile->profile_info.name.c_str() ;
-#endif
-                if(col == COLUMN_THREAD_ID) return QVariant(QString::fromStdString(idinfo->id.toStdString()) );
-                if(col == COLUMN_THREAD_REPUTATION) return QVariant();
-
-                if(idinfo->nickname.empty())
-                    return loading_string;
-
-                switch(col)
-                {
-                case COLUMN_THREAD_NAME:           return QVariant(QString::fromUtf8(idinfo->nickname.c_str()));
-                case COLUMN_THREAD_OWNER_NAME:     if(idinfo->owner.isNull())
-                                                        return QVariant();
-                                                    else
-                                                        return QVariant(QString::fromStdString(rsPeers->getGPGName(idinfo->owner)) );
-
-                case COLUMN_THREAD_OWNER_ID:       if(idinfo->owner.isNull())
-                                                        return QVariant();
-                                                    else
-                                                        return QVariant(QString::fromStdString(idinfo->owner.toStdString()) );
-                default:
-                        return QVariant();
-                }
-        }
-		break;
-
-		default: //ENTRY_TYPE
-		return QVariant();
-	}
-}
-
-// This function makes sure that the internal data gets updated. They are situations where the notification system cannot
-// send the information about changes, such as when the computer is put on sleep.
-
-void RsIdentityListModel::checkInternalData(bool force)
-{
-	rstime_t now = time(NULL);
-
-    if( (mLastInternalDataUpdate + MAX_INTERNAL_DATA_UPDATE_DELAY < now) || force)
-        updateIdentityList();
-}
-
-const RsIdentityListModel::HierarchicalCategoryInformation *RsIdentityListModel::getCategoryInfo(const EntryIndex& e) const
-{
-    if(e.category_index >= mCategories.size())
-        return NULL ;
-    else
-        return &mCategories[e.category_index];
-}
-
-const RsIdentityListModel::HierarchicalIdentityInformation *RsIdentityListModel::getIdentityInfo(const EntryIndex& e) const
-{
-    // First look into the relevant group, then for the correct profile in this group.
-
-    if(e.type != ENTRY_TYPE_IDENTITY)
-        return nullptr ;
-
-    if(e.category_index >= mCategories.size())
-        return nullptr ;
-
-    if(e.identity_index < mCategories[e.category_index].child_identity_indices.size())
-    {
-        auto& it(mIdentities[mCategories[e.category_index].child_identity_indices[e.identity_index]]);
-        rstime_t now = time(nullptr);
-
-        if(now > it.last_update_TS + ID_DETAILS_UPDATE_DELAY)
-        {
-            RsIdentityDetails det;
-            if(rsIdentity->getIdDetails(it.id,det))
-            {
-                it.nickname = det.mNickname;
-                it.owner = det.mPgpId;
-                it.flags = det.mFlags;
-                it.last_update_TS = now;
-            }
-        }
-        return &it;
-    }
-    else
-    {
-        RsErr() << "Inconsistent identity index!" ;
-        return nullptr;
-    }
-}
-
-QVariant RsIdentityListModel::decorationRole(const EntryIndex& entry,int col) const
-{
-    switch(entry.type)
-    {
-    case ENTRY_TYPE_CATEGORY:
-        return QVariant();
-
-    case ENTRY_TYPE_IDENTITY:
-    {
-        const HierarchicalIdentityInformation *hn = getIdentityInfo(entry);
-
-        if(!hn)
-            return QVariant();
-
-        if(col == COLUMN_THREAD_REPUTATION)
-            return QVariant( static_cast<uint8_t>(rsReputations->overallReputationLevel(hn->id)) );
-        else if(col == COLUMN_THREAD_NAME)
-        {
-            QPixmap sslAvatar;
-            RsIdentityDetails details ;
-
-            if(!rsIdentity->getIdDetails(hn->id, details))
-            {
-                mIdentityUpdateTimer->stop();
-                mIdentityUpdateTimer->setSingleShot(true);
-                mIdentityUpdateTimer->start(500);
-                return QVariant();
-            }
-            else if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, sslAvatar,GxsIdDetails::LARGE))
-                return QVariant(QIcon(GxsIdDetails::makeDefaultIcon(hn->id,GxsIdDetails::SMALL)));
-            else
-                return QVariant(QIcon(sslAvatar));
-        }
-        else
-            return QVariant();
-    }
-        break;
-
-    default:
-        return QVariant();
-    }
-}
-
-void RsIdentityListModel::clear()
-{
-    preMods();
-
-    mIdentities.clear();
-    mCategories.clear();
-
-    mCategories.resize(3);
-    mCategories[0].category_name = tr("My own identities");
-    mCategories[1].category_name = tr("My contacts");
-    mCategories[2].category_name = tr("All");
-
-	postMods();
-
-	emit friendListChanged();
-}
-
-
-void RsIdentityListModel::debug_dump() const
-{
-    std::cerr << "==== IdentityListModel Debug dump ====" << std::endl;
-
-    std::cerr << "Invalid index  : " << QModelIndex() << std::endl;
-
-    EntryIndex top_level;
-    top_level.type = ENTRY_TYPE_TOP_LEVEL;
-    quintptr id;
-    convertIndexToInternalId(top_level,id);
-
-    std::cerr << "Top level index: " << createIndex(0,0,id) << std::endl;
-    EntryIndex tei;
-    convertInternalIdToIndex(0,tei);
-    std::cerr << "Top level entry index: " << tei << std::endl;
-
-    for(uint32_t j=0;j<mCategories.size();++j)
-    {
-        std::cerr << mCategories[j].category_name.toStdString() << " (" << mCategories[j].child_identity_indices.size() << ")" << std::endl;
-        const auto& hg(mCategories[j].child_identity_indices);
-
-        for(uint32_t i=0;i<hg.size();++i)
-        {
-            auto idx = getIndexOfIdentity(mIdentities[hg[i]].id);
-            auto parent = idx.parent();
-            EntryIndex index;
-            EntryIndex index_parent;
-            convertInternalIdToIndex(idx.internalId(),index);
-            convertInternalIdToIndex(parent.internalId(),index_parent);
-            std::cerr << "       " << mIdentities[hg[i]].id << " index = " << idx << " parent = " << idx.parent() << " EntryIndex: " << index << " Parent index: " << index_parent << std::endl;
-        }
-    }
-
-    std::cerr << "====================================" << std::endl;
-}
-
-
-RsGxsId RsIdentityListModel::getIdentity(const QModelIndex& i) const
-{
-    if(!i.isValid())
-        return RsGxsId();
-
-    EntryIndex e;
-    if(!convertInternalIdToIndex(i.internalId(),e) || e.type != ENTRY_TYPE_IDENTITY)
-        return RsGxsId();
-
-    const HierarchicalIdentityInformation *gnode = getIdentityInfo(e);
-
-    if(gnode)
-        return gnode->id;
-    else
-        return RsGxsId();
-}
-
-RsIdentityListModel::EntryType RsIdentityListModel::getType(const QModelIndex& i) const
-{
-	if(!i.isValid())
-        return ENTRY_TYPE_TOP_LEVEL;
-
-	EntryIndex e;
-    if(!convertInternalIdToIndex(i.internalId(),e))
-        return ENTRY_TYPE_TOP_LEVEL;
-
-    return e.type;
-}
-
-int RsIdentityListModel::getCategory(const QModelIndex& i) const
-{
-    if(!i.isValid())
-        return CATEGORY_ALL;
-
-    EntryIndex e;
-    if(!convertInternalIdToIndex(i.internalId(),e))
-        return CATEGORY_ALL;
-
-    return e.category_index;
-}
-void RsIdentityListModel::setIdentities(const std::list<RsGroupMetaData>& identities_meta)
-{
-    preMods();
-    beginResetModel();
-    clear();
-
-    for(auto id:identities_meta)
-    {
-        HierarchicalIdentityInformation idinfo;
-        idinfo.id = RsGxsId(id.mGroupId);
-        idinfo.last_update_TS = 0;// forces update
-
-        if(rsIdentity->isOwnId(idinfo.id))
-            mCategories[CATEGORY_OWN].child_identity_indices.push_back(mIdentities.size());
-        else if(rsIdentity->isARegularContact(RsGxsId(id.mGroupId)))
-            mCategories[CATEGORY_CTS].child_identity_indices.push_back(mIdentities.size());
-        else
-            mCategories[CATEGORY_ALL].child_identity_indices.push_back(mIdentities.size());
-
-        mIdentities.push_back(idinfo);
-    }
-
-    if (mCategories.size()>0)
-    {
-        beginInsertRows(QModelIndex(),0,mCategories.size()-1);
-        endInsertRows();
-    }
-
-    endResetModel();
-    postMods();
-
-    mLastInternalDataUpdate = time(NULL);
-
-}
-
-void RsIdentityListModel::updateIdentityList()
-{
-    std::cerr << "Updating identity list" << std::endl;
-
-    std::list<RsGroupMetaData> ids ;
-
-    if(!rsIdentity->getIdentitiesSummaries(ids))
-    {
-        std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve identity metadata." << std::endl;
-        return;
-    }
-
-    setIdentities(ids) ;
-
-    debug_dump();
-}
-
-
-
-void RsIdentityListModel::collapseItem(const QModelIndex& index)
-{
-    if(getType(index) != ENTRY_TYPE_CATEGORY)
-        return;
-
-    EntryIndex entry;
-
-    if(!convertInternalIdToIndex(index.internalId(),entry))
-        return;
-
-    mExpandedCategories[entry.category_index] = false;
-
-    // apparently we cannot be subtle here.
-    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mCategories.size()-1,columnCount()-1,(void*)NULL));
-}
-
-void RsIdentityListModel::expandItem(const QModelIndex& index)
-{
-    if(getType(index) != ENTRY_TYPE_CATEGORY)
-        return;
-
-    EntryIndex entry;
-
-    if(!convertInternalIdToIndex(index.internalId(),entry))
-        return;
-
-    mExpandedCategories[entry.category_index] = true;
-
-    // apparently we cannot be subtle here.
-    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mCategories.size()-1,columnCount()-1,(void*)NULL));
-}
-
-
-
--- a/retroshare-gui/src/gui/Identity/IdentityListModel.h
+++ b/retroshare-gui/src/gui/Identity/IdentityListModel.h
@ -1,252 +0,0 @@
-/*******************************************************************************
- * retroshare-gui/src/gui/msgs/RsFriendListModel.h                             *
- *                                                                             *
- * Copyright 2019 by Cyril Soler <csoler@users.sourceforge.net>                *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#pragma once
-
-#include <QModelIndex>
-#include <QColor>
-
-#include "retroshare/rsstatus.h"
-#include "retroshare/rsmsgs.h"
-#include "retroshare/rspeers.h"
-#include "retroshare/rsidentity.h"
-
-typedef uint32_t ForumModelIndex;
-
-// This class is the item model used by Qt to display the information
-
-class QTimer;
-
-class RsIdentityListModel : public QAbstractItemModel
-{
-	Q_OBJECT
-
-public:
-    explicit RsIdentityListModel(QObject *parent = NULL);
-    ~RsIdentityListModel(){}
-
-    enum Columns {
-		COLUMN_THREAD_NAME         = 0x00,
-        COLUMN_THREAD_ID           = 0x01,
-        COLUMN_THREAD_OWNER_NAME   = 0x02,
-        COLUMN_THREAD_OWNER_ID     = 0x03,
-        COLUMN_THREAD_REPUTATION   = 0x04,
-        COLUMN_THREAD_NB_COLUMNS   = 0x05
-	};
-
-	enum Roles{ SortRole           = Qt::UserRole+1,
-              	StatusRole         = Qt::UserRole+2,
-              	UnreadRole         = Qt::UserRole+3,
-              	FilterRole         = Qt::UserRole+4,
-                TreePathRole       = Qt::UserRole+5,
-              };
-
-    enum FilterType{ FILTER_TYPE_NONE       = 0x00,
-                     FILTER_TYPE_ID         = 0x01,
-                     FILTER_TYPE_NAME       = 0x02,
-                     FILTER_TYPE_OWNER_NAME = 0x04,
-                     FILTER_TYPE_OWNER_ID   = 0x08
-                   };
-
-    enum EntryType{ ENTRY_TYPE_TOP_LEVEL = 0x00,
-                    ENTRY_TYPE_CATEGORY  = 0x01,
-                    ENTRY_TYPE_IDENTITY  = 0x02,
-                    ENTRY_TYPE_INVALID   = 0x03
-                  };
-
-    enum Category{ 	CATEGORY_OWN = 0x00,
-                    CATEGORY_CTS = 0x01,
-                    CATEGORY_ALL = 0x02
-                 };
-
-    struct HierarchicalCategoryInformation
-    {
-        QString category_name;
-        std::vector<uint32_t> child_identity_indices;	// index in the array of hierarchical profiles
-    };
-
-    // This stores all the info that is useful avoiding a call to the more expensive getIdDetails()
-    //
-    struct HierarchicalIdentityInformation
-    {
-        rstime_t last_update_TS;
-        RsGxsId id;
-        RsPgpId owner;
-        uint32_t flags;
-        std::string nickname;
-    };
-
-    // This structure encodes the position of a node in the hierarchy. The type tells which of the index fields are valid.
-
-    struct EntryIndex
-    {
-    public:
-        EntryIndex();
-
-        EntryType type;		        // type of the entry (group,profile,location)
-
-        friend std::ostream& operator<<(std::ostream& o, const EntryIndex& e)
-        {
-            o << "[" ;
-            switch(e.type)
-            {
-            case RsIdentityListModel::ENTRY_TYPE_INVALID: o << "Invalid," ; break;
-            case RsIdentityListModel::ENTRY_TYPE_CATEGORY: o << "Category," ; break;
-            case RsIdentityListModel::ENTRY_TYPE_IDENTITY: o << "Identity," ; break;
-            case RsIdentityListModel::ENTRY_TYPE_TOP_LEVEL: o << "Toplevel," ; break;
-            }
-            o << " CI: " << e.category_index << ", ";
-            o << " II: " << e.identity_index << "]";
-            return o;
-        }
-
-        // Indices w.r.t. parent. The set of indices entirely determines the position of the entry in the hierarchy.
-        // An index of 0xff means "undefined"
-
-        uint16_t category_index;	// index of the category in the mCategory array
-        uint16_t identity_index;	// index of the identity in its own category
-
-        EntryIndex parent() const;
-        EntryIndex child(int row) const;
-        uint32_t   parentRow() const;
-    };
-
-	QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
-    QModelIndex getIndexOfIdentity(const RsGxsId& id) const;
-    QModelIndex getIndexOfCategory(Category id) const;
-
-    void updateIdentityList();
-
-    int count() const { return mIdentities.size() ; }	// total number of identities
-
-    static const QString FilterString ;
-
-    // This method will asynchroneously update the data
-
-    EntryType getType(const QModelIndex&) const;
-    RsGxsId getIdentity(const QModelIndex&) const;
-    int getCategory(const QModelIndex&) const;
-    void setFontSize(int s);
-
-    void setFilter(uint8_t filter_type, const QStringList& strings) ;
-
-    void expandItem(const QModelIndex&) ;
-    void collapseItem(const QModelIndex&) ;
-
-    // Overloaded methods from QAbstractItemModel
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-    bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
-
-    QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& child) const override;
-    Qt::ItemFlags flags(const QModelIndex& index) const  override;
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-	void clear() ;
-    QString indexIdentifier(QModelIndex i);
-
-	/* Color definitions (for standard see default.qss) */
-	QColor mTextColorGroup;
-	QColor mTextColorStatus[RS_STATUS_COUNT];
-
-    void setIdentities(const std::list<RsGroupMetaData>& identities_meta);
-
-private:
-    const HierarchicalCategoryInformation    *getCategoryInfo  (const EntryIndex&) const;
-    const HierarchicalIdentityInformation    *getIdentityInfo(const EntryIndex&) const;
-
-    void checkIdentity(HierarchicalIdentityInformation& node);
-
-    QVariant sizeHintRole  (const EntryIndex& e, int col) const;
-	QVariant displayRole   (const EntryIndex& e, int col) const;
-	QVariant decorationRole(const EntryIndex& e, int col) const;
-	QVariant toolTipRole   (const EntryIndex& e, int col) const;
-	QVariant statusRole    (const EntryIndex& e, int col) const;
-	QVariant sortRole      (const EntryIndex& e, int col) const;
-	QVariant fontRole      (const EntryIndex& e, int col) const;
-    QVariant foregroundRole(const EntryIndex& e, int col) const;
-    QVariant textColorRole (const EntryIndex& e, int col) const;
-	QVariant filterRole    (const EntryIndex& e, int col) const;
-    QVariant treePathRole  (const EntryIndex& entry,int column) const;
-
-    /*!
-     * \brief debug_dump
-     * 			Dumps the hierarchy of posts in the terminal, to allow checking whether the internal representation is correct.
-     */
-
-public slots:
-	void checkInternalData(bool force);
-    void debug_dump() const;
-    void timerUpdate();
-
-signals:
-    void dataLoaded();	// emitted after the messages have been set. Can be used to updated the UI.
-    void friendListChanged();	// emitted after the messages have been set. Can be used to updated the UI.
-    void dataAboutToLoad();
-
-private:
-    bool passesFilter(const EntryIndex &e, int column) const;
-
-	void preMods() ;
-	void postMods() ;
-
-    void *getParentRef(void *ref,int& row) const;
-    void *getChildRef(void *ref,int row) const;
-    int  getChildrenCount(void *ref) const;
-
-    static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
-    static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
-
-	uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings);
-
-    QStringList mFilterStrings;
-    uint8_t  mFilterType;
-    int mFontSize;
-
-    rstime_t mLastInternalDataUpdate;
-    rstime_t mLastNodeUpdate;;
-
-    // The 3 vectors below store thehierarchical information for groups, profiles and locations,
-    // meaning which is the child/parent of which. The actual group/profile/node data are also stored in the
-    // structure.
-
-    mutable std::vector<HierarchicalCategoryInformation>   mCategories;
-    mutable std::vector<HierarchicalIdentityInformation>   mIdentities;
-
-    // The top level list contains all nodes to display, which type depends on the option to display groups or not.
-    // Idices in the list may be profile indices or group indices. In the former case the profile child index refers to
-    // the inde in the mProfiles tab, whereas in the the later case, the child index refers to the index of the profile in the
-    // group it belows to.
-
-    std::vector<EntryIndex> mTopLevel;
-
-    // keeps track of expanded/collapsed items, so as to only show icon for collapsed profiles
-
-    std::vector<bool> mExpandedCategories;
-
-    // List of identities for which getIdDetails() failed, to be requested again.
-    mutable QTimer *mIdentityUpdateTimer;
-};
-
-
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@ -28,16 +28,9 @@
 #include <QString>
 #include <QUrl>
 #include <QtDebug>
-#include <QMenuBar>
-#include <QActionGroup>

 #include <retroshare/rsplugin.h>
 #include <retroshare/rsconfig.h>
-#include <util/argstream.h>
-
-#if defined(Q_OS_DARWIN)
-#include "gui/common/MacDockIconHandler.h"
-#endif

 #ifdef MESSENGER_WINDOW
 #include "MessengerWindow.h"
@ -121,7 +114,7 @@
 #include "gui/statistics/StatisticsWindow.h"

 #include "gui/connect/ConnectFriendWizard.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "settings/rsettingswin.h"
 #include "settings/rsharesettings.h"
 #include "common/StatusDefs.h"
@ -213,7 +206,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
            hiddenmode = true;
    }

-    setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(RsApplication::retroshareVersion(true)) + " - " + nameAndLocation);
+    setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(Rshare::retroshareVersion(true)) + " - " + nameAndLocation);
    connect(rApp, SIGNAL(newArgsReceived(QStringList)), this, SLOT(receiveNewArgs(QStringList)));

    /* add url handler for RetroShare links */
@ -361,8 +354,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)

    connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
    settingsChanged();
-
-    mFontSizeHandler.registerFontSize(ui->listWidget, 1.5f);
 }

 /** Destructor. */
@ -386,11 +377,6 @@ MainWindow::~MainWindow()
    delete sysTrayStatus;
    delete trayIcon;
    delete trayMenu;
-#if defined(Q_OS_DARWIN)
-    delete menuBar;
-    delete dockMenu;
-    MacDockIconHandler::cleanup();
-#endif
 //  delete notifyMenu; // already deleted by the deletion of trayMenu
    StatisticsWindow::releaseInstance();

@ -567,11 +553,6 @@ void MainWindow::addPage(MainPage *page, QActionGroup *grp, QList<QPair<MainPage
 	QListWidgetItem *item = new QListWidgetItem(QIcon(page->iconPixmap()),page->pageName()) ;
 	ui->listWidget->addItem(item) ;

-#if defined(Q_OS_DARWIN)
-    QFont f = ui->toolBarPage->font();
-    action->setFont(f);
-#endif
-
 	if (notify)
 	{
 		QPair<QAction*, QListWidgetItem*> pair = QPair<QAction*, QListWidgetItem*>( action, item);
@ -670,75 +651,10 @@ void MainWindow::createTrayIcon()
    trayIcon->setContextMenu(trayMenu);
    trayIcon->setIcon(QIcon(IMAGE_NOONLINE));

-#if defined(Q_OS_DARWIN)
-    // Note: On macOS, the Dock icon is used to provide the tray's functionality.
-    MacDockIconHandler* dockIconHandler = MacDockIconHandler::instance();
-    connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, [this] {
-        show();
-        activateWindow();
-    });
-#endif
-
-#if defined(Q_OS_DARWIN)
-    createMenuBar();
-#endif
-
    connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason)));
    trayIcon->show();
 }

-#if defined(Q_OS_DARWIN)
-/** Creates a new menubar for macOS */
-void MainWindow::createMenuBar()
-{
-    /* Mac users sure like their shortcuts. */
-    actionMinimize = new QAction(tr("Minimize"),this);
-    actionMinimize->setShortcutContext(Qt::ApplicationShortcut);
-    actionMinimize->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
-    actionMinimize->setShortcutVisibleInContextMenu(true);
-    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ; 
-
-    actionCloseWindow = new QAction(tr("Close window"),this);
-    actionCloseWindow->setShortcutContext(Qt::ApplicationShortcut);
-    actionCloseWindow->setShortcut(QKeySequence::Close);
-    actionCloseWindow->setShortcutVisibleInContextMenu(true);
-    connect(actionCloseWindow,SIGNAL(triggered()),this,SLOT(closeWindow())) ;
-
-    menuBar = new QMenuBar(this);
-    QMenu *fileMenu = menuBar->addMenu("");
-    fileMenu->addAction(actionMinimize);
-    fileMenu->addAction(actionCloseWindow);
-
-    dockMenu = new QMenu(this);
-    dockMenu->setAsDockMenu();
-    dockMenu->addAction(tr("Open Messages"), this, SLOT(showMess()));
-    dockMenu->addAction(tr("Bandwidth Graph"), this, SLOT(showBandwidthGraph()));
-    dockMenu->addAction(tr("Statistics"), this, SLOT(showStatisticsWindow()));
-    dockMenu->addAction(tr("Options"), this, SLOT(showSettings()));
-    dockMenu->addAction(tr("Help"), this, SLOT(showHelpDialog()));
-
-    dockMenu->addSeparator();
-    QMenu *statusMenu = dockMenu->addMenu(tr("Status"));
-    initializeStatusObject(statusMenu, true);
-
-}
-#endif
-
-#if defined(Q_OS_DARWIN)
-void MainWindow::minimizeWindow()
-{
-    setWindowState(windowState() | Qt::WindowMinimized);
-}
-#endif
-
-#if defined(Q_OS_DARWIN)
-void MainWindow::closeWindow()
-{
-    // On macOS window close is basically equivalent to window hide.
-    close();
-}
-#endif
-
 void MainWindow::showBandwidthGraph()
 {
 	if(_bandwidthGraph == NULL)
@ -1030,7 +946,6 @@ void SetForegroundWindowInternal(HWND hWnd)

    /* Show the dialog. */
    raiseWindow();
-
    /* Set the focus to the specified page. */
    _instance->ui->stackPages->setCurrentPage(page);
 }
@ -1263,91 +1178,10 @@ void MainWindow::doQuit()
 	rApp->quit();
 }

-// This method parses arguments passed by the operating system. All arguments
-// except -r, -f, -o and lists of rscollection files and rslinks are discarded.
-//
 void MainWindow::receiveNewArgs(QStringList args)
 {
-    RsInfo() << "Received new arguments from operating system call.";
-
-    std::string argstring = RsApplication::applicationFilePath().toStdString() ;
-
-    for(auto l:args)
-        argstring += " " + l.toStdString();
-
-    // This class does all the job at once: validate arguments, and parses them.
-
-    std::vector<std::string> links_and_files;
-
-    argstream as(argstring.c_str());
-
-    QString omValues = QString(";full;noturtle;gaming;minimal;");
-    std::string opModeStr;
-    std::string retroshare_link_url;
-    std::string rscollection_file;
-
-    as  >> parameter('r',"rslink",retroshare_link_url,"Retroshare:// link","Retroshare link to open in Downloads " ,false)
-        >> parameter('f',"rsfile",rscollection_file,"file","File to open " ,false)
-        >> parameter('o',"opmode",opModeStr,"opmode","Set mode (Full, NoTurtle, Gaming, Minimal) " ,false)
-        >> values<std::string>(back_inserter(links_and_files),"links and files");
-
-    if(!as.isOk())
-    {
-        RsErr() << "Error while parsing arguments:" ;
-        RsErr() << as.errorLog() ;
-        return;
-    }
-    if(!opModeStr.empty() && omValues.contains(";"+QString::fromStdString(opModeStr).toLower()+";"))
-    {
-        QString opmode = QString::fromStdString(opModeStr).toLower();
-        //RsApplication::setOpMode(opModeStr.toLower()); // Do we need this??
-
-        RsInfo() << "Setting new operating mode to \"" << opmode.toStdString() << "\"";
-
-        if (opmode == "noturtle")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
-        else if (opmode == "gaming")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
-        else if (opmode == "minimal")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
-        else if (opmode != "")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
-
-        opModeStatus->setOpMode();
-    }
-
-    // Sort all collected arguments into rscollection files and retroshare links, accordingly
-
-    QStringList rscollection_files;
-    QList<RetroShareLink> rslinks;
-
-    auto sort = [&](const QString s) {
-
-        if(QFile(s).exists() && s.endsWith(".rscollection"))
-            rscollection_files.append(QString::fromUtf8(rscollection_file.c_str()));
-        else if(s.startsWith("retroshare://"))
-        {
-            RetroShareLink link(s);
-
-            if(link.valid())
-                rslinks.push_back(link);
-        }
-    };
-
-    sort(QString::fromUtf8(rscollection_file.c_str()));
-    sort(QString::fromUtf8(retroshare_link_url.c_str()));
-
-    for(auto s:links_and_files)
-        sort(QString::fromUtf8(s.c_str()));
-
-    // Now handle links and rscollection files.
-
-    for(auto file:rscollection_files)
-        if(file.endsWith(".rscollection"))
-            openRsCollection(file);
-
-    for(auto link:rslinks)
-        retroshareLinkActivated(link.toUrl());
+	Rshare::parseArguments(args, false);
+	processLastArgs();
 }

 void MainWindow::displayErrorMessage(int /*a*/,int /*b*/,const QString& error_msg)
@ -1386,11 +1220,7 @@ void MainWindow::updateMenu()

 void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e)
 {
-#if defined(Q_OS_DARWIN)
-    if (e == QSystemTrayIcon::DoubleClick) {
-#else
    if (e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick) {
-#endif
        if (isHidden() || isMinimized()) {
            show();
            if (isMinimized()) {
@ -1714,9 +1544,45 @@ void MainWindow::retroshareLinkActivated(const QUrl &url)
 void MainWindow::openRsCollection(const QString &filename)
 {
 	QFileInfo qinfo(filename);
+	if (qinfo.exists()) {
+		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+			RsCollection collection;
+			collection.openColl(qinfo.absoluteFilePath());
+		}
+	}
+}
+
+void MainWindow::processLastArgs()
+{
+	while (!Rshare::links()->isEmpty()) {
+		std::cerr << "MainWindow::processLastArgs() : " << Rshare::links()->count() << std::endl;
+		/* Now use links from the command line, because no RetroShare was running */
+		RetroShareLink link(Rshare::links()->takeFirst());
+		if (link.valid()) {
+			retroshareLinkActivated(link.toUrl());
+		}
+	}
+	while (!Rshare::files()->isEmpty()) {
+		/* Now use files from the command line, because no RetroShare was running */
+		openRsCollection(Rshare::files()->takeFirst());
+	}
+	/* Handle the -opmode options. */
+	if (opModeStatus) {
+		QString opmode = Rshare::opmode().toLower();
+		if (opmode == "noturtle") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
+		} else if (opmode == "gaming") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
+		} else if (opmode == "minimal") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
+		} else if (opmode != "") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
+		}
+		opModeStatus->setOpMode();
+	} else {
+		std::cerr << "ERR: MainWindow::processLastArgs opModeStatus is not initialized.";
+	}

-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
 }

 void MainWindow::switchVisibilityStatus(StatusElement e,bool b)
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@ -27,7 +27,6 @@

 #include "gui/common/rwindow.h"
 #include "gui/common/RSComboBox.h"
-#include "util/FontSizeHandler.h"

 namespace Ui {
 class MainWindow;
@ -215,6 +214,7 @@ public slots:
    void externalLinkActivated(const QUrl &url);
    void retroshareLinkActivated(const QUrl &url);
    void openRsCollection(const QString &filename);
+    void processLastArgs();
    //! Go to a specific part of the control panel.
    void setNewPage(int page);
    void setCompactStatusMode(bool compact);
@ -265,11 +265,6 @@ private slots:
    void toggleVisibility(QSystemTrayIcon::ActivationReason e);
    void toggleVisibilitycontextmenu();

-#if defined(Q_OS_DARWIN)
-    void minimizeWindow();
-    void closeWindow();
-#endif
-
    /** Toolbar fns. */
    void addFriend();
    //void newRsCollection();
@ -313,10 +308,6 @@ private:
    void initStackedPage();
    void addPage(MainPage *page, QActionGroup *grp, 	QList<QPair<MainPage *, QPair<QAction *, QListWidgetItem *> > > *notify);
    void createTrayIcon();
-#if defined(Q_OS_DARWIN)
-    /** Creates a default menubar on Mac */
-    void createMenuBar();
-#endif
    void createNotifyIcons();
    static MainWindow *_instance;

@ -333,14 +324,6 @@ private:

    QString nameAndLocation;

-#if defined(Q_OS_DARWIN)
-    /** The menubar (Mac OS X only). */
-    QMenuBar *menuBar;
-    QMenu *dockMenu;
-    QAction* actionMinimize;
-    QAction* actionCloseWindow;
-#endif
-
    QSystemTrayIcon *trayIcon;
    QMenu *notifyMenu;
    QMenu *trayMenu;
@ -372,8 +355,6 @@ private:
    void setIdle(bool Idle);
    bool isIdle;

-    FontSizeHandler mFontSizeHandler;
-
 	 Ui::MainWindow *ui ;
 };

--- a/retroshare-gui/src/gui/MainWindow.ui
+++ b/retroshare-gui/src/gui/MainWindow.ui
@ -33,6 +33,11 @@
         <height>0</height>
        </size>
       </property>
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+        </font>
+       </property>
       <property name="frameShape">
        <enum>QFrame::NoFrame</enum>
       </property>
@ -152,7 +157,7 @@
  </action>
  <action name="actionOptions">
   <property name="icon">
-    <iconset>
+    <iconset resource="images.qrc">
     <normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset>
   </property>
   <property name="text">
--- a/retroshare-gui/src/gui/NewsFeed.ui
+++ b/retroshare-gui/src/gui/NewsFeed.ui
@ -70,8 +70,8 @@
       <widget class="QLabel" name="titleBarLabel">
        <property name="font">
         <font>
-		  <pointsize>12</pointsize>
-		  <weight>75</weight>
+          <pointsize>12</pointsize>
+          <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>
--- a/retroshare-gui/src/gui/PluginManager.cpp
+++ b/retroshare-gui/src/gui/PluginManager.cpp
@ -41,7 +41,7 @@
 PluginManager::PluginManager()
 {
    baseFolder =  //qApp->applicationDirPath()+"///plugins" ;
-RsApplication::dataDirectory() + "/plugins" ;
+Rshare::dataDirectory() + "/plugins" ;
    lastError = "No error.";

    viewWidget = 0;
--- a/retroshare-gui/src/gui/Posted/PhotoView.ui
+++ b/retroshare-gui/src/gui/Posted/PhotoView.ui
@ -22,6 +22,7 @@
     <property name="font">
      <font>
       <family>MS Sans Serif</family>
+       <pointsize>11</pointsize>
       <weight>75</weight>
       <italic>true</italic>
       <bold>true</bold>
@ -102,6 +103,7 @@
       <property name="font">
        <font>
         <family>MS Sans Serif</family>
+         <pointsize>9</pointsize>
         <weight>50</weight>
         <bold>false</bold>
        </font>
@ -112,7 +114,7 @@
      </widget>
     </item>
     <item>
-      <widget class="AvatarWidget" name="avatarWidget">
+      <widget class="AvatarWidget" name="avatarWidget" native="true">
       <property name="minimumSize">
        <size>
         <width>24</width>
@ -132,6 +134,7 @@
       <property name="font">
        <font>
         <family>MS Sans Serif</family>
+         <pointsize>11</pointsize>
         <weight>75</weight>
         <italic>true</italic>
         <bold>true</bold>
@ -147,6 +150,7 @@
       <property name="font">
        <font>
         <family>MS Sans Serif</family>
+         <pointsize>9</pointsize>
        </font>
       </property>
       <property name="text">
@ -159,6 +163,7 @@
       <property name="font">
        <font>
         <family>MS Sans Serif</family>
+         <pointsize>9</pointsize>
        </font>
       </property>
       <property name="text">
@ -204,17 +209,17 @@
  </layout>
 </widget>
 <customwidgets>
-  <customwidget>
-   <class>AvatarWidget</class>
-   <extends>QLabel</extends>
-   <header>gui/common/AvatarWidget.h</header>
-   <container>1</container>
-  </customwidget>
  <customwidget>
   <class>GxsIdLabel</class>
   <extends>QLabel</extends>
   <header>gui/gxs/GxsIdLabel.h</header>
  </customwidget>
+  <customwidget>
+   <class>AvatarWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/common/AvatarWidget.h</header>
+   <container>1</container>
+  </customwidget>
  <customwidget>
   <class>AspectRatioPixmapLabel</class>
   <extends>QLabel</extends>
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@ -44,10 +44,10 @@
      <bool>false</bool>
     </property>
     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
     </property>
     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
     </property>
     <layout class="QGridLayout" name="feedFrame_GL">
      <property name="leftMargin">
@ -262,6 +262,7 @@
          </property>
          <property name="font">
           <font>
+            <pointsize>11</pointsize>
            <weight>75</weight>
            <italic>true</italic>
            <bold>true</bold>
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@ -45,7 +45,6 @@
 #include "util/DateTime.h"
 #include "util/qtthreadsutils.h"
 #include "gui/common/FilesDefs.h"
-#include "util/QtVersion.h"

 #include "gui/MainWindow.h"

@ -418,7 +417,7 @@ void PostedListWidgetWithModel::updateShowLabel()

 void PostedListWidgetWithModel::filterItems(QString text)
 {
-	QStringList lst = text.split(" ",QtSkipEmptyParts) ;
+	QStringList lst = text.split(" ",QString::SkipEmptyParts) ;

    uint32_t count;
 	mPostedPostsModel->setFilter(lst,count) ;
@ -620,13 +619,12 @@ void PostedListWidgetWithModel::updateGroupData()

 void PostedListWidgetWithModel::postPostLoad()
 {
-#ifdef DEBUG_POSTED
 	std::cerr << "Post channel load..." << std::endl;
-#endif
 	whileBlocking(ui->filter_LE)->setText(QString()); //Clear it before navigate, as it will update it.

 	if (!mNavigatePendingMsgId.isNull())
 		navigate(mNavigatePendingMsgId);
+
 #ifdef TO_REMOVE
 	else if( (mLastSelectedPosts.count(groupId()) > 0)
 	         && !mLastSelectedPosts[groupId()].isNull())
@ -641,10 +639,8 @@ void PostedListWidgetWithModel::postPostLoad()
 		ui->postsTree->setFocus();
 	}
 #endif
-#ifdef DEBUG_POSTED
 	else
 		std::cerr << "No pre-selected channel post." << std::endl;
-#endif

 	updateShowLabel();
 }
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@ -54,7 +54,7 @@
             <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="textInteractionFlags">
@ -355,10 +355,10 @@ p, li { white-space: pre-wrap; }
       <item>
        <widget class="QFrame" name="toolBarFrame">
         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
         </property>
         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <property name="leftMargin">
@ -576,10 +576,37 @@ p, li { white-space: pre-wrap; }
  </layout>
 </widget>
 <customwidgets>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>GxsIdChooser</class>
+   <extends>QComboBox</extends>
+   <header>gui/gxs/GxsIdChooser.h</header>
+  </customwidget>
+  <customwidget>
+   <class>GxsIdLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/gxs/GxsIdLabel.h</header>
+  </customwidget>
  <customwidget>
   <class>LineEditClear</class>
   <extends>QLineEdit</extends>
-   <header location="global">gui/common/LineEditClear.h</header>
+   <header>gui/common/LineEditClear.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSComboBox</class>
+   <extends>QComboBox</extends>
+   <header>gui/common/RSComboBox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>gui/common/RSTabWidget.h</header>
+   <container>1</container>
  </customwidget>
  <customwidget>
   <class>RSTreeView</class>
@ -587,42 +614,15 @@ p, li { white-space: pre-wrap; }
   <header>gui/common/RSTreeView.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>GxsIdLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/gxs/GxsIdLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ElidedLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/ElidedLabel.h</header>
-   <container>1</container>
-  </customwidget>
  <customwidget>
   <class>SubscribeToolButton</class>
   <extends>QToolButton</extends>
   <header>gui/common/SubscribeToolButton.h</header>
  </customwidget>
-  <customwidget>
-   <class>RSComboBox</class>
-   <extends>QComboBox</extends>
-   <header>gui/common/RSComboBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>GxsIdChooser</class>
-   <extends>QComboBox</extends>
-   <header>gui/gxs/GxsIdChooser.h</header>
-  </customwidget>
-  <customwidget>
-   <class>RSTabWidget</class>
-   <extends>QTabWidget</extends>
-   <header>gui/common/RSTabWidget.h</header>
-   <container>1</container>
-  </customwidget>
 </customwidgets>
 <resources>
-  <include location="../icons.qrc"/>
  <include location="Posted_images.qrc"/>
+  <include location="../icons.qrc"/>
 </resources>
 <connections/>
 </ui>
--- a/retroshare-gui/src/gui/RSHumanReadableDelegate.h
+++ b/retroshare-gui/src/gui/RSHumanReadableDelegate.h
@ -88,16 +88,11 @@ class RSHumanReadableAgeDelegate: public RSHumanReadableDelegate
 	public:
 		virtual void paint(QPainter *painter,const QStyleOptionViewItem & option, const QModelIndex & index) const
 		{
-			painter->save();
 			QStyleOptionViewItem opt(option) ;
 			setPainterOptions(painter,opt,index) ;

-            if(index.data().toLongLong() > 0) {	// no date is present.
-                painter->setFont(opt.font);
-                painter->drawText(opt.rect, opt.displayAlignment, misc::timeRelativeToNow(index.data().toLongLong())) ;
-            }
-
-            painter->restore();
+            if(index.data().toLongLong() > 0)	// no date is present.
+                painter->drawText(opt.rect, Qt::AlignCenter, misc::timeRelativeToNow(index.data().toLongLong())) ;
 		}
 };

@ -106,14 +101,10 @@ class RSHumanReadableSizeDelegate: public RSHumanReadableDelegate
 	public:
 		virtual void paint(QPainter *painter,const QStyleOptionViewItem & option, const QModelIndex & index) const
 		{
-			painter->save();
 			QStyleOptionViewItem opt(option) ;
 			setPainterOptions(painter,opt,index) ;

-			painter->setFont(opt.font);
-			painter->drawText(opt.rect, opt.displayAlignment, misc::friendlyUnit(index.data().toULongLong()));
-
-			painter->restore();
+			painter->drawText(opt.rect, Qt::AlignRight, misc::friendlyUnit(index.data().toULongLong()));
 		}
 };

--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@ -24,7 +24,7 @@

 #include "gui/common/FilesDefs.h"
 #include "gui/common/GroupDefs.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "retroshare/rsfiles.h"
@ -1233,6 +1233,31 @@ bool RetroshareDirModel::requestDirDetails(void *ref, bool remote,DirDetails& d)
    return false ;
 }

+void RetroshareDirModel::createCollectionFile(QWidget *parent, const QModelIndexList &list)
+{
+/*	if(RemoteMode)
+	{
+		std::cerr << "Cannot create a collection file from remote" << std::endl;
+		return ;
+	}*/
+
+	std::vector <DirDetails> dirVec;
+	getDirDetailsFromSelect(list, dirVec);
+
+	FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
+	
+	QString dir_name;
+	if(!RemoteMode)
+	{
+		if(!dirVec.empty())
+		{
+			const DirDetails& details = dirVec[0];
+			dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
+		}
+	}
+	RsCollection(dirVec,f).openNewColl(parent,dir_name);
+}
+
 void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool interactive)
 {
 	if (!RemoteMode)
@ -1253,7 +1278,7 @@ void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool inter
   FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;

   if(interactive)
-       RsCollectionDialog::downloadFiles(RsCollection(dirVec,f)) ;
+	   RsCollection(dirVec,f).downloadFiles() ;
   else /* Fire off requests */
 	   for (int i = 0, n = dirVec.size(); i < n; ++i)
 	   {
--- a/retroshare-gui/src/gui/RemoteDirModel.h
+++ b/retroshare-gui/src/gui/RemoteDirModel.h
@ -68,6 +68,8 @@ class RetroshareDirModel : public QAbstractItemModel

 		/* Callback from GUI */
 		void downloadSelected(const QModelIndexList &list, bool interactive);
+		void createCollectionFile(QWidget *parent, const QModelIndexList &list);
+
 		void getDirDetailsFromSelect (const QModelIndexList &list, std::vector <DirDetails>& dirVec);

 		int getType ( const QModelIndex & index ) const ;
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@ -25,7 +25,7 @@
 #include "HomePage.h"
 #include "chat/ChatDialog.h"
 #include "common/PeerDefs.h"
-#include "common/RsCollectionDialog.h"
+#include "common/RsCollection.h"
 #include "common/RsUrlHandler.h"
 #include "connect/ConfCertDialog.h"
 #include "connect/ConnectFriendWizard.h"
@ -1143,13 +1143,11 @@ QString RetroShareLink::toHtmlSize() const

 	if (type() == TYPE_FILE && RsCollection::isCollectionFile(name())) {
 		FileInfo finfo;
-        if (rsFiles->FileDetails(RsFileHash(hash().toStdString()), RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, finfo))
-        {
-            RsCollection::RsCollectionErrorCode code;
-            RsCollection collection(QString::fromUtf8(finfo.path.c_str()), code) ;
-
-            if(code == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
+		if (rsFiles->FileDetails(RsFileHash(hash().toStdString()), RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, finfo)) {
+			RsCollection collection;
+			if (collection.load(QString::fromUtf8(finfo.path.c_str()), false)) {
 				size += QString(" [%1]").arg(misc::friendlyUnit(collection.size()));
+			}
 		}
 	}
 	QString link = QString("<a href=\"%1\">%2</a> <font color=\"blue\">%3</font>").arg(toString()).arg(name()).arg(size);
@ -1724,9 +1722,10 @@ static void processList(const QStringList &list, const QString &textSingular, co

 		case TYPE_FILE_TREE:
 		{
-            auto ft = RsFileTree::fromRadix64(link.radix().toStdString() );
-            RsCollectionDialog::downloadFiles(RsCollection(*ft));
-            break;
+			auto ft = RsFileTree::fromRadix64(
+			            link.radix().toStdString() );
+			RsCollection(*ft).downloadFiles();
+			break;
 		}

 			case TYPE_CHAT_ROOM:
@ -1777,7 +1776,7 @@ static void processList(const QStringList &list, const QString &textSingular, co

 	// were single file links found?
 	if (fileLinkFound)
-        RsCollectionDialog::downloadFiles(col);
+		col.downloadFiles();

 	int countProcessed = 0;
 	int countError = 0;
@ -1920,9 +1919,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 void RSLinkClipboard::copyLinks(const QList<RetroShareLink>& links)
 {
 	QString res ;
-	if(links.size() == 1)
-		res += links[0].toString();
-	else for(int i = 0; i < links.size(); ++i)
+	for (int i = 0; i < links.size(); ++i)
 		res += links[i].toString() + "\n" ;

 	QApplication::clipboard()->setText(res) ;
@ -2038,3 +2035,4 @@ void RSLinkClipboard::parseText(QString text, QList<RetroShareLink> &links,Retro
 		pos += rx.matchedLength();
 	}
 }
+
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@ -123,7 +123,7 @@ void StartDialog::loadPerson()
 	rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
 	rsNotify->setDisableAskPassword(true);

-    bool res = RsApplication::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
+    bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;

 	rsNotify->setDisableAskPassword(false);
    rsNotify->clearPgpPassphrase();
@ -161,7 +161,7 @@ void StartDialog::notSecureWarning()
 		QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
 #else
        // this handles all linux systems at once.
-        QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your desktop's keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
+        QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
 #endif
 #endif
 }
--- a/retroshare-gui/src/gui/StartDialog.ui
+++ b/retroshare-gui/src/gui/StartDialog.ui
@ -345,8 +345,8 @@ The current identities/locations will not be affected.</string>
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#366fe0;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
         </widget>
        </item>
@ -370,8 +370,8 @@ p, li { white-space: pre-wrap; }
  </customwidget>
 </customwidgets>
 <resources>
-  <include location="icons.qrc"/>
  <include location="images.qrc"/>
+  <include location="icons.qrc"/>
 </resources>
 <connections/>
 </ui>
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@ -25,7 +25,6 @@
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
 #include "util/misc.h"
-#include "util/qtthreadsutils.h"

 #include "PulseAddDialog.h"

@ -99,31 +98,11 @@ void PulseAddDialog::setGroup(RsWireGroup &group)
 // set ReplyWith Group.
 void PulseAddDialog::setGroup(const RsGxsGroupId &grpId)
 {
-    if(grpId.isNull()){
-        return;
-    }
+	/* fetch in the background */
+	RsWireGroupSPtr pGroup;
+	rsWire->getWireGroup(grpId, pGroup);

-    RsThread::async([this,grpId](){
-
-        RsWireGroupSPtr pGroup;
-        if(!rsWire->getWireGroup(grpId,pGroup))
-        {
-            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve wire group info for wire id:  " << grpId << std::endl;
-            return;
-        }
-
-        RsQThreadUtils::postToObject( [pGroup,this]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            setGroup(*pGroup);
-        }, this );
-
-    });
+	setGroup(*pGroup);
 }

 void PulseAddDialog::cleanup()
@ -215,7 +194,7 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 	mReplyToPulse = pulse;
 	mReplyType = replyType;
 	ui.frame_reply->setVisible(true);
-	ui.pushButton_picture->hide();
+	ui.pushButton_picture->show();
 	ui.topheadshot->hide();

 	{
@ -244,12 +223,10 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 		if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
 			ui.postButton->setText(tr("Republish Pulse"));
 			ui.pushButton_picture->hide();
-			ui.pushButton_Browse->hide();
 		}
 		else if (mReplyType & WIRE_PULSE_TYPE_LIKE) {
 			ui.postButton->setText(tr("Like Pulse"));
 			ui.pushButton_picture->hide();
-			ui.pushButton_Browse->hide();
 		}
 	}

@ -257,46 +234,30 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse

 void PulseAddDialog::setReplyTo(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId, uint32_t replyType)
 {
-    if(grpId.isNull()){
-        return;
-    }
 	/* fetch in the background */
+	RsWireGroupSPtr pGroup;
+	if (!rsWire->getWireGroup(grpId, pGroup))
+	{
+		std::cerr << "PulseAddDialog::setRplyTo() failed to fetch group";
+		std::cerr << std::endl;
+		return;
+	}

-    RsThread::async([this,grpId,msgId,replyType](){
+	RsWirePulseSPtr pPulse;
+	if (!rsWire->getWirePulse(grpId, msgId, pPulse))
+	{
+		std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse";
+		std::cerr << std::endl;
+		return;
+	}

-        RsWireGroupSPtr pGroup;
-        RsWirePulseSPtr pPulse;
-        if(!rsWire->getWireGroup(grpId,pGroup))
-        {
-            std::cerr << __PRETTY_FUNCTION__ << "PulseAddDialog::setRplyTo() failed to fetch group id: "  << grpId << std::endl;
-            return;
-        }
-
-        if (!rsWire->getWirePulse(grpId, msgId, pPulse))
-        {
-            std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse of group id: " << grpId << std::endl;
-            return;
-        }
-
-        // update GroupPtr
-        // TODO - this should be handled in libretroshare if possible.
-        if (pPulse->mGroupPtr == NULL) {
-            pPulse->mGroupPtr = pGroup;
-        }
-
-        RsQThreadUtils::postToObject( [pGroup,this,pPulse,replyType]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
-        }, this );
-
-    });
+	// update GroupPtr
+	// TODO - this should be handled in libretroshare if possible.
+	if (pPulse->mGroupPtr == NULL) {
+		pPulse->mGroupPtr = pGroup;
+	}

+	setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
 }

 void PulseAddDialog::addURL()
@ -346,39 +307,26 @@ void PulseAddDialog::postOriginalPulse()
 	std::cerr << "PulseAddDialog::postOriginalPulse()";
 	std::cerr << std::endl;

-    RsWirePulseSPtr pPulse(new RsWirePulse());
+	RsWirePulseSPtr pPulse(new RsWirePulse());

-    pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
-    pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
-    // set images here too.
-    pPulse->mImage1 = mImage1;
-    pPulse->mImage2 = mImage2;
-    pPulse->mImage3 = mImage3;
-    pPulse->mImage4 = mImage4;
+	pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
+	pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
+	// set images here too.
+	pPulse->mImage1 = mImage1;
+	pPulse->mImage2 = mImage2;
+	pPulse->mImage3 = mImage3;
+	pPulse->mImage4 = mImage4;

-    RsThread::async([this,pPulse](){
-
-        if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
-        {
-            std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
-            std::cerr << std::endl;
-            return;
-        }
-
-        RsQThreadUtils::postToObject( [this]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            clearDialog();
-            hide();
-        }, this );
-
-    });
+	// this should be in async thread, so doesn't block UI thread.
+	if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
+	{
+		std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
+		std::cerr << std::endl;
+		return;
+	}

+	clearDialog();
+	hide();
 }

 uint32_t PulseAddDialog::toPulseSentiment(int index)
@ -408,15 +356,15 @@ void PulseAddDialog::postReplyPulse()
 	std::cerr << "PulseAddDialog::postReplyPulse()";
 	std::cerr << std::endl;

-    RsWirePulseSPtr pPulse(new RsWirePulse());
+	RsWirePulseSPtr pPulse(new RsWirePulse());

-    pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
-    pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
-    // set images here too.
-    pPulse->mImage1 = mImage1;
-    pPulse->mImage2 = mImage2;
-    pPulse->mImage3 = mImage3;
-    pPulse->mImage4 = mImage4;
+	pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
+	pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
+	// set images here too.
+	pPulse->mImage1 = mImage1;
+	pPulse->mImage2 = mImage2;
+	pPulse->mImage3 = mImage3;
+	pPulse->mImage4 = mImage4;

 	if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
 		// Copy details from parent, and override
@ -430,33 +378,20 @@ void PulseAddDialog::postReplyPulse()
 		pPulse->mImage4 = mReplyToPulse.mImage4;
 	}

-    RsThread::async([this, pPulse](){
-
-        if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
-                mReplyToPulse.mMeta.mOrigMsgId,
-                mGroup.mMeta.mGroupId,
-                mReplyType,
-                pPulse))
-        {
-            std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
-            std::cerr << std::endl;
-            return;
-        }
-
-        RsQThreadUtils::postToObject( [this]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            clearDialog();
-            hide();
-        }, this );
-
-    });
+	// this should be in async thread, so doesn't block UI thread.
+	if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
+			mReplyToPulse.mMeta.mOrigMsgId,
+			mGroup.mMeta.mGroupId,
+			mReplyType,
+			pPulse))
+	{
+		std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
+		std::cerr << std::endl;
+		return;
+	}

+	clearDialog();
+	hide();
 }

 void PulseAddDialog::clearDialog()
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@ -140,7 +140,7 @@
       <widget class="QWidget" name="widget_sentiment" native="true">
        <layout class="QHBoxLayout" name="widget_sentiment_HL">
         <property name="leftMargin">
-          <number>9</number>
+          <number>20</number>
         </property>
         <property name="topMargin">
          <number>0</number>
--- a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
@ -40,7 +40,10 @@
      </size>
     </property>
     <property name="styleSheet">
-      <string notr="true"/>
+      <string notr="true">QFrame#frame{border: 2px solid #CCCCCC;
+background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                     stop: 0 #EEEEEE, stop: 1 #CCCCCC);
+border-radius: 10px}</string>
     </property>
     <property name="frameShape">
      <enum>QFrame::StyledPanel</enum>
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@ -140,7 +140,6 @@ WireDialog::~WireDialog()
 	processSettings(false);
 	
 	clearTwitterView();
-    std::cerr << "WireDialog::~WireDialog()" << std::endl;
    delete(mWireQueue);

    rsEvents->unregisterEventsHandler(mEventHandlerId);
@ -155,16 +154,9 @@ void WireDialog::processSettings(bool load)

 		// state of splitter
 		ui.splitter->restoreState(Settings->value("SplitterWire").toByteArray());
-
-		// state of filter combobox
-		int index = Settings->value("ShowGroup", 0).toInt();
-		ui.comboBox_groupSet->setCurrentIndex(index);
 	} else {
 		// save settings

-		// state of filter combobox
-		Settings->setValue("ShowGroup", ui.comboBox_groupSet->currentIndex());
-
 		// state of splitter
 		Settings->setValue("SplitterWire", ui.splitter->saveState());
 	}
@ -475,13 +467,13 @@ bool WireDialog::loadGroupData(const uint32_t &token)
 	std::cerr << "WireDialog::loadGroupData()";
 	std::cerr << std::endl;

-    std::vector<RsWireGroup> groups;
-    rsWire->getGroupData(token, groups);
+	std::vector<RsWireGroup> groups;
+	rsWire->getGroupData(token, groups);

-    // save list of groups.
-    updateGroups(groups);
-    showGroups();
-    return true;
+	// save list of groups.
+	updateGroups(groups);
+	showGroups();
+	return true;
 }

 rstime_t WireDialog::getFilterTimestamp()
@ -689,7 +681,6 @@ void WireDialog::PVHrate(const RsGxsId &authorId)
 void WireDialog::postTestTwitterView()
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::postTestTwitterView()" << std::endl;

 	addTwitterView(new PulseTopLevel(NULL,RsWirePulseSPtr())); 
 	addTwitterView(new PulseReply(NULL,RsWirePulseSPtr()));
@ -846,7 +837,6 @@ void WireDialog::requestPulseFocus(const RsGxsGroupId groupId, const RsGxsMessag
 void WireDialog::showPulseFocus(const RsGxsGroupId groupId, const RsGxsMessageId msgId)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::showPulseFocus()" << std::endl;

 	// background thread for loading.
 	RsThread::async([this, groupId, msgId]()
@ -876,8 +866,6 @@ void WireDialog::showPulseFocus(const RsGxsGroupId groupId, const RsGxsMessageId
 void WireDialog::postPulseFocus(RsWirePulseSPtr pPulse)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::postPulseFocus()" << std::endl;
-
 	if (!pPulse)
 	{
 		std::cerr << "WireDialog::postPulseFocus() Invalid pulse";
@ -950,7 +938,7 @@ void WireDialog::requestGroupFocus(const RsGxsGroupId groupId)
 void WireDialog::showGroupFocus(const RsGxsGroupId groupId)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::showGroupFocus()" << std::endl;
+
 	// background thread for loading.
 	RsThread::async([this, groupId]()
 	{
@ -1027,7 +1015,6 @@ void WireDialog::requestGroupsPulses(const std::list<RsGxsGroupId>& groupIds)
 void WireDialog::showGroupsPulses(const std::list<RsGxsGroupId>& groupIds)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::showGroupPulses()" << std::endl;

 	// background thread for loading.
 	RsThread::async([this, groupIds]()
@ -1077,3 +1064,4 @@ void WireDialog::postGroupsPulses(std::list<RsWirePulseSPtr> pulses)

 	}
 }
+
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@ -150,7 +150,7 @@ private:

 	// Loading Data.
 	void requestGroupData();
-    bool loadGroupData(const uint32_t &token);
+	bool loadGroupData(const uint32_t &token);
 	void acknowledgeGroup(const uint32_t &token, const uint32_t &userType);

 	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req) override;
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@ -123,21 +123,21 @@ void WireGroupItem::setup()
 void WireGroupItem::setGroupSet()
 {
 	if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) {
-		toolButton_type->setText(tr("Own"));
-		toolButton_subscribe->setText(tr("N/A"));
+		toolButton_type->setText("Own");
+		toolButton_subscribe->setText("N/A");
 		toolButton_subscribe->setEnabled(false);
 		editButton->show();
 	}
 	else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
 	{
-		toolButton_type->setText(tr("Following"));
-		toolButton_subscribe->setText(tr("Unfollow"));
+		toolButton_type->setText("Following");
+		toolButton_subscribe->setText("Unfollow");
 		editButton->hide();
 	}
 	else
 	{
-		toolButton_type->setText(tr("Other"));
-		toolButton_subscribe->setText(tr("Follow"));
+		toolButton_type->setText("Other");
+		toolButton_subscribe->setText("Follow");
 		editButton->hide();
 	}
 }
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@ -20,7 +20,6 @@
 *                                                                             *
 *******************************************************************************/
 #include "expressionwidget.h"
-#include "util/QtVersion.h"

 ExpressionWidget::ExpressionWidget(QWidget * parent, bool initial)
    : QWidget(parent)
@ -110,7 +109,11 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
    if (isStringSearchExpression()) 
    {
        QString txt = exprParamElem->getStrSearchValue();
-        QStringList words = txt.split(" ", QtSkipEmptyParts);
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+        QStringList words = txt.split(" ", QString::SkipEmptyParts);
+#else
+        QStringList words = txt.split(" ", Qt::SkipEmptyParts);
+#endif
        for (int i = 0; i < words.size(); ++i)
            wordList.push_back(words.at(i).toUtf8().constData());
    } else if (inRangedConfig){
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@ -23,7 +23,6 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QWidgetAction>
-#include <QActionGroup>

 #include "ChatLobbyDialog.h"

@ -209,8 +208,6 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 	connect(unsubscribeButton, SIGNAL(clicked()), this , SLOT(leaveLobby()));

 	getChatWidget()->addTitleBarWidget(unsubscribeButton) ;
-
-	mFontSizeHandler.registerFontSize(ui.participantsList);
 }

 void ChatLobbyDialog::leaveLobby()
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
@ -26,7 +26,6 @@
 #include "gui/common/RSTreeWidgetItem.h"
 #include "ChatDialog.h"
 #include "PopupChatWindow.h"
-#include "util/FontSizeHandler.h"

 // Q_DECLARE_METATYPE(RsGxsId)
 // Q_DECLARE_METATYPE(QList<RsGxsId>)
@ -116,8 +115,6 @@ private:
 	bool mWindowedSetted;
 	PopupChatWindow* mPCWindow;

-	FontSizeHandler mFontSizeHandler;
-
 	/** Qt Designer generated object */
 	Ui::ChatLobbyDialog ui;

--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
@ -80,10 +80,10 @@
       <item>
        <widget class="QFrame" name="toolBarFrame">
         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
         </property>
         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
         </property>
         <layout class="QHBoxLayout" name="toolBarFrame_HL">
          <property name="leftMargin">
--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
@ -146,48 +146,8 @@ QString ChatLobbyUserNotify::getNotifyMessage(bool plural)

 void ChatLobbyUserNotify::iconClicked()
 {
-    #if defined(Q_OS_DARWIN)
-    std::list<ChatLobbyId> lobbies;
-    rsMsgs->getChatLobbyList(lobbies);
-    bool doUpdate=false;
-
-    for (lobby_map::iterator itCL=_listMsg.begin(); itCL!=_listMsg.end();)
-    {
-        bool bFound=false;
-        QString strLobbyName=tr("Unknown Lobby");
-        QIcon icoLobby=QIcon();
-        std::list<ChatLobbyId>::const_iterator lobbyIt;
-        for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) {
-            ChatLobbyId clId = *lobbyIt;
-            if (clId==itCL->first) {
-                ChatLobbyInfo clInfo;
-                if (rsMsgs->getChatLobbyInfo(clId,clInfo))
-                    strLobbyName=QString::fromUtf8(clInfo.lobby_name.c_str()) ;
-                bFound=true;
-                break;
-            }
-        }
-
-        if (bFound)
-        {
-            MainWindow::showWindow(MainWindow::ChatLobby);
-            ChatLobbyWidget *chatLobbyWidget = dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby));
-            if (chatLobbyWidget) chatLobbyWidget->showLobbyAnchor(itCL->first,strLobbyName);
-            ++itCL ;
-        }
-        else
-        {
-            lobby_map::iterator ittmp(itCL);
-            ++ittmp ;
-            _listMsg.erase(itCL);
-            itCL=ittmp ;
-            doUpdate=true;
-        }
-    }
-    #else
-
 	/// Tray icon Menu ///
-	QMenu* trayMenu = createMenu();
+	QMenu* trayMenu = new QMenu(MainWindow::getInstance());
 	std::list<ChatLobbyId> lobbies;
 	rsMsgs->getChatLobbyList(lobbies);
 	bool doUpdate=false;
@ -226,25 +186,27 @@ void ChatLobbyUserNotify::iconClicked()
        }
    }

+	if (notifyCombined()) {
+		QSystemTrayIcon* trayIcon=getTrayIcon();
+		if (trayIcon!=NULL) trayIcon->setContextMenu(trayMenu);
+	} else {
+		QAction* action=getNotifyIcon();
+		if (action!=NULL) {
+			action->setMenu(trayMenu);
+		}
+	}
+
 	QString strName=tr("Remove All");
 	QAction *pAction = new QAction( QIcon(), strName, trayMenu);
 	ActionTag actionTag={0x0, "", true};
 	pAction->setData(qVariantFromValue(actionTag));
+	connect(trayMenu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
+	connect(trayMenu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
 	trayMenu->addAction(pAction);

 	trayMenu->exec(QCursor::pos());
-	delete(trayMenu);
 	if (doUpdate) updateIcon();

-	#endif
-}
-
-QMenu* ChatLobbyUserNotify::createMenu()
-{
-	QMenu* menu = new QMenu(MainWindow::getInstance());
-	connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
-	connect(menu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
-	return menu;
 }

 void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id)
@ -255,7 +217,11 @@ void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString

 	unsigned int msgCount=msgMap.size();

+	if(!parentMenu) parentMenu = new QMenu(MainWindow::getInstance());
 	QMenu *lobbyMenu = parentMenu->addMenu(icoLobby, strLobbyName);
+	connect(lobbyMenu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
+	connect(lobbyMenu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
+
 	lobbyMenu->setToolTip(getNotifyMessage(msgCount>1).arg(msgCount));

 	for (msg_map::iterator itMsg=msgMap.begin(); itMsg!=msgMap.end(); ++itMsg) {
@ -277,6 +243,7 @@ void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString
 	ActionTag actionTag={itCL->first, "", true};
 	pAction->setData(qVariantFromValue(actionTag));
 	lobbyMenu->addAction(pAction);
+
 }

 void ChatLobbyUserNotify::iconHovered()
@ -284,6 +251,7 @@ void ChatLobbyUserNotify::iconHovered()
 	iconClicked();
 }

+
 void ChatLobbyUserNotify::chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg)
 {

--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
@ -49,7 +49,6 @@ public:
 	ChatLobbyUserNotify(QObject *parent = 0);

 	virtual bool hasSetting(QString *name, QString *group);
-	QMenu* createMenu();
 	void makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id);
 	void chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg);
 	void chatLobbyCleared(ChatLobbyId lobby_id, QString anchor, bool onlyUnread=false);
--- a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
@ -76,7 +76,7 @@ bool ChatUserNotify::hasSetting(QString *name, QString *group)

 QIcon ChatUserNotify::getIcon()
 {
-    return FilesDefs::getIconFromQtResourcePath(":/images/orange-bubble-64.png");
+    return FilesDefs::getIconFromQtResourcePath(":/images/chat.png");
 }

 QIcon ChatUserNotify::getMainIcon(bool hasNew)
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@ -982,12 +982,11 @@ void ChatWidget::on_notifyButton_clicked()
 	if(!notify) return;
 	if (chatType() != CHATTYPE_LOBBY) return;

-	QMenu* menu = notify->createMenu();
+	QMenu* menu = new QMenu(MainWindow::getInstance());
 	QIcon icoLobby=(ui->notifyButton->icon());

 	notify->makeSubMenu(menu, icoLobby, title, chatId.toLobbyId());
 	menu->exec(ui->notifyButton->mapToGlobal(QPoint(0,ui->notifyButton->geometry().height())));
-	delete(menu);

 }

--- a/Show more
+++ b/Show more