diff --git a/AppGUI/coregui/coregui.pro b/AppGUI/coregui/coregui.pro
index 152dece6f80b0f7a4282203819d7d133efc8961d..6d34392a738adac37ac18bbb7e0c1c7ddfcc1f8d 100644
--- a/AppGUI/coregui/coregui.pro
+++ b/AppGUI/coregui/coregui.pro
@@ -52,3 +52,21 @@ HEADERS  += \
 INCLUDEPATH += $$PWD/mainwindow $$PWD/utils $$PWD/welcomemanager $$PWD/samplemanager $$PWD/experimentmanager $$PWD/simulationmanager $$PWD/fitmanager
 LIBS += $$PWD/../../lib/libqt-manhattan-style.so
 INCLUDEPATH += $$PWD/../externals/qt-manhattan-style
+
+#include(/opt/local/include/root/rootcint.pri)
+MYROOT = $$(ROOTSYS)
+isEmpty(MYROOT) {
+  message("Warning, ROOTSYS environment variable doesn't exist, trying to guess location")
+  ROOT_CONFIG_FILE = root-config
+  ROOT_CONFIG_FILE_LOCATIONS = /opt/local /usr/local /usr
+  for(dir, ROOT_CONFIG_FILE_LOCATIONS): isEmpty(MYROOT): exists($${dir}/bin/$${ROOT_CONFIG_FILE}): MYROOT = $${dir}
+  isEmpty(MYROOT): error("Can't find" $${ROOT_CONFIG_FILE} "in" $${ROOT_CONFIG_FILE_LOCATIONS})
+  message("Probable ROOTSYS is" $${MYROOT})
+}
+!isEmpty(MYROOT) {
+  !exists($${MYROOT}/bin/root-config): error("No config file "$${MYROOT}/bin/root-config)
+  INCLUDEPATH += $$system($${MYROOT}/bin/root-config --incdir)
+  LIBS += -L$$system($${MYROOT}/bin/root-config --libdir ) -lGui -lCore -lCint -lRIO -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lMathMore -lMinuit2 -lGeom -lEve -lRGL -lQtRoot -lThread -lpthread -lm -ldl
+  MYROOTCINT = $${MYROOT}/bin/rootcint
+}
+
diff --git a/AppGUI/coregui/experimentmanager/experimentmanager.cpp b/AppGUI/coregui/experimentmanager/experimentmanager.cpp
index b03305e0a4ce9c6488037f89764aed81f6ac9419..684ec8dcefadc7ed55bddd2684cb3d54fc33d181 100644
--- a/AppGUI/coregui/experimentmanager/experimentmanager.cpp
+++ b/AppGUI/coregui/experimentmanager/experimentmanager.cpp
@@ -1,5 +1,14 @@
 #include "experimentmanager.h"
-#include <QtWidgets>
+//#include <QtWidgets>
+#include <QGroupBox>
+#include <QLabel>
+#include <QDateTime>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QSpinBox>
+#include <QPushButton>
+#include <QGridLayout>
+#include <QDateTimeEdit>
 
 ExperimentManager::ExperimentManager(QWidget *parent)
     : QWidget(parent)
diff --git a/AppGUI/coregui/fitmanager/fitmanager.cpp b/AppGUI/coregui/fitmanager/fitmanager.cpp
index 58683aa92277521bf59508c811d0e915abe931c0..427cb2d1915b75625fee5eeff3cff299091022c4 100644
--- a/AppGUI/coregui/fitmanager/fitmanager.cpp
+++ b/AppGUI/coregui/fitmanager/fitmanager.cpp
@@ -1,46 +1,60 @@
 #include "fitmanager.h"
-#include <QtWidgets>
+//#include <QtWidgets>
+#include <QWidget>
 
+#include "TH1F.h"
+//#include "TQtWidget.h"
 
 FitManager::FitManager(QWidget *parent)
     : QWidget(parent)
 {
-    QGroupBox *packagesGroup = new QGroupBox(tr("Look for packages"));
-
-    QLabel *nameLabel = new QLabel(tr("Name:"));
-    QLineEdit *nameEdit = new QLineEdit;
-
-    QLabel *dateLabel = new QLabel(tr("Released after:"));
-    QDateTimeEdit *dateEdit = new QDateTimeEdit(QDate::currentDate());
-
-    QCheckBox *releasesCheckBox = new QCheckBox(tr("Releases"));
-    QCheckBox *upgradesCheckBox = new QCheckBox(tr("Upgrades"));
-
-    QSpinBox *hitsSpinBox = new QSpinBox;
-    hitsSpinBox->setPrefix(tr("Return up to "));
-    hitsSpinBox->setSuffix(tr(" results"));
-    hitsSpinBox->setSpecialValueText(tr("Return only the first result"));
-    hitsSpinBox->setMinimum(1);
-    hitsSpinBox->setMaximum(100);
-    hitsSpinBox->setSingleStep(10);
-
-    QPushButton *startQueryButton = new QPushButton(tr("Start query"));
-
-    QGridLayout *packagesLayout = new QGridLayout;
-    packagesLayout->addWidget(nameLabel, 0, 0);
-    packagesLayout->addWidget(nameEdit, 0, 1);
-    packagesLayout->addWidget(dateLabel, 1, 0);
-    packagesLayout->addWidget(dateEdit, 1, 1);
-    packagesLayout->addWidget(releasesCheckBox, 2, 0);
-    packagesLayout->addWidget(upgradesCheckBox, 3, 0);
-    packagesLayout->addWidget(hitsSpinBox, 4, 0, 1, 2);
-    packagesGroup->setLayout(packagesLayout);
-
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(packagesGroup);
-    mainLayout->addSpacing(12);
-    mainLayout->addWidget(startQueryButton);
-    mainLayout->addStretch(1);
-    setLayout(mainLayout);
+//    QGroupBox *packagesGroup = new QGroupBox(tr("Look for packages"));
+
+//    QLabel *nameLabel = new QLabel(tr("Name:"));
+//    QLineEdit *nameEdit = new QLineEdit;
+
+//    QLabel *dateLabel = new QLabel(tr("Released after:"));
+//    QDateTimeEdit *dateEdit = new QDateTimeEdit(QDate::currentDate());
+
+//    QCheckBox *releasesCheckBox = new QCheckBox(tr("Releases"));
+//    QCheckBox *upgradesCheckBox = new QCheckBox(tr("Upgrades"));
+
+//    QSpinBox *hitsSpinBox = new QSpinBox;
+//    hitsSpinBox->setPrefix(tr("Return up to "));
+//    hitsSpinBox->setSuffix(tr(" results"));
+//    hitsSpinBox->setSpecialValueText(tr("Return only the first result"));
+//    hitsSpinBox->setMinimum(1);
+//    hitsSpinBox->setMaximum(100);
+//    hitsSpinBox->setSingleStep(10);
+
+//    QPushButton *startQueryButton = new QPushButton(tr("Start query"));
+
+//    QGridLayout *packagesLayout = new QGridLayout;
+//    packagesLayout->addWidget(nameLabel, 0, 0);
+//    packagesLayout->addWidget(nameEdit, 0, 1);
+//    packagesLayout->addWidget(dateLabel, 1, 0);
+//    packagesLayout->addWidget(dateEdit, 1, 1);
+//    packagesLayout->addWidget(releasesCheckBox, 2, 0);
+//    packagesLayout->addWidget(upgradesCheckBox, 3, 0);
+//    packagesLayout->addWidget(hitsSpinBox, 4, 0, 1, 2);
+//    packagesGroup->setLayout(packagesLayout);
+
+//    QVBoxLayout *mainLayout = new QVBoxLayout;
+//    mainLayout->addWidget(packagesGroup);
+//    mainLayout->addSpacing(12);
+//    mainLayout->addWidget(startQueryButton);
+//    mainLayout->addStretch(1);
+//    setLayout(mainLayout);
+
+//    TH1F *h1 = new TH1F("h1","h1",100,0.,1.);
+//    TQtWidget *qcanvas = new TQtWidget(this);
+
+
+//    QVBoxLayout *mainLayout = new QVBoxLayout;
+//    mainLayout->addWidget(qcanvas);
+//    mainLayout->addStretch(1);
+//    setLayout(mainLayout);
+
+
 }
 
diff --git a/AppGUI/coregui/samplemanager/samplemanager.cpp b/AppGUI/coregui/samplemanager/samplemanager.cpp
index 46cae32a09c14f94c44df2f28f2de813d53f9a61..42f426cf2eeecd2cffc3c3eef489f6d5cd7c7414 100644
--- a/AppGUI/coregui/samplemanager/samplemanager.cpp
+++ b/AppGUI/coregui/samplemanager/samplemanager.cpp
@@ -1,6 +1,6 @@
 #include "samplemanager.h"
 #include "designercomponents.h"
-#include <QtWidgets>
+//#include <QtWidgets>
 #include <QDockWidget>
 #include <QAbstractItemView>
 
diff --git a/AppGUI/coregui/simulationmanager/simulationmanager.cpp b/AppGUI/coregui/simulationmanager/simulationmanager.cpp
index 0d94dc8ddb3300725c300b1d3093d6e5eca994a4..e4efcbcb1dbfb06326625470de4f5d9531536a6a 100644
--- a/AppGUI/coregui/simulationmanager/simulationmanager.cpp
+++ b/AppGUI/coregui/simulationmanager/simulationmanager.cpp
@@ -1,6 +1,10 @@
 #include "simulationmanager.h"
-#include <QtWidgets>
-
+//#include <QtWidgets>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QListWidget>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 SimulationManager::SimulationManager(QWidget *parent)
     : QWidget(parent)
diff --git a/AppGUI/coregui/welcomemanager/welcomemanager.cpp b/AppGUI/coregui/welcomemanager/welcomemanager.cpp
index f7c7315f9279aba63d6cec5a31969ba24104f90f..2e61f1c591e5eefa06907a0a4119d4df27dbfd07 100644
--- a/AppGUI/coregui/welcomemanager/welcomemanager.cpp
+++ b/AppGUI/coregui/welcomemanager/welcomemanager.cpp
@@ -1,5 +1,9 @@
 #include "welcomemanager.h"
-#include <QtWidgets>
+//#include <QtWidgets>
+#include <QGroupBox>
+#include <QLabel>
+#include <QComboBox>
+#include <QVBoxLayout>
 
 WelcomeManager::WelcomeManager(QWidget *parent)
     : QWidget(parent)