From aed0800aac98e37ddc029765c1d23332a0c11824 Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Wed, 12 Jul 2017 02:06:08 +0200
Subject: [PATCH 1/4] Delete all mouse-visibility references

---
 src/capture/button.cpp        | 19 -------------------
 src/capture/button.h          |  3 ---
 src/capture/capturewidget.cpp |  1 -
 src/capture/screenshot.cpp    |  4 ----
 src/controller.cpp            |  1 -
 5 files changed, 28 deletions(-)

diff --git a/src/capture/button.cpp b/src/capture/button.cpp
index d955fdb3..6ff7231b 100644
--- a/src/capture/button.cpp
+++ b/src/capture/button.cpp
@@ -80,17 +80,6 @@ QIcon Button::getIcon(const Type t, bool isWhite) {
     }
     QString path = ":/img/buttonIcons" + iconColor + "/";
 
-//    if (t == Type::mouseVisibility) {
-//        QSettings settings;
-//        bool mouseVisible = settings.value("mouseVisible").toBool();
-//        if (mouseVisible){
-//            path += "mouse.svg";
-//        } else {
-//            path += "mouse-off.svg";
-//        }
-//        return QIcon(path);
-//    }
-
     switch (t) {
     case Type::arrow:
         path += "arrow-bottom-left.png";
@@ -190,14 +179,6 @@ void Button::mouseReleaseEvent(QMouseEvent *e) {
     CaptureWidget *parent = static_cast<CaptureWidget*>(this->parent());
     parent->mouseReleaseEvent(e);
     if (e->button() == Qt::LeftButton && m_pressed) {
-//        if (m_buttonType == Type::mouseVisibility) {
-//            QSettings settings;
-//            bool mouseVisible = settings.value("mouseVisible").toBool();
-//            settings.setValue("mouseVisible", !mouseVisible);
-//            setIcon(getIcon(Type::mouseVisibility));
-//        } else if (m_buttonType == Type::colorPicker) {
-
-//        }
         Q_EMIT pressedButton(this);
     }
     m_pressed = false;
diff --git a/src/capture/button.h b/src/capture/button.h
index bdd74339..733790c1 100644
--- a/src/capture/button.h
+++ b/src/capture/button.h
@@ -45,9 +45,6 @@ public:
         exit,
         imageUploader,
         last, // used for iteration over the enum
-        text,
-        mouseVisibility,
-        colorPicker
     };
 
     explicit Button(const Type, QWidget *parent = 0);
diff --git a/src/capture/capturewidget.cpp b/src/capture/capturewidget.cpp
index 45340b0f..d28fbb07 100644
--- a/src/capture/capturewidget.cpp
+++ b/src/capture/capturewidget.cpp
@@ -522,7 +522,6 @@ void CaptureWidget::downResize() {
 void CaptureWidget::setState(Button *b) {
     Button::Type t = b->getButtonType();
     if(t == Button::Type::selectionIndicator ||
-            //t == Button::Type::mouseVisibility ||
             t == Button::Type::colorPicker) {
         return;
     }
diff --git a/src/capture/screenshot.cpp b/src/capture/screenshot.cpp
index d34b5f3a..af826605 100644
--- a/src/capture/screenshot.cpp
+++ b/src/capture/screenshot.cpp
@@ -118,9 +118,6 @@ QString Screenshot::graphicalSave(const QRect &selection, QWidget *parent) const
         } else { // save full screen when no selection
             pixToSave = m_modifiedScreenshot.copy(selection);
         }
-//        if (settings.value("mouseVisible").toBool()) {
-//            // TO DO
-//        }
 
         saved = pixToSave.save(fileName);
         if (!saved) {
@@ -215,7 +212,6 @@ namespace {
         int originalLength = body.length();
         body.setLength(ArrowWidth);
         // move across the line up to the head
-        //QPointF  = ;
         QLineF temp(QPoint(0,0), p2-p1);
         temp.setLength(originalLength-ArrowHeight);
         QPointF bottonTranslation(temp.p2());
diff --git a/src/controller.cpp b/src/controller.cpp
index 8666123d..127ffcdb 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -97,7 +97,6 @@ void Controller::initDefaults() {
         settings.setValue("showHelp", true);
         settings.setValue("showDesktopNotification", true);
         settings.setValue("drawColor", QColor(Qt::red));
-        //settings.setValue("mouseVisible", false);
         settings.setValue("uiColor", QColor(116, 0, 150));
         settings.setValue("contastUiColor", QColor(86, 0, 120));
 

From 83e6a5d53dcacef900a30a0d649868d1843aabf4 Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Wed, 12 Jul 2017 11:20:36 +0200
Subject: [PATCH 2/4] Update qsettings info

---
 docs/dev/qsettings.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/dev/qsettings.md b/docs/dev/qsettings.md
index 02a5b5ca..50b89a6f 100644
--- a/docs/dev/qsettings.md
+++ b/docs/dev/qsettings.md
@@ -10,10 +10,6 @@
     - value: "drawColor"
     - type: QColor
     - description: color of the drawing tools.
-- Mouse visibility
-    - value: "mouseVisible"
-    - type: bool
-    - description: visibility of the mouse in the capture.
 - UI color
     - value: "uiColor"
     - type: QColor

From 9357312855f3dce4f102b31833b399c208cf1bc8 Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Wed, 12 Jul 2017 15:41:36 +0200
Subject: [PATCH 3/4] Remove unsupported tools

---
 flameshot.pro                                 |  10 +-
 img/buttonIconsBlack/format-text.png          | Bin 254 -> 0 bytes
 img/buttonIconsBlack/mouse-off.png            | Bin 387 -> 0 bytes
 img/buttonIconsBlack/mouse.png                | Bin 336 -> 0 bytes
 img/buttonIconsWhite/mouse-off.png            | Bin 394 -> 0 bytes
 img/buttonIconsWhite/mouse.png                | Bin 340 -> 0 bytes
 src/capture/buttonhandler.cpp                 |  26 ++--
 src/capture/buttonhandler.h                   |  10 +-
 src/capture/{button.cpp => capturebutton.cpp} | 124 ++++++++----------
 src/capture/{button.h => capturebutton.h}     |  18 +--
 src/capture/capturemodification.cpp           |  28 ++--
 src/capture/capturemodification.h             |   8 +-
 src/capture/capturewidget.cpp                 |  65 +++++----
 src/capture/capturewidget.h                   |  12 +-
 src/capture/screenshot.cpp                    |  18 +--
 src/capture/tools/capturetool.cpp             |   6 +
 src/capture/tools/capturetool.h               |  26 ++++
 src/config/buttonlistview.cpp                 |  14 +-
 src/config/configwindow.cpp                   |   2 +-
 src/config/uicoloreditor.cpp                  |  18 +--
 src/config/uicoloreditor.h                    |  14 +-
 src/controller.cpp                            |   8 +-
 22 files changed, 214 insertions(+), 193 deletions(-)
 delete mode 100644 img/buttonIconsBlack/format-text.png
 delete mode 100644 img/buttonIconsBlack/mouse-off.png
 delete mode 100644 img/buttonIconsBlack/mouse.png
 delete mode 100644 img/buttonIconsWhite/mouse-off.png
 delete mode 100644 img/buttonIconsWhite/mouse.png
 rename src/capture/{button.cpp => capturebutton.cpp} (60%)
 rename src/capture/{button.h => capturebutton.h} (81%)
 create mode 100644 src/capture/tools/capturetool.cpp
 create mode 100644 src/capture/tools/capturetool.h

diff --git a/flameshot.pro b/flameshot.pro
index 70f15b6a..3638eddf 100644
--- a/flameshot.pro
+++ b/flameshot.pro
@@ -37,7 +37,6 @@ DEFINES += QAPPLICATION_CLASS=QApplication
 
 SOURCES += src/main.cpp\
     src/controller.cpp \
-    src/capture/button.cpp \
     src/capture/buttonhandler.cpp \
     src/infowindow.cpp \
     src/config/configwindow.cpp \
@@ -52,11 +51,12 @@ SOURCES += src/main.cpp\
     src/config/clickablelabel.cpp \
     src/config/filenameeditor.cpp \
     src/utils/filenamehandler.cpp \
-    src/config/strftimechooserwidget.cpp
+    src/config/strftimechooserwidget.cpp \
+    src/capture/tools/capturetool.cpp \
+    src/capture/capturebutton.cpp
 
 HEADERS  += \
     src/controller.h \
-    src/capture/button.h \
     src/capture/buttonhandler.h \
     src/infowindow.h \
     src/config/configwindow.h \
@@ -71,7 +71,9 @@ HEADERS  += \
     src/config/clickablelabel.h \
     src/config/filenameeditor.h \
     src/utils/filenamehandler.h \
-    src/config/strftimechooserwidget.h
+    src/config/strftimechooserwidget.h \
+    src/capture/tools/capturetool.h \
+    src/capture/capturebutton.h
 
 RESOURCES += \
     graphics.qrc
diff --git a/img/buttonIconsBlack/format-text.png b/img/buttonIconsBlack/format-text.png
deleted file mode 100644
index 7c62a4dc56110c87444b5969ea567185c0fba3c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9F5he4R}c>anMprB-l
zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt<i2E{-7{oo}ZY@;MktxXBw@
zv8?X?qO#`P5mA|AUWa(!=<H|7e7s)5<<}%W-}~3s%SLh3Ocjf;b$=XeV5>2s(PML^
zVk6%Pz3ks<?nQ;+C+`I@Gf#-Rmc!a%?e)ziX=3#PCb6@bEvy>0HR|i6EjsUK@Ukv^
wFmd&{%%dCz?K>TRzF(nor{8-v|DTz>ZRR?c1Kchj0XmDp)78&qol`;+0JAq+1ONa4

diff --git a/img/buttonIconsBlack/mouse-off.png b/img/buttonIconsBlack/mouse-off.png
deleted file mode 100644
index e52e6bb913f89a47a4ca163b7cd26fdb0c6312e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10T4+<
zK~zYI&DA?@!axv!;a^GQV3Z=~h;s{QIT;d=2REQdT3n(u+<@05BGCY)!6`heten_8
z>kTL)SzcSa^LfTE_y>^y&%nYux0G{9Na7fH0Zu?Jn+bD#lsUJ)$y>n8N>l}yZ6<4e
z#FaJf04dN0GGOa*L0zElnlzQG`4Hp=cvDtj+VxNe#C*5KM&6Y`4m`Q4h=I=<#09Kf
z0KmaoFbD2{Yha=P_8P!cV%lYpKaaB^Rppo4RW+|MphbcJ4H68v5NGTI5Y=P4Q3Aic
zj2jIw@&L+6PXjzsd`+7m>KJ<h-bf@1w8?j}PkpM0fLH3<l~LTYdr98$0Zb&o09a8x
hh6foBar|H|5?@Bz-iN`{OGf|z002ovPDHLkV1gKrm=yp3

diff --git a/img/buttonIconsBlack/mouse.png b/img/buttonIconsBlack/mouse.png
deleted file mode 100644
index b4a8798723f15a6dc0ad8a071a9589e9259fde1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9F5he4R}c>anMprB-l
zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt*>wT^vI^I`2;P<!dq!aGS4p
zVKc||qKByw3y$pWh-2zy|G;rbXbrbl)5g}!*G_*Yc_v)?8P`6auclEbfqP1G3}=di
zOwt~fq6dr`vU`914m&Jv_iTCNMBWST3$u^hlJ+^q;8m`4scT(nxP$lieQ_q{3}(~*
zOnG)7YSV|Tn-4?SxpsIklrk)s#8BsL?Cd95bZ?$reD~yk!U60*?y5FKGdx&(jYWfr
zf&JtnmW&Pm*KW%wkZ{<^t}uBPv&#(jKHa`u$2<i$B>yQit$Kd$ne$Nxt~oFLPJ6{K
fXW{$X|AJHAr)lNO{@x0pM;Sa_{an^LB{Ts5L$rf)

diff --git a/img/buttonIconsWhite/mouse-off.png b/img/buttonIconsWhite/mouse-off.png
deleted file mode 100644
index 5774518ffa66dee2cfc7b192c300c3776a206f40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000id
z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10T)R`
zK~zYI#nn4b!$1%K&=sH%M=3Z5;TECgWJvtE0R^<AjA(KLKDh)E4M`bz6mg^_B;GaV
zGmWkF&c2<otqtM713jGKJ{o%{$9hc`E^v-_Wkk;w@m9{+uDf^}Lrbv&Si}(RRcmcT
zNqr2^2_eiv2ro7Ev>!q^Ozrx%+|3<2*ur&Y1&em=RsluSmKeFo1mHAPMS<saNCxnf
zY$m2r!U$b#;wl4}B!Ly}8ljt&SSNlBsVM(byVgx=0%Rdgfh6)1KqZm`Od25R&lKZK
zfUiH}I0rbX0W2d2Ilvxf-$9a#N62MOpdNx&nUEW=<#kY}iWV+Zw`*qp&UVZXt9~{R
oK|LJd(fkvhmiNc14w%1+57<^Fc)9lJBLDyZ07*qoM6N<$f*Ng@`2YX_

diff --git a/img/buttonIconsWhite/mouse.png b/img/buttonIconsWhite/mouse.png
deleted file mode 100644
index 4c270d5f6ebc222a0758731a04e64ba4742fd975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9F5he4R}c>anMprB-l
zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt&HdT^vI^I`2+B&)Z}m<HpUN
z!nKz>+M=6%`bP$-a=}<8vjUc{9CrLuST;`iXL#|4kly}F@0TulDE#O)gXRS0)ci0e
z$q7GLjvtV#P<Xkv)FjBRnA6_aLGgt~!wt8BfR-053_CM_1j*eEyTI_$KtII7O!>2>
zlj4zEE*pwC<nOK)I%CVi-M`n~%RuH!es^$!z@C&{cf_>+1s8ljv3nMWo?O%Ry;_bB
z6)pVsIYt|NJ;Cqm-kZsIQLI;Y=10p$4%den7K{@&E>OR@@PCYHuKDd&eizOStXdD$
i=6jvH<NZI_hEdD@^b)}<=e7bp%i!ti=d#Wzp$P!7Onxf>

diff --git a/src/capture/buttonhandler.cpp b/src/capture/buttonhandler.cpp
index e63b72d6..9fe31f60 100644
--- a/src/capture/buttonhandler.cpp
+++ b/src/capture/buttonhandler.cpp
@@ -25,7 +25,7 @@ namespace {
     const int SEPARATION = 6;
 }
 
-ButtonHandler::ButtonHandler(const QVector<Button*> &v, QObject *parent) :
+ButtonHandler::ButtonHandler(const QVector<CaptureButton*> &v, QObject *parent) :
     QObject(parent)
 {
     if (!v.isEmpty()) {
@@ -40,11 +40,11 @@ ButtonHandler::ButtonHandler(QObject *parent) :
 }
 
 void ButtonHandler::hide() {
-    for (Button *b: m_vectorButtons) b->hide();
+    for (CaptureButton *b: m_vectorButtons) b->hide();
 }
 
 void ButtonHandler::show() {
-    for (Button *b: m_vectorButtons) b->animatedShow();
+    for (CaptureButton *b: m_vectorButtons) b->animatedShow();
 }
 
 bool ButtonHandler::isVisible() const {
@@ -63,13 +63,13 @@ size_t ButtonHandler::size() const {
 void ButtonHandler::updatePosition(const QRect &selection,
                                    const  QRect &limits)
 {
-    const QVector<Button*>::size_type vecLength = m_vectorButtons.size();
+    const QVector<CaptureButton*>::size_type vecLength = m_vectorButtons.size();
     if (vecLength == 0) {
         return;
     }
     // button dimmensions
-    const int baseHeight = Button::getButtonBaseSize();
-    const int baseWidth = Button::getButtonBaseSize();
+    const int baseHeight = CaptureButton::getButtonBaseSize();
+    const int baseWidth = CaptureButton::getButtonBaseSize();
     // copy of the selection area for internal modifications
     QRect baseArea = selection;
 
@@ -104,7 +104,7 @@ void ButtonHandler::updatePosition(const QRect &selection,
         baseArea.setHeight(baseHeight);
     }
     // indicates the actual button to be moved
-    QVector<Button*>::size_type elemIndicator = 0;
+    QVector<CaptureButton*>::size_type elemIndicator = 0;
 
     while (elemIndicator < vecLength) {
         // update of blocked sides
@@ -263,9 +263,9 @@ QVector<QPoint> ButtonHandler::getHPoints(
     if (elements % 2 == 0) {
         shift = m_distance * (elements / 2) - (SEPARATION / 2);
     } else {
-        shift = m_distance * ((elements-1) / 2) + Button::getButtonBaseSize() / 2;
+        shift = m_distance * ((elements-1) / 2) + CaptureButton::getButtonBaseSize() / 2;
     }
-    if (!leftToRight) { shift -= Button::getButtonBaseSize(); }
+    if (!leftToRight) { shift -= CaptureButton::getButtonBaseSize(); }
     int x = leftToRight ? center.x() - shift :
                           center.x() + shift;
     QPoint i(x, center.y());
@@ -289,9 +289,9 @@ QVector<QPoint> ButtonHandler::getVPoints(
     if (elements % 2 == 0) {
         shift = m_distance * (elements / 2) - (SEPARATION / 2);
     } else {
-        shift = m_distance * ((elements-1) / 2) + Button::getButtonBaseSize() / 2;
+        shift = m_distance * ((elements-1) / 2) + CaptureButton::getButtonBaseSize() / 2;
     }
-    if (!upToDown) { shift -= Button::getButtonBaseSize(); }
+    if (!upToDown) { shift -= CaptureButton::getButtonBaseSize(); }
     int y = upToDown ? center.y() - shift :
                        center.y() + shift;
     QPoint i(center.x(), y);
@@ -303,8 +303,8 @@ QVector<QPoint> ButtonHandler::getVPoints(
     return res;
 }
 // setButtons redefines the buttons of the button handler
-void ButtonHandler::setButtons(const QVector<Button *> v) {
-    for (Button *b: m_vectorButtons) delete(b);
+void ButtonHandler::setButtons(const QVector<CaptureButton *> v) {
+    for (CaptureButton *b: m_vectorButtons) delete(b);
     m_vectorButtons = v;
     if (!v.isEmpty()) {
         m_distance = v[0]->getButtonBaseSize() + SEPARATION;
diff --git a/src/capture/buttonhandler.h b/src/capture/buttonhandler.h
index cae6a59f..5dc8dd33 100644
--- a/src/capture/buttonhandler.h
+++ b/src/capture/buttonhandler.h
@@ -18,18 +18,18 @@
 #ifndef BUTTONHANDLER_H
 #define BUTTONHANDLER_H
 
-#include "button.h"
+#include "capturebutton.h"
 #include <QVector>
 #include <QObject>
 
-class Button;
+class CaptureButton;
 class QRect;
 class QPoint;
 
 class ButtonHandler : public QObject {
     Q_OBJECT
 public:
-    ButtonHandler(const QVector<Button*>&, QObject *parent = 0);
+    ButtonHandler(const QVector<CaptureButton*>&, QObject *parent = 0);
     ButtonHandler(QObject *parent = 0);
 
     void hide();
@@ -39,14 +39,14 @@ public:
     size_t size() const;
 
     void updatePosition(const QRect &selection, const QRect &limits);
-    void setButtons(const QVector<Button*>);
+    void setButtons(const QVector<CaptureButton*>);
 
 private:
     QVector<QPoint> getHPoints(const QPoint &center, const int elements,
                                const bool leftToRight) const;
     QVector<QPoint> getVPoints(const QPoint &center, const int elements,
                                const bool upToDown) const;
-    QVector<Button*> m_vectorButtons;
+    QVector<CaptureButton*> m_vectorButtons;
 
     int m_distance;
 };
diff --git a/src/capture/button.cpp b/src/capture/capturebutton.cpp
similarity index 60%
rename from src/capture/button.cpp
rename to src/capture/capturebutton.cpp
index 6ff7231b..fc06520c 100644
--- a/src/capture/button.cpp
+++ b/src/capture/capturebutton.cpp
@@ -15,7 +15,7 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "button.h"
+#include "capturebutton.h"
 #include "src/capture/capturewidget.h"
 #include <QIcon>
 #include <QPropertyAnimation>
@@ -30,12 +30,12 @@ namespace {
     const int BUTTON_SIZE = 30;
 }
 
-Button::Button(const Type t, QWidget *parent) : QPushButton(parent),
+CaptureButton::CaptureButton(const Type t, QWidget *parent) : QPushButton(parent),
     m_buttonType(t), m_pressed(false)
 {
     initButton();
 
-    if (t == Button::Type::selectionIndicator) {
+    if (t == CaptureButton::Type::selectionIndicator) {
         QFont f = this->font();
         setFont(QFont(f.family(), 7, QFont::Bold));
     } else {
@@ -43,12 +43,12 @@ Button::Button(const Type t, QWidget *parent) : QPushButton(parent),
     }
 }
 
-Button::Button(const Button::Type t, const bool isWhite, QWidget *parent)
+CaptureButton::CaptureButton(const CaptureButton::Type t, const bool isWhite, QWidget *parent)
     : QPushButton(parent), m_buttonType(t), m_pressed(false)
 {
     initButton();
 
-    if (t == Button::Type::selectionIndicator) {
+    if (t == CaptureButton::Type::selectionIndicator) {
         QFont f = this->font();
         setFont(QFont(f.family(), 7, QFont::Bold));
     } else {
@@ -56,7 +56,7 @@ Button::Button(const Button::Type t, const bool isWhite, QWidget *parent)
     }
 }
 
-void Button::initButton() {
+void CaptureButton::initButton() {
     setFocusPolicy(Qt::NoFocus);
     resize(BUTTON_SIZE, BUTTON_SIZE);
     setMouseTracking(true);
@@ -73,7 +73,7 @@ void Button::initButton() {
 
 // getIcon returns the icon for the type of button, this method lets
 // you choose between black or white icons (needed for the config menu)
-QIcon Button::getIcon(const Type t, bool isWhite) {
+QIcon CaptureButton::getIcon(const Type t, bool isWhite) {
     QString iconColor = "Black";
     if (isWhite) {
         iconColor = "White";
@@ -87,9 +87,6 @@ QIcon Button::getIcon(const Type t, bool isWhite) {
     case Type::circle:
         path += "circle-outline.png";
         break;
-    case Type::colorPicker:
-        path += "square-outline.png";
-        break;
     case Type::copy:
         path += "content-copy.png";
         break;
@@ -114,9 +111,6 @@ QIcon Button::getIcon(const Type t, bool isWhite) {
     case Type::save:
         path += "content-save.png";
         break;
-    case Type::text:
-        path += "format-text.png";
-        break;
     case Type::undo:
         path += "undo-variant.png";
         break;
@@ -132,13 +126,13 @@ QIcon Button::getIcon(const Type t, bool isWhite) {
     return QIcon(path);
 }
 
-QString Button::getStyle() {
+QString CaptureButton::getStyle() {
     QSettings settings;
     m_mainColor = settings.value("uiColor").value<QColor>();
     return getStyle(m_mainColor);
 }
 
-QString Button::getStyle(const QColor &mainColor) {
+QString CaptureButton::getStyle(const QColor &mainColor) {
     m_mainColor = mainColor;
     QString baseSheet = "Button { border-radius: %3;"
                         "background-color: %1; color: %4 }"
@@ -160,22 +154,22 @@ QString Button::getStyle(const QColor &mainColor) {
             .arg(BUTTON_SIZE/2).arg(color);
 }
 // get icon returns the icon for the type of button
-QIcon Button::getIcon(const Type t) {
+QIcon CaptureButton::getIcon(const Type t) {
     return getIcon(t, iconIsWhite(m_mainColor));
 }
 
-void Button::enterEvent(QEvent *e) {
+void CaptureButton::enterEvent(QEvent *e) {
     Q_EMIT hovered();
     QWidget::enterEvent(e);
 }
 
-void Button::leaveEvent(QEvent *e) {
+void CaptureButton::leaveEvent(QEvent *e) {
     m_pressed = false;
     Q_EMIT mouseExited();
     QWidget::leaveEvent(e);
 }
 
-void Button::mouseReleaseEvent(QMouseEvent *e) {
+void CaptureButton::mouseReleaseEvent(QMouseEvent *e) {
     CaptureWidget *parent = static_cast<CaptureWidget*>(this->parent());
     parent->mouseReleaseEvent(e);
     if (e->button() == Qt::LeftButton && m_pressed) {
@@ -184,29 +178,29 @@ void Button::mouseReleaseEvent(QMouseEvent *e) {
     m_pressed = false;
 }
 
-void Button::mousePressEvent(QMouseEvent *) {
+void CaptureButton::mousePressEvent(QMouseEvent *) {
     m_pressed = true;
 }
 
-void Button::animatedShow() {
+void CaptureButton::animatedShow() {
     show();
     emergeAnimation->start();
 }
 
-Button::Type Button::getButtonType() const {
+CaptureButton::Type CaptureButton::getButtonType() const {
     return m_buttonType;
 }
 
-void Button::updateIconColor(const QColor &c) {
+void CaptureButton::updateIconColor(const QColor &c) {
     setIcon(getIcon(m_buttonType, iconIsWhite(c)));
 }
 
-void Button::updateIconColor() {
+void CaptureButton::updateIconColor() {
     setIcon(getIcon(m_buttonType, iconIsWhite()));
 }
 // iconIsWhite returns true if the passed color would contain a white icon
 // if applied to a button, and false otherwise
-bool Button::iconIsWhite(const QColor &c) {
+bool CaptureButton::iconIsWhite(const QColor &c) {
     bool isWhite = false;
     if (c.value() < m_colorValueLimit ||
             c.saturation() > m_colorSaturationLimit) {
@@ -215,69 +209,63 @@ bool Button::iconIsWhite(const QColor &c) {
     return isWhite;
 }
 
-bool Button::iconIsWhite() const {
+bool CaptureButton::iconIsWhite() const {
     return iconIsWhite(m_mainColor);
 }
 // getButtonBaseSize returns the base size of the buttons
-size_t Button::getButtonBaseSize() {
+size_t CaptureButton::getButtonBaseSize() {
     return BUTTON_SIZE;
 }
 // getTypeByName receives a name and return the corresponding button type.
 // returns Button::Type::last when the corresponding button is not found.
-Button::Type Button::getTypeByName(const QString s) {
-    Button::Type res = Type::last;
+CaptureButton::Type CaptureButton::getTypeByName(const QString s) {
+    CaptureButton::Type res = Type::last;
     for (auto i: typeName.toStdMap())
         if (tr(i.second) == s)
             res = i.first;
     return res;
 }
 
-QString Button::getTypeName(const Button::Type t) {
+QString CaptureButton::getTypeName(const CaptureButton::Type t) {
     return tr(typeName[t]);
 }
 
-QString Button::getTypeTooltip(const Button::Type t) {
+QString CaptureButton::getTypeTooltip(const CaptureButton::Type t) {
     return tr(typeTooltip[t]);
 }
 
-Button::typeData Button::typeTooltip = {
-        {Button::Type::selectionIndicator, QT_TR_NOOP("Shows the dimensions of the selection (X Y)")},
-        {Button::Type::mouseVisibility, QT_TR_NOOP("Sets the visibility of the mouse pointer")},
-        {Button::Type::exit, QT_TR_NOOP("Leaves the capture screen")},
-        {Button::Type::copy, QT_TR_NOOP("Copies the selecion into the clipboard")},
-        {Button::Type::save, QT_TR_NOOP("Opens the save image window")},
-        {Button::Type::pencil, QT_TR_NOOP("Sets the Pencil as the paint tool")},
-        {Button::Type::line, QT_TR_NOOP("Sets the Line as the paint tool")},
-        {Button::Type::arrow, QT_TR_NOOP("Sets the Arrow as the paint tool")},
-        {Button::Type::rectangle, QT_TR_NOOP("Sets the Rectangle as the paint tool")},
-        {Button::Type::circle, QT_TR_NOOP("Sets the Circle as the paint tool")},
-        {Button::Type::marker, QT_TR_NOOP("Sets the Marker as the paint tool")},
-        {Button::Type::text, QT_TR_NOOP("Sets the Text as the paint tool")},
-        {Button::Type::colorPicker, QT_TR_NOOP("Opens the color picker widget")},
-        {Button::Type::undo, QT_TR_NOOP("Undo the last modification")},
-        {Button::Type::imageUploader, QT_TR_NOOP("Uploads the selection to Imgur")},
-        {Button::Type::selection, QT_TR_NOOP("Sets the Selection as the paint tool")},
-        {Button::Type::move, QT_TR_NOOP("Move the selection area")}
+CaptureButton::typeData CaptureButton::typeTooltip = {
+        {CaptureButton::Type::selectionIndicator, QT_TR_NOOP("Shows the dimensions of the selection (X Y)")},
+        {CaptureButton::Type::exit, QT_TR_NOOP("Leaves the capture screen")},
+        {CaptureButton::Type::copy, QT_TR_NOOP("Copies the selecion into the clipboard")},
+        {CaptureButton::Type::save, QT_TR_NOOP("Opens the save image window")},
+        {CaptureButton::Type::pencil, QT_TR_NOOP("Sets the Pencil as the paint tool")},
+        {CaptureButton::Type::line, QT_TR_NOOP("Sets the Line as the paint tool")},
+        {CaptureButton::Type::arrow, QT_TR_NOOP("Sets the Arrow as the paint tool")},
+        {CaptureButton::Type::rectangle, QT_TR_NOOP("Sets the Rectangle as the paint tool")},
+        {CaptureButton::Type::circle, QT_TR_NOOP("Sets the Circle as the paint tool")},
+        {CaptureButton::Type::marker, QT_TR_NOOP("Sets the Marker as the paint tool")},
+        {CaptureButton::Type::undo, QT_TR_NOOP("Undo the last modification")},
+        {CaptureButton::Type::imageUploader, QT_TR_NOOP("Uploads the selection to Imgur")},
+        {CaptureButton::Type::selection, QT_TR_NOOP("Sets the Selection as the paint tool")},
+        {CaptureButton::Type::move, QT_TR_NOOP("Move the selection area")}
 };
 
-Button::typeData Button::typeName = {
-    {Button::Type::selectionIndicator, QT_TR_NOOP("Selection Size Indicator")},
-    {Button::Type::mouseVisibility, QT_TR_NOOP("Mouse Visibility")},
-    {Button::Type::exit, QT_TR_NOOP("Exit")},
-    {Button::Type::copy, QT_TR_NOOP("Copy")},
-    {Button::Type::save, QT_TR_NOOP("Save")},
-    {Button::Type::pencil, QT_TR_NOOP("Pencil")},
-    {Button::Type::line, QT_TR_NOOP("Line")},
-    {Button::Type::arrow, QT_TR_NOOP("Arrow")},
-    {Button::Type::rectangle, QT_TR_NOOP("Rectangle")},
-    {Button::Type::circle, QT_TR_NOOP("Circle")},
-    {Button::Type::marker, QT_TR_NOOP("Marker")},
-    {Button::Type::text, QT_TR_NOOP("Text")},
-    {Button::Type::colorPicker, QT_TR_NOOP("Color Picker")},
-    {Button::Type::undo, QT_TR_NOOP("Undo")},
-    {Button::Type::imageUploader, QT_TR_NOOP("Image Uploader")},
-    {Button::Type::selection, QT_TR_NOOP("Rectangular Selection")},
-    {Button::Type::move, QT_TR_NOOP("Move")}
+CaptureButton::typeData CaptureButton::typeName = {
+    {CaptureButton::Type::selectionIndicator, QT_TR_NOOP("Selection Size Indicator")},
+    {CaptureButton::Type::exit, QT_TR_NOOP("Exit")},
+    {CaptureButton::Type::copy, QT_TR_NOOP("Copy")},
+    {CaptureButton::Type::save, QT_TR_NOOP("Save")},
+    {CaptureButton::Type::pencil, QT_TR_NOOP("Pencil")},
+    {CaptureButton::Type::line, QT_TR_NOOP("Line")},
+    {CaptureButton::Type::arrow, QT_TR_NOOP("Arrow")},
+    {CaptureButton::Type::rectangle, QT_TR_NOOP("Rectangle")},
+    {CaptureButton::Type::circle, QT_TR_NOOP("Circle")},
+    {CaptureButton::Type::marker, QT_TR_NOOP("Marker")},
+    {CaptureButton::Type::undo, QT_TR_NOOP("Undo")},
+    {CaptureButton::Type::imageUploader, QT_TR_NOOP("Image Uploader")},
+    {CaptureButton::Type::selection, QT_TR_NOOP("Rectangular Selection")},
+    {CaptureButton::Type::move, QT_TR_NOOP("Move")}
 };
 
-QColor Button::m_mainColor = QSettings().value("uiColor").value<QColor>();
+QColor CaptureButton::m_mainColor = QSettings().value("uiColor").value<QColor>();
diff --git a/src/capture/button.h b/src/capture/capturebutton.h
similarity index 81%
rename from src/capture/button.h
rename to src/capture/capturebutton.h
index 733790c1..f165c605 100644
--- a/src/capture/button.h
+++ b/src/capture/capturebutton.h
@@ -24,7 +24,7 @@
 class QWidget;
 class QPropertyAnimation;
 
-class Button : public QPushButton {
+class CaptureButton : public QPushButton {
     Q_OBJECT
     Q_ENUMS(Type)
 
@@ -47,17 +47,17 @@ public:
         last, // used for iteration over the enum
     };
 
-    explicit Button(const Type, QWidget *parent = 0);
-    explicit Button(const Type, const bool isWhite, QWidget *parent = 0);
+    explicit CaptureButton(const Type, QWidget *parent = 0);
+    explicit CaptureButton(const Type, const bool isWhite, QWidget *parent = 0);
 
     static QIcon getIcon(const Type);
     static QIcon getIcon(const Type, bool isWhite);
     static QString getStyle();
     static QString getStyle(const QColor &);
     static size_t getButtonBaseSize();
-    static Button::Type getTypeByName(const QString);
-    static QString getTypeName(const Button::Type);
-    static QString getTypeTooltip(const Button::Type);
+    static CaptureButton::Type getTypeByName(const QString);
+    static QString getTypeName(const CaptureButton::Type);
+    static QString getTypeTooltip(const CaptureButton::Type);
 
     Type getButtonType() const;
 
@@ -78,10 +78,10 @@ protected:
 signals:
     void hovered();
     void mouseExited();
-    void pressedButton(Button *);
+    void pressedButton(CaptureButton *);
 
 private:
-    Button(QWidget *parent = 0);
+    CaptureButton(QWidget *parent = 0);
     const Type m_buttonType;
     static const int m_colorValueLimit = 166;
     static const int m_colorSaturationLimit = 110;
@@ -89,7 +89,7 @@ private:
 
     QPropertyAnimation *emergeAnimation;
 
-    typedef QMap<Button::Type, const char *> typeData;
+    typedef QMap<CaptureButton::Type, const char *> typeData;
     static typeData typeTooltip;
     static typeData typeName;
     static QColor m_mainColor;
diff --git a/src/capture/capturemodification.cpp b/src/capture/capturemodification.cpp
index 77c2d845..04ae7a32 100644
--- a/src/capture/capturemodification.cpp
+++ b/src/capture/capturemodification.cpp
@@ -21,16 +21,16 @@
 // CaptureModification is a single modification in the screenshot drawn
 // by the user.
 
-CaptureModification::CaptureModification(const Button::Type t, const QPoint p,
+CaptureModification::CaptureModification(const CaptureButton::Type t, const QPoint p,
                                          const QColor c) : m_color(c), m_type(t)
 {
     m_coords.append(p);
-    if (m_type == Button::Type::circle
-            || m_type == Button::Type::rectangle
-            || m_type == Button::Type::arrow
-            || m_type == Button::Type::line
-            || m_type == Button::Type::marker
-            || m_type == Button::Type::selection) {
+    if (m_type == CaptureButton::Type::circle
+            || m_type == CaptureButton::Type::rectangle
+            || m_type == CaptureButton::Type::arrow
+            || m_type == CaptureButton::Type::line
+            || m_type == CaptureButton::Type::marker
+            || m_type == CaptureButton::Type::selection) {
         m_coords.append(p);
     }
 }
@@ -39,7 +39,7 @@ CaptureModification::CaptureModification() {
 
 }
 
-Button::Type CaptureModification::getType() const {
+CaptureButton::Type CaptureModification::getType() const {
     return m_type;
 }
 
@@ -52,12 +52,12 @@ QVector<QPoint> CaptureModification::getPoints() const {
 }
 // addPoint adds a point to the vector of points
 void CaptureModification::addPoint(const QPoint p) {
-    if (m_type == Button::Type::circle
-            || m_type == Button::Type::rectangle
-            || m_type == Button::Type::arrow
-            || m_type == Button::Type::line
-            || m_type == Button::Type::marker
-            || m_type == Button::Type::selection) {
+    if (m_type == CaptureButton::Type::circle
+            || m_type == CaptureButton::Type::rectangle
+            || m_type == CaptureButton::Type::arrow
+            || m_type == CaptureButton::Type::line
+            || m_type == CaptureButton::Type::marker
+            || m_type == CaptureButton::Type::selection) {
         m_coords[1] = p;
     } else {
         m_coords.append(p);
diff --git a/src/capture/capturemodification.h b/src/capture/capturemodification.h
index 491aff34..7aa69194 100644
--- a/src/capture/capturemodification.h
+++ b/src/capture/capturemodification.h
@@ -18,7 +18,7 @@
 #ifndef CAPTURECHANGE_H
 #define CAPTURECHANGE_H
 
-#include "button.h"
+#include "capturebutton.h"
 #include <QVector>
 
 class QPoint;
@@ -26,15 +26,15 @@ class QPoint;
 class CaptureModification {
 public:
     CaptureModification();
-    CaptureModification(const Button::Type, const QPoint, const QColor);
-    Button::Type getType() const;
+    CaptureModification(const CaptureButton::Type, const QPoint, const QColor);
+    CaptureButton::Type getType() const;
     QColor getColor() const;
     QVector<QPoint> getPoints() const;
     void addPoint(const QPoint);
 
 protected:
     QColor m_color;
-    Button::Type m_type;
+    CaptureButton::Type m_type;
 
 private:
     QVector<QPoint> m_coords;
diff --git a/src/capture/capturewidget.cpp b/src/capture/capturewidget.cpp
index d28fbb07..2f044401 100644
--- a/src/capture/capturewidget.cpp
+++ b/src/capture/capturewidget.cpp
@@ -24,7 +24,7 @@
 #include "screenshot.h"
 #include "capturemodification.h"
 #include "capturewidget.h"
-#include "button.h"
+#include "capturebutton.h"
 #include "src/capture/colorpicker.h"
 #include <QScreen>
 #include <QWindow>
@@ -55,7 +55,7 @@ CaptureWidget::CaptureWidget(bool enableSaveWindow, QWidget *parent) :
     QWidget(parent), m_mouseOverHandle(0), m_mouseIsClicked(false),
     m_rightClick(false), m_newSelection(false), m_grabbing(false),
     m_onButton(false), m_enableSaveWindow(enableSaveWindow),
-    m_state(Button::Type::move)
+    m_state(CaptureButton::Type::move)
 {
     m_showInitialMsg = QSettings().value("showHelp").toBool();
 
@@ -107,22 +107,22 @@ void CaptureWidget::updateButtons() {
     m_contrastUiColor = settings.value("contastUiColor").value<QColor>();
 
     auto buttonsInt = settings.value("buttons").value<QList<int> >();
-    QVector<Button*> vectorButtons;
+    QVector<CaptureButton*> vectorButtons;
 
-    bool iconIsWhite = Button::iconIsWhite(m_uiColor);
-    QString buttonStyle = Button::getStyle(m_uiColor);
+    bool iconIsWhite = CaptureButton::iconIsWhite(m_uiColor);
+    QString buttonStyle = CaptureButton::getStyle(m_uiColor);
 
     for (auto i: buttonsInt) {
-        auto t = static_cast<Button::Type>(i);
-        Button *b = new Button(t, iconIsWhite, this);
-        if (t == Button::Type::selectionIndicator) {
+        auto t = static_cast<CaptureButton::Type>(i);
+        CaptureButton *b = new CaptureButton(t, iconIsWhite, this);
+        if (t == CaptureButton::Type::selectionIndicator) {
             m_sizeIndButton = b;
         }
         b->setStyleSheet(buttonStyle);
 
-        connect(b, &Button::hovered, this, &CaptureWidget::enterButton);
-        connect(b, &Button::mouseExited, this, &CaptureWidget::leaveButton);
-        connect(b, &Button::pressedButton, this, &CaptureWidget::setState);
+        connect(b, &CaptureButton::hovered, this, &CaptureWidget::enterButton);
+        connect(b, &CaptureButton::mouseExited, this, &CaptureWidget::leaveButton);
+        connect(b, &CaptureButton::pressedButton, this, &CaptureWidget::setState);
         vectorButtons << b;
     }
     m_buttonHandler->setButtons(vectorButtons);
@@ -138,7 +138,7 @@ void CaptureWidget::paintEvent(QPaintEvent *) {
     // if we are creating a new modification to the screenshot we just draw
     // a temporal modification without antialiasing in the pencil tool for
     // performance. When we are not drawing we just shot the modified screenshot
-    if (m_mouseIsClicked && m_state != Button::Type::move) {
+    if (m_mouseIsClicked && m_state != CaptureButton::Type::move) {
         painter.drawPixmap(0, 0, m_screenshot->paintTemporalModification(
                                m_modifications.last()));
     } else {
@@ -167,7 +167,7 @@ void CaptureWidget::paintEvent(QPaintEvent *) {
         //same text and options to get the boundingRect that the text will have.
         QColor rectColor = m_uiColor;
         rectColor.setAlpha(180);
-        QColor textColor((Button::iconIsWhite(rectColor) ? Qt::white : Qt::black));
+        QColor textColor((CaptureButton::iconIsWhite(rectColor) ? Qt::white : Qt::black));
         painter.setPen(QPen(textColor));
         painter.setBrush(QBrush(rectColor, Qt::SolidPattern));
         QRectF bRect = painter.boundingRect(helpRect, Qt::AlignCenter, helpTxt);
@@ -213,7 +213,7 @@ void CaptureWidget::mousePressEvent(QMouseEvent *e) {
     if (e->button() == Qt::LeftButton) {
         m_showInitialMsg = false;
         m_mouseIsClicked = true;
-        if (m_state != Button::Type::move) {
+        if (m_state != CaptureButton::Type::move) {
             m_modifications.append(CaptureModification(m_state, e->pos(),
                                                        m_colorPicker->getDrawColor()));
             return;
@@ -233,7 +233,7 @@ void CaptureWidget::mousePressEvent(QMouseEvent *e) {
 }
 
 void CaptureWidget::mouseMoveEvent(QMouseEvent *e) {
-    if (m_mouseIsClicked && m_state == Button::Type::move) {
+    if (m_mouseIsClicked && m_state == CaptureButton::Type::move) {
         m_mousePos = e->pos();
 
         if (m_newSelection) {
@@ -316,14 +316,14 @@ void CaptureWidget::mouseMoveEvent(QMouseEvent *e) {
             if (m_rightClick) {
                 setCursor(Qt::ArrowCursor);
             } else if (m_selection.contains(e->pos()) && !m_onButton &&
-                    m_state == Button::Type::move) {
+                    m_state == CaptureButton::Type::move) {
                 setCursor(Qt::OpenHandCursor);
             } else if (m_onButton) {
                 setCursor(Qt::ArrowCursor);
             } else {
                 setCursor(Qt::CrossCursor);
             }
-        } else if (m_state == Button::Type::move){
+        } else if (m_state == CaptureButton::Type::move){
             // cursor on the handlers
             if (m_mouseOverHandle == &m_TLHandle || m_mouseOverHandle == &m_BRHandle) {
                 setCursor(Qt::SizeFDiagCursor);
@@ -346,7 +346,7 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent *e) {
         return;
     // when we end the drawing of a modification in the capture we have to
     // register the last point and add the whole modification to the screenshot
-    } else if (m_mouseIsClicked && m_state != Button::Type::move) {
+    } else if (m_mouseIsClicked && m_state != CaptureButton::Type::move) {
         m_screenshot->paintModification(m_modifications.last());
     }
 
@@ -358,7 +358,7 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent *e) {
     m_mouseIsClicked = false;
     m_newSelection = false;
 
-    if (m_state == Button::Type::move && m_mouseOverHandle == 0 &&
+    if (m_state == CaptureButton::Type::move && m_mouseOverHandle == 0 &&
             m_selection.contains(e->pos())) {
         setCursor(Qt::OpenHandCursor);
     }
@@ -519,37 +519,36 @@ void CaptureWidget::downResize() {
     }
 }
 
-void CaptureWidget::setState(Button *b) {
-    Button::Type t = b->getButtonType();
-    if(t == Button::Type::selectionIndicator ||
-            t == Button::Type::colorPicker) {
+void CaptureWidget::setState(CaptureButton *b) {
+    CaptureButton::Type t = b->getButtonType();
+    if(t == CaptureButton::Type::selectionIndicator) {
         return;
     }
-    Button::Type newState = t;
+    CaptureButton::Type newState = t;
     if (m_state == t) {
-        newState =  Button::Type::move;
+        newState =  CaptureButton::Type::move;
     }
-    if (t == Button::Type::save) {
+    if (t == CaptureButton::Type::save) {
         m_enableSaveWindow ?
                     saveScreenshot() :
                     saveScreenshot(QSettings().value("savePath").toString());
-    } else if (t == Button::Type::copy) {
+    } else if (t == CaptureButton::Type::copy) {
         copyScreenshot();
-    } else if (t == Button::Type::exit) {
+    } else if (t == CaptureButton::Type::exit) {
         close();
-    } else if (t == Button::Type::undo) {
+    } else if (t == CaptureButton::Type::undo) {
         undo();
-    } else if (t == Button::Type::imageUploader) {
+    } else if (t == CaptureButton::Type::imageUploader) {
         uploadScreenshot();
     } else {
         m_state = newState;
         if (m_lastPressedButton) {
-            m_lastPressedButton->setStyleSheet(Button::getStyle());
+            m_lastPressedButton->setStyleSheet(CaptureButton::getStyle());
             m_lastPressedButton->updateIconColor();
         }
         m_lastPressedButton = b;
-        if (m_state != Button::Type::move) {
-            m_lastPressedButton->setStyleSheet(Button::getStyle(m_contrastUiColor));
+        if (m_state != CaptureButton::Type::move) {
+            m_lastPressedButton->setStyleSheet(CaptureButton::getStyle(m_contrastUiColor));
             m_lastPressedButton->updateIconColor(m_contrastUiColor);
         }
     }
diff --git a/src/capture/capturewidget.h b/src/capture/capturewidget.h
index b3686c85..e2df50f0 100644
--- a/src/capture/capturewidget.h
+++ b/src/capture/capturewidget.h
@@ -24,7 +24,7 @@
 #ifndef CAPTUREWIDGET_H
 #define CAPTUREWIDGET_H
 
-#include "button.h"
+#include "capturebutton.h"
 #include "buttonhandler.h"
 #include <QWidget>
 #include <QPointer>
@@ -41,7 +41,7 @@ class Screenshot;
 class CaptureWidget : public QWidget {
     Q_OBJECT
 
-    friend class Button;
+    friend class CaptureButton;
 
 public:
     explicit CaptureWidget(bool enableSaveWindow = true, QWidget *parent = 0);
@@ -67,7 +67,7 @@ private slots:
     void upResize();
     void downResize();
 
-    void setState(Button *);
+    void setState(CaptureButton *);
 
 protected:
     void paintEvent(QPaintEvent *);
@@ -115,10 +115,10 @@ private:
 
     QRect getExtendedSelection() const;
     QVector<CaptureModification> m_modifications;
-    QPointer<Button> m_sizeIndButton;
-    QPointer<Button> m_lastPressedButton;
+    QPointer<CaptureButton> m_sizeIndButton;
+    QPointer<CaptureButton> m_lastPressedButton;
 
-    Button::Type m_state;
+    CaptureButton::Type m_state;
     ButtonHandler *m_buttonHandler;
 
     QColor m_uiColor;
diff --git a/src/capture/screenshot.cpp b/src/capture/screenshot.cpp
index af826605..2687141a 100644
--- a/src/capture/screenshot.cpp
+++ b/src/capture/screenshot.cpp
@@ -16,7 +16,7 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "screenshot.h"
-#include "button.h"
+#include "capturebutton.h"
 #include "capturemodification.h"
 #include "src/utils/filenamehandler.h"
 #include <QStandardPaths>
@@ -184,7 +184,7 @@ QPixmap Screenshot::paintTemporalModification(
 {
     QPixmap tempPix = m_modifiedScreenshot;
     QPainter painter(&tempPix);
-    if (modification.getType() != Button::Type::pencil) {
+    if (modification.getType() != CaptureButton::Type::pencil) {
         painter.setRenderHint(QPainter::Antialiasing);
     }
     paintInPainter(painter, modification);
@@ -252,30 +252,30 @@ void Screenshot::paintInPainter(QPainter &painter,
     painter.setPen(QPen(modification.getColor(), 2));
     QVector<QPoint> points = modification.getPoints();
     switch (modification.getType()) {
-    case Button::Type::arrow:
+    case CaptureButton::Type::arrow:
         painter.drawLine(getShorterLine(points[0], points[1]));
         painter.fillPath(getArrowHead(points[0], points[1]),
                 QBrush(modification.getColor()));
         break;
-    case Button::Type::circle:
+    case CaptureButton::Type::circle:
         painter.drawEllipse(QRect(points[0], points[1]));
         break;
-    case Button::Type::line:
+    case CaptureButton::Type::line:
         painter.drawLine(points[0], points[1]);
         break;
-    case Button::Type::marker:
+    case CaptureButton::Type::marker:
         painter.setOpacity(0.35);
         painter.setPen(QPen(modification.getColor(), 14));
         painter.drawLine(points[0], points[1]);
         painter.setOpacity(1);
         break;
-    case Button::Type::pencil:
+    case CaptureButton::Type::pencil:
         painter.drawPolyline(points.data(), points.size());
         break;
-    case Button::Type::selection:
+    case CaptureButton::Type::selection:
         painter.drawRect(QRect(points[0], points[1]));
         break;
-    case Button::Type::rectangle:
+    case CaptureButton::Type::rectangle:
         painter.setBrush(QBrush(modification.getColor()));
         painter.drawRect(QRect(points[0], points[1]));
         break;
diff --git a/src/capture/tools/capturetool.cpp b/src/capture/tools/capturetool.cpp
new file mode 100644
index 00000000..eacdd35c
--- /dev/null
+++ b/src/capture/tools/capturetool.cpp
@@ -0,0 +1,6 @@
+#include "capturetool.h"
+
+CaptureTool::CaptureTool(QObject *parent) : QObject(parent)
+{
+
+}
diff --git a/src/capture/tools/capturetool.h b/src/capture/tools/capturetool.h
new file mode 100644
index 00000000..b274ec5a
--- /dev/null
+++ b/src/capture/tools/capturetool.h
@@ -0,0 +1,26 @@
+#ifndef CAPTURETOOL_H
+#define CAPTURETOOL_H
+
+#include <QObject>
+#include <QVector>
+
+class CaptureTool : public QObject
+{
+    Q_OBJECT
+public:
+    enum toolType{WORKER, PATH_DRAWER, LINE_DRAWER};
+
+    explicit CaptureTool(QObject *parent = nullptr);
+
+    virtual int getID() = 0;
+    virtual bool isCheckable() = 0;
+    virtual void drawChanges(QPixmap &pm, const QVector<QPoint> &points) = 0;
+    virtual toolType getToolType() = 0;
+
+signals:
+    void requestAction();
+
+public slots:
+};
+
+#endif // CAPTURETOOL_H
diff --git a/src/config/buttonlistview.cpp b/src/config/buttonlistview.cpp
index c9be8ca6..92773faa 100644
--- a/src/config/buttonlistview.cpp
+++ b/src/config/buttonlistview.cpp
@@ -16,7 +16,7 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "buttonlistview.h"
-#include "src/capture/button.h"
+#include "src/capture/capturebutton.h"
 #include <QListWidgetItem>
 #include <QListWidgetItem>
 #include <QSettings>
@@ -37,8 +37,8 @@ ButtonListView::ButtonListView(QWidget *parent) : QListWidget(parent) {
 }
 
 void ButtonListView::initButtonList() {
-    for (int i = 0; i != static_cast<int>(Button::Type::last); ++i) {
-        auto t = static_cast<Button::Type>(i);
+    for (int i = 0; i != static_cast<int>(CaptureButton::Type::last); ++i) {
+        auto t = static_cast<CaptureButton::Type>(i);
         QListWidgetItem *buttonItem = new QListWidgetItem(this);
 
         bool iconsAreWhite = false;
@@ -47,13 +47,13 @@ void ButtonListView::initButtonList() {
         if (bgColor.valueF() < 0.6) {
             iconsAreWhite = true;
         }
-        buttonItem->setIcon(Button::getIcon(t, iconsAreWhite));
+        buttonItem->setIcon(CaptureButton::getIcon(t, iconsAreWhite));
         buttonItem->setFlags(Qt::ItemIsUserCheckable);
         QColor foregroundColor = this->palette().color(QWidget::foregroundRole());
         buttonItem->setTextColor(foregroundColor);
 
-        buttonItem->setText(Button::getTypeName(t));
-        buttonItem->setToolTip(Button::getTypeTooltip(t));
+        buttonItem->setText(CaptureButton::getTypeName(t));
+        buttonItem->setToolTip(CaptureButton::getTypeTooltip(t));
         if (m_listButtons.contains(i)) {
             buttonItem->setCheckState(Qt::Checked);
         } else {
@@ -63,7 +63,7 @@ void ButtonListView::initButtonList() {
 }
 
 void ButtonListView::updateActiveButtons(QListWidgetItem *item) {
-    int buttonIndex = static_cast<int>(Button::getTypeByName(item->text()));
+    int buttonIndex = static_cast<int>(CaptureButton::getTypeByName(item->text()));
 
     if (item->checkState() == Qt::Checked) {
         m_listButtons.append(buttonIndex);
diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp
index 30d52e98..6f2fd4dd 100644
--- a/src/config/configwindow.cpp
+++ b/src/config/configwindow.cpp
@@ -16,7 +16,7 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "configwindow.h"
-#include "src/capture/button.h"
+#include "src/capture/capturebutton.h"
 #include "src/config/buttonlistview.h"
 #include "src/config/uicoloreditor.h"
 #include "src/config/geneneralconf.h"
diff --git a/src/config/uicoloreditor.cpp b/src/config/uicoloreditor.cpp
index 5c9cc52e..6172eefe 100644
--- a/src/config/uicoloreditor.cpp
+++ b/src/config/uicoloreditor.cpp
@@ -54,7 +54,7 @@ void UIcolorEditor::updateLocalColor(const QColor c) {
     } else {
         m_contrastColor = c;
     }
-    QString style = Button::getStyle(c);
+    QString style = CaptureButton::getStyle(c);
     m_lastButtonPressed->setStyleSheet(style);
     updateButtonIcon();
 }
@@ -77,7 +77,7 @@ void UIcolorEditor::initColorWheel() {
 
 void UIcolorEditor::initButtons() {
     const int extraSize = 10;
-    int frameSize = Button::getButtonBaseSize() + extraSize;
+    int frameSize = CaptureButton::getButtonBaseSize() + extraSize;
 
     vLayout->addWidget(new QLabel(tr("Select a Button to modify it"), this));
 
@@ -86,7 +86,7 @@ void UIcolorEditor::initButtons() {
     frame->setFrameStyle(QFrame::StyledPanel);
 
 
-    m_buttonMainColor = new Button(m_buttonIconType, frame);
+    m_buttonMainColor = new CaptureButton(m_buttonIconType, frame);
     m_buttonMainColor->move(m_buttonMainColor->x() + extraSize/2, m_buttonMainColor->y() + extraSize/2);
     QHBoxLayout *h1 = new QHBoxLayout();
     h1->addWidget(frame);
@@ -101,9 +101,9 @@ void UIcolorEditor::initButtons() {
     frame2->setFixedSize(frameSize, frameSize);
     frame2->setFrameStyle(QFrame::StyledPanel);
 
-    m_buttonContrast = new Button(m_buttonIconType, frame2);
+    m_buttonContrast = new CaptureButton(m_buttonIconType, frame2);
     m_buttonContrast->setIcon(QIcon());
-    m_buttonContrast->setStyleSheet(Button::getStyle(m_contrastColor));
+    m_buttonContrast->setStyleSheet(CaptureButton::getStyle(m_contrastColor));
     m_buttonContrast->move(m_buttonContrast->x() + extraSize/2,
                            m_buttonContrast->y() + extraSize/2);
 
@@ -118,9 +118,9 @@ void UIcolorEditor::initButtons() {
                                       " mode of the contrast color."));
 
     m_lastButtonPressed = m_buttonMainColor;
-    connect(m_buttonMainColor, &Button::pressedButton,
+    connect(m_buttonMainColor, &CaptureButton::pressedButton,
             this, &UIcolorEditor::changeLastButton);
-    connect(m_buttonContrast, &Button::pressedButton,
+    connect(m_buttonContrast, &CaptureButton::pressedButton,
             this, &UIcolorEditor::changeLastButton);
     // clicking the labels chages the button too
     connect(m_labelMain, &ClickableLabel::clicked,
@@ -130,11 +130,11 @@ void UIcolorEditor::initButtons() {
 }
 
 void UIcolorEditor::updateButtonIcon() {
-    m_lastButtonPressed->setIcon(Button::getIcon(m_buttonMainColor->getButtonType()));
+    m_lastButtonPressed->setIcon(CaptureButton::getIcon(m_buttonMainColor->getButtonType()));
 }
 
 // visual update for the selected button
-void UIcolorEditor::changeLastButton(Button *b) {
+void UIcolorEditor::changeLastButton(CaptureButton *b) {
     if (m_lastButtonPressed != b) {
         m_lastButtonPressed->setIcon(QIcon());
         m_lastButtonPressed = b;
diff --git a/src/config/uicoloreditor.h b/src/config/uicoloreditor.h
index de522091..3c4856dd 100644
--- a/src/config/uicoloreditor.h
+++ b/src/config/uicoloreditor.h
@@ -19,12 +19,12 @@
 #define UICOLORPICKER_H
 
 #include "color_wheel.hpp"
-#include "src/capture/button.h"
+#include "src/capture/capturebutton.h"
 #include <QFrame>
 
 class QVBoxLayout;
 class QHBoxLayout;
-class Button;
+class CaptureButton;
 class ClickableLabel;
 
 class UIcolorEditor : public QFrame {
@@ -36,18 +36,18 @@ private slots:
     void updateUIcolor();
     void updateLocalColor(const QColor);
     void updateButtonIcon();
-    void changeLastButton(Button *);
+    void changeLastButton(CaptureButton *);
 
 private:
     QColor m_uiColor, m_contrastColor;
-    Button *m_buttonMainColor;
+    CaptureButton *m_buttonMainColor;
     ClickableLabel *m_labelMain;
-    Button *m_buttonContrast;
+    CaptureButton *m_buttonContrast;
     ClickableLabel *m_labelContrast;
-    Button *m_lastButtonPressed;
+    CaptureButton *m_lastButtonPressed;
     color_widgets::ColorWheel *m_colorWheel;
 
-    static const Button::Type m_buttonIconType = Button::Type::circle;
+    static const CaptureButton::Type m_buttonIconType = CaptureButton::Type::circle;
 
     QHBoxLayout *hLayout;
     QVBoxLayout *vLayout;
diff --git a/src/controller.cpp b/src/controller.cpp
index 127ffcdb..2b2c433f 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -19,7 +19,7 @@
 #include "capture/capturewidget.h"
 #include "infowindow.h"
 #include "config/configwindow.h"
-#include "capture/button.h"
+#include "capture/capturebutton.h"
 #include <QAction>
 #include <QApplication>
 #include <QMenu>
@@ -41,7 +41,7 @@ Controller::Controller(QObject *parent) : QObject(parent),
     initDefaults();
     qApp->setQuitOnLastWindowClosed(false);
 
-    QString StyleSheet = Button::getStyle();
+    QString StyleSheet = CaptureButton::getStyle();
     qApp->setStyleSheet(StyleSheet);
 
 }
@@ -101,13 +101,13 @@ void Controller::initDefaults() {
         settings.setValue("contastUiColor", QColor(86, 0, 120));
 
         QList<int> buttons;
-        for (int i = 0; i < static_cast<int>(Button::Type::last); ++i) {
+        for (int i = 0; i < static_cast<int>(CaptureButton::Type::last); ++i) {
             buttons << i;
         }
         settings.setValue("buttons", QVariant::fromValue(buttons));
     } else {
         // disabled buttons cleanup
-        int higherValue = static_cast<int>(Button::Type::last) - 1;
+        int higherValue = static_cast<int>(CaptureButton::Type::last) - 1;
         QList<int> buttons = settings.value("buttons").value<QList<int> >();
 
         QMutableListIterator<int> i(buttons);

From d4e7c63cb4abde240b99a84551c6aa688f6c2a49 Mon Sep 17 00:00:00 2001
From: lupoDharkael <izhe@hotmail.es>
Date: Wed, 19 Jul 2017 09:49:24 +0200
Subject: [PATCH 4/4] Big code refactor

The design was defective and I didn't expect the popularity of the project. After these changes the code will be more mantainable and understandable.

Among the changes we can see:
- A better code structure
- Decoupled button widget from its logic
- More code reuse
- Easier way to add buttons
- Specialized classes
---
 docs/dev/qsettings.md                   |   2 +-
 flameshot.pro                           |  36 +++-
 graphics.qrc                            |   5 -
 src/capture/buttonhandler.cpp           |  26 +--
 src/capture/buttonhandler.h             |   5 +-
 src/capture/capturebutton.cpp           | 228 ++++++++----------------
 src/capture/capturebutton.h             |  77 ++++----
 src/capture/capturemodification.cpp     |  39 ++--
 src/capture/capturemodification.h       |  22 ++-
 src/capture/capturewidget.cpp           | 146 +++++++++------
 src/capture/capturewidget.h             |  10 +-
 src/capture/colorpicker.cpp             |  10 +-
 src/capture/colorpicker.h               |   2 +-
 src/capture/screenshot.cpp              | 175 +++---------------
 src/capture/screenshot.h                |  10 +-
 src/capture/tools/arrowtool.cpp         |  95 ++++++++++
 src/capture/tools/arrowtool.h           |  46 +++++
 src/capture/tools/capturetool.cpp       |  18 +-
 src/capture/tools/capturetool.h         |  58 +++++-
 src/capture/tools/circletool.cpp        |  55 ++++++
 src/capture/tools/circletool.h          |  45 +++++
 src/capture/tools/copytool.cpp          |  58 ++++++
 src/capture/tools/copytool.h            |  45 +++++
 src/capture/tools/exittool.cpp          |  57 ++++++
 src/capture/tools/exittool.h            |  45 +++++
 src/capture/tools/imguruploadertool.cpp |  57 ++++++
 src/capture/tools/imguruploadertool.h   |  45 +++++
 src/capture/tools/linetool.cpp          |  55 ++++++
 src/capture/tools/linetool.h            |  45 +++++
 src/capture/tools/markertool.cpp        |  57 ++++++
 src/capture/tools/markertool.h          |  45 +++++
 src/capture/tools/movetool.cpp          |  57 ++++++
 src/capture/tools/movetool.h            |  45 +++++
 src/capture/tools/penciltool.cpp        |  55 ++++++
 src/capture/tools/penciltool.h          |  45 +++++
 src/capture/tools/rectangletool.cpp     |  57 ++++++
 src/capture/tools/rectangletool.h       |  45 +++++
 src/capture/tools/savetool.cpp          |  57 ++++++
 src/capture/tools/savetool.h            |  45 +++++
 src/capture/tools/selectiontool.cpp     |  55 ++++++
 src/capture/tools/selectiontool.h       |  45 +++++
 src/capture/tools/sizeindicatortool.cpp |  56 ++++++
 src/capture/tools/sizeindicatortool.h   |  45 +++++
 src/capture/tools/toolfactory.cpp       |  92 ++++++++++
 src/capture/tools/toolfactory.h         |  48 +++++
 src/capture/tools/undotool.cpp          |  57 ++++++
 src/capture/tools/undotool.h            |  45 +++++
 src/config/buttonlistview.cpp           |  44 +++--
 src/config/buttonlistview.h             |   4 +-
 src/config/clickablelabel.cpp           |  18 +-
 src/config/clickablelabel.h             |  19 +-
 src/config/configwindow.h               |   2 +-
 src/config/filenameeditor.cpp           |   3 +-
 src/config/geneneralconf.cpp            |  32 +++-
 src/config/geneneralconf.h              |  19 +-
 src/config/strftimechooserwidget.cpp    |  17 ++
 src/config/strftimechooserwidget.h      |  17 ++
 src/config/uicoloreditor.cpp            |  26 ++-
 src/config/uicoloreditor.h              |   5 +-
 src/controller.cpp                      |  43 ++---
 src/controller.h                        |   4 +-
 src/flameshotdbusadapter.cpp            |   4 +-
 src/flameshotdbusadapter.h              |   2 +-
 src/infowindow.h                        |   2 +-
 src/main.cpp                            |   1 -
 src/utils/confighandler.cpp             | 149 ++++++++++++++++
 src/utils/confighandler.h               |  75 ++++++++
 src/utils/filenamehandler.cpp           |  45 ++++-
 src/utils/filenamehandler.h             |   2 +-
 69 files changed, 2436 insertions(+), 565 deletions(-)
 create mode 100644 src/capture/tools/arrowtool.cpp
 create mode 100644 src/capture/tools/arrowtool.h
 create mode 100644 src/capture/tools/circletool.cpp
 create mode 100644 src/capture/tools/circletool.h
 create mode 100644 src/capture/tools/copytool.cpp
 create mode 100644 src/capture/tools/copytool.h
 create mode 100644 src/capture/tools/exittool.cpp
 create mode 100644 src/capture/tools/exittool.h
 create mode 100644 src/capture/tools/imguruploadertool.cpp
 create mode 100644 src/capture/tools/imguruploadertool.h
 create mode 100644 src/capture/tools/linetool.cpp
 create mode 100644 src/capture/tools/linetool.h
 create mode 100644 src/capture/tools/markertool.cpp
 create mode 100644 src/capture/tools/markertool.h
 create mode 100644 src/capture/tools/movetool.cpp
 create mode 100644 src/capture/tools/movetool.h
 create mode 100644 src/capture/tools/penciltool.cpp
 create mode 100644 src/capture/tools/penciltool.h
 create mode 100644 src/capture/tools/rectangletool.cpp
 create mode 100644 src/capture/tools/rectangletool.h
 create mode 100644 src/capture/tools/savetool.cpp
 create mode 100644 src/capture/tools/savetool.h
 create mode 100644 src/capture/tools/selectiontool.cpp
 create mode 100644 src/capture/tools/selectiontool.h
 create mode 100644 src/capture/tools/sizeindicatortool.cpp
 create mode 100644 src/capture/tools/sizeindicatortool.h
 create mode 100644 src/capture/tools/toolfactory.cpp
 create mode 100644 src/capture/tools/toolfactory.h
 create mode 100644 src/capture/tools/undotool.cpp
 create mode 100644 src/capture/tools/undotool.h
 create mode 100644 src/utils/confighandler.cpp
 create mode 100644 src/utils/confighandler.h

diff --git a/docs/dev/qsettings.md b/docs/dev/qsettings.md
index 50b89a6f..0a63aa85 100644
--- a/docs/dev/qsettings.md
+++ b/docs/dev/qsettings.md
@@ -22,7 +22,7 @@
     - value: "showHelp"
     - type: bool
     - description: show Help messages in capture mode.
-- show Help message
+- show desktop notifications
     - value: "showDesktopNotification"
     - type: bool
     - description: show every desktop notification.
diff --git a/flameshot.pro b/flameshot.pro
index 3638eddf..120ef8e1 100644
--- a/flameshot.pro
+++ b/flameshot.pro
@@ -53,7 +53,23 @@ SOURCES += src/main.cpp\
     src/utils/filenamehandler.cpp \
     src/config/strftimechooserwidget.cpp \
     src/capture/tools/capturetool.cpp \
-    src/capture/capturebutton.cpp
+    src/capture/capturebutton.cpp \
+    src/capture/tools/penciltool.cpp \
+    src/capture/tools/undotool.cpp \
+    src/capture/tools/arrowtool.cpp \
+    src/capture/tools/circletool.cpp \
+    src/capture/tools/copytool.cpp \
+    src/capture/tools/exittool.cpp \
+    src/capture/tools/imguruploadertool.cpp \
+    src/capture/tools/linetool.cpp \
+    src/capture/tools/markertool.cpp \
+    src/capture/tools/movetool.cpp \
+    src/capture/tools/rectangletool.cpp \
+    src/capture/tools/savetool.cpp \
+    src/capture/tools/selectiontool.cpp \
+    src/capture/tools/sizeindicatortool.cpp \
+    src/capture/tools/toolfactory.cpp \
+    src/utils/confighandler.cpp
 
 HEADERS  += \
     src/controller.h \
@@ -73,7 +89,23 @@ HEADERS  += \
     src/utils/filenamehandler.h \
     src/config/strftimechooserwidget.h \
     src/capture/tools/capturetool.h \
-    src/capture/capturebutton.h
+    src/capture/capturebutton.h \
+    src/capture/tools/penciltool.h \
+    src/capture/tools/undotool.h \
+    src/capture/tools/arrowtool.h \
+    src/capture/tools/circletool.h \
+    src/capture/tools/copytool.h \
+    src/capture/tools/exittool.h \
+    src/capture/tools/imguruploadertool.h \
+    src/capture/tools/linetool.h \
+    src/capture/tools/markertool.h \
+    src/capture/tools/movetool.h \
+    src/capture/tools/rectangletool.h \
+    src/capture/tools/savetool.h \
+    src/capture/tools/selectiontool.h \
+    src/capture/tools/sizeindicatortool.h \
+    src/capture/tools/toolfactory.h \
+    src/utils/confighandler.h
 
 RESOURCES += \
     graphics.qrc
diff --git a/graphics.qrc b/graphics.qrc
index fd61ec50..b1c54d7f 100644
--- a/graphics.qrc
+++ b/graphics.qrc
@@ -8,11 +8,8 @@
         <file>img/buttonIconsBlack/content-copy.png</file>
         <file>img/buttonIconsBlack/content-save.png</file>
         <file>img/buttonIconsBlack/exit-to-app.png</file>
-        <file>img/buttonIconsBlack/format-text.png</file>
         <file>img/buttonIconsBlack/line.png</file>
         <file>img/buttonIconsBlack/marker.png</file>
-        <file>img/buttonIconsBlack/mouse.png</file>
-        <file>img/buttonIconsBlack/mouse-off.png</file>
         <file>img/buttonIconsBlack/pencil.png</file>
         <file>img/buttonIconsBlack/square-outline.png</file>
         <file>img/buttonIconsBlack/undo-variant.png</file>
@@ -28,8 +25,6 @@
         <file>img/buttonIconsWhite/format-text.png</file>
         <file>img/buttonIconsWhite/line.png</file>
         <file>img/buttonIconsWhite/marker.png</file>
-        <file>img/buttonIconsWhite/mouse-off.png</file>
-        <file>img/buttonIconsWhite/mouse.png</file>
         <file>img/buttonIconsWhite/pencil.png</file>
         <file>img/buttonIconsBlack/cursor-move.png</file>
         <file>img/buttonIconsWhite/cursor-move.png</file>
diff --git a/src/capture/buttonhandler.cpp b/src/capture/buttonhandler.cpp
index 9fe31f60..b42e855c 100644
--- a/src/capture/buttonhandler.cpp
+++ b/src/capture/buttonhandler.cpp
@@ -29,7 +29,8 @@ ButtonHandler::ButtonHandler(const QVector<CaptureButton*> &v, QObject *parent)
     QObject(parent)
 {
     if (!v.isEmpty()) {
-        m_distance = v[0]->getButtonBaseSize() + SEPARATION;
+        m_buttonBaseSize = v[0]->getButtonBaseSize();
+        m_distance = m_buttonBaseSize + SEPARATION;
         m_vectorButtons = v;
     }
 }
@@ -68,8 +69,8 @@ void ButtonHandler::updatePosition(const QRect &selection,
         return;
     }
     // button dimmensions
-    const int baseHeight = CaptureButton::getButtonBaseSize();
-    const int baseWidth = CaptureButton::getButtonBaseSize();
+    const int baseHeight = m_buttonBaseSize;
+    const int baseWidth = m_buttonBaseSize;
     // copy of the selection area for internal modifications
     QRect baseArea = selection;
 
@@ -218,7 +219,7 @@ void ButtonHandler::updatePosition(const QRect &selection,
             if (vecLength - elemIndicator < buttonsPerCol) {
                 addCounter = vecLength - elemIndicator;
             }
-            QPoint center = QPoint(baseArea.left() - (SEPARATION+baseWidth),
+            QPoint center = QPoint(baseArea.left() - (SEPARATION + baseWidth),
                                    baseArea.center().y());
             QVector<QPoint> positions = getVPoints(center, addCounter, true);
             for (QPoint p: positions) {
@@ -231,9 +232,9 @@ void ButtonHandler::updatePosition(const QRect &selection,
                 !(blockedBotton && horizontalBlocked && blockedTop)) {
 
             if (blockedRight && !blockedLeft) {
-                baseArea.setX(baseArea.x() - (baseWidth+SEPARATION));
+                baseArea.setX(baseArea.x() - (baseWidth + SEPARATION));
             } else if (!blockedRight && !blockedLeft) {
-                baseArea.setX(baseArea.x() - (baseWidth+SEPARATION));
+                baseArea.setX(baseArea.x() - (baseWidth + SEPARATION));
                 baseArea.setWidth(baseArea.width() + (baseWidth + SEPARATION));
             } else {
                 baseArea.setWidth(baseArea.width() + (baseWidth + SEPARATION));
@@ -242,7 +243,7 @@ void ButtonHandler::updatePosition(const QRect &selection,
             if (blockedBotton && !blockedTop) {
                 baseArea.setY(baseArea.y() - (baseHeight + SEPARATION));
             } else if (!blockedTop && !blockedBotton) {
-                baseArea.setY(baseArea.y() - (baseHeight+SEPARATION));
+                baseArea.setY(baseArea.y() - (baseHeight + SEPARATION));
                 baseArea.setHeight(baseArea.height() + (baseHeight + SEPARATION));
             } else {
                 baseArea.setHeight(baseArea.height() + (baseHeight + SEPARATION));
@@ -263,9 +264,9 @@ QVector<QPoint> ButtonHandler::getHPoints(
     if (elements % 2 == 0) {
         shift = m_distance * (elements / 2) - (SEPARATION / 2);
     } else {
-        shift = m_distance * ((elements-1) / 2) + CaptureButton::getButtonBaseSize() / 2;
+        shift = m_distance * ((elements-1) / 2) + m_buttonBaseSize / 2;
     }
-    if (!leftToRight) { shift -= CaptureButton::getButtonBaseSize(); }
+    if (!leftToRight) { shift -= m_buttonBaseSize; }
     int x = leftToRight ? center.x() - shift :
                           center.x() + shift;
     QPoint i(x, center.y());
@@ -289,9 +290,9 @@ QVector<QPoint> ButtonHandler::getVPoints(
     if (elements % 2 == 0) {
         shift = m_distance * (elements / 2) - (SEPARATION / 2);
     } else {
-        shift = m_distance * ((elements-1) / 2) + CaptureButton::getButtonBaseSize() / 2;
+        shift = m_distance * ((elements-1) / 2) + m_buttonBaseSize / 2;
     }
-    if (!upToDown) { shift -= CaptureButton::getButtonBaseSize(); }
+    if (!upToDown) { shift -= m_buttonBaseSize; }
     int y = upToDown ? center.y() - shift :
                        center.y() + shift;
     QPoint i(center.x(), y);
@@ -307,6 +308,7 @@ void ButtonHandler::setButtons(const QVector<CaptureButton *> v) {
     for (CaptureButton *b: m_vectorButtons) delete(b);
     m_vectorButtons = v;
     if (!v.isEmpty()) {
-        m_distance = v[0]->getButtonBaseSize() + SEPARATION;
+        m_buttonBaseSize = v[0]->getButtonBaseSize();
+        m_distance = m_buttonBaseSize + SEPARATION;
     }
 }
diff --git a/src/capture/buttonhandler.h b/src/capture/buttonhandler.h
index 5dc8dd33..b2467ac5 100644
--- a/src/capture/buttonhandler.h
+++ b/src/capture/buttonhandler.h
@@ -29,8 +29,8 @@ class QPoint;
 class ButtonHandler : public QObject {
     Q_OBJECT
 public:
-    ButtonHandler(const QVector<CaptureButton*>&, QObject *parent = 0);
-    ButtonHandler(QObject *parent = 0);
+    ButtonHandler(const QVector<CaptureButton*>&, QObject *parent = nullptr);
+    ButtonHandler(QObject *parent = nullptr);
 
     void hide();
     void show();
@@ -49,6 +49,7 @@ private:
     QVector<CaptureButton*> m_vectorButtons;
 
     int m_distance;
+    int m_buttonBaseSize;
 };
 
 #endif // BUTTONHANDLER_H
diff --git a/src/capture/capturebutton.cpp b/src/capture/capturebutton.cpp
index fc06520c..3d081d8f 100644
--- a/src/capture/capturebutton.cpp
+++ b/src/capture/capturebutton.cpp
@@ -17,10 +17,12 @@
 
 #include "capturebutton.h"
 #include "src/capture/capturewidget.h"
+#include "src/utils/confighandler.h"
+#include "src/capture/tools/capturetool.h"
+#include "src/capture/tools/toolfactory.h"
 #include <QIcon>
 #include <QPropertyAnimation>
 #include <QToolTip>
-#include <QSettings>
 #include <QMouseEvent>
 
 // Button represents a single button of the capture widget, it can enable
@@ -30,39 +32,28 @@ namespace {
     const int BUTTON_SIZE = 30;
 }
 
-CaptureButton::CaptureButton(const Type t, QWidget *parent) : QPushButton(parent),
+CaptureButton::CaptureButton(const ButtonType t, QWidget *parent) : QPushButton(parent),
     m_buttonType(t), m_pressed(false)
 {
     initButton();
-
-    if (t == CaptureButton::Type::selectionIndicator) {
+    if (t == TYPE_SELECTIONINDICATOR) {
         QFont f = this->font();
         setFont(QFont(f.family(), 7, QFont::Bold));
     } else {
-        setIcon(getIcon(t));
-    }
-}
-
-CaptureButton::CaptureButton(const CaptureButton::Type t, const bool isWhite, QWidget *parent)
-    : QPushButton(parent), m_buttonType(t), m_pressed(false)
-{
-    initButton();
-
-    if (t == CaptureButton::Type::selectionIndicator) {
-        QFont f = this->font();
-        setFont(QFont(f.family(), 7, QFont::Bold));
-    } else {
-        setIcon(getIcon(t, isWhite));
+        setIcon(getIcon());
     }
 }
 
 void CaptureButton::initButton() {
+    m_tool = ToolFactory().CreateTool(m_buttonType, this);
+    connect(this, &CaptureButton::pressed, m_tool, &CaptureTool::onPressed);
+
     setFocusPolicy(Qt::NoFocus);
     resize(BUTTON_SIZE, BUTTON_SIZE);
     setMouseTracking(true);
     setMask(QRegion(QRect(-1,-1,BUTTON_SIZE+2, BUTTON_SIZE+2), QRegion::Ellipse));
 
-    setToolTip(getTypeTooltip(m_buttonType));
+    setToolTip(m_tool->getDescription());
 
     emergeAnimation = new  QPropertyAnimation(this, "size", this);
     emergeAnimation->setEasingCurve(QEasingCurve::InOutQuad);
@@ -71,91 +62,55 @@ void CaptureButton::initButton() {
     emergeAnimation->setEndValue(QSize(BUTTON_SIZE, BUTTON_SIZE));
 }
 
-// getIcon returns the icon for the type of button, this method lets
-// you choose between black or white icons (needed for the config menu)
-QIcon CaptureButton::getIcon(const Type t, bool isWhite) {
-    QString iconColor = "Black";
-    if (isWhite) {
-        iconColor = "White";
-    }
-    QString path = ":/img/buttonIcons" + iconColor + "/";
-
-    switch (t) {
-    case Type::arrow:
-        path += "arrow-bottom-left.png";
-        break;
-    case Type::circle:
-        path += "circle-outline.png";
-        break;
-    case Type::copy:
-        path += "content-copy.png";
-        break;
-    case Type::exit:
-        path += "close.png";
-        break;
-    case Type::imageUploader:
-        path += "cloud-upload.png";
-        break;
-    case Type::line:
-        path += "line.png";
-        break;
-    case Type::marker:
-        path += "marker.png";
-        break;
-    case Type::pencil:
-        path += "pencil.png";
-        break;
-    case Type::selection:
-        path += "square-outline.png";
-        break;
-    case Type::save:
-        path += "content-save.png";
-        break;
-    case Type::undo:
-        path += "undo-variant.png";
-        break;
-    case Type::move:
-        path += "cursor-move.png";
-        break;
-    case Type::rectangle:
-        path += "square.png";
-        break;
-    default:
-        break;
-    }
-    return QIcon(path);
+QVector<CaptureButton::ButtonType> CaptureButton::getIterableButtonTypes() {
+    return iterableButtonTypes;
 }
 
-QString CaptureButton::getStyle() {
-    QSettings settings;
-    m_mainColor = settings.value("uiColor").value<QColor>();
-    return getStyle(m_mainColor);
-}
-
-QString CaptureButton::getStyle(const QColor &mainColor) {
-    m_mainColor = mainColor;
-    QString baseSheet = "Button { border-radius: %3;"
+QString CaptureButton::getGlobalStyleSheet() {
+    QColor mainColor = ConfigHandler().getUIMainColor();
+    QString baseSheet = "CaptureButton { border-radius: %3;"
                         "background-color: %1; color: %4 }"
-                        "Button:hover { background-color: %2; }"
-                        "Button:pressed:!hover { "
+                        "CaptureButton:hover { background-color: %2; }"
+                        "CaptureButton:pressed:!hover { "
                         "background-color: %1; }";
-
     // define color when mouse is hovering
     QColor contrast(mainColor.darker(120));
     if (mainColor.value() < m_colorValueLimit ||
             mainColor.saturation() > m_colorSaturationLimit) {
         contrast = mainColor.lighter(140);
     }
-
     // foreground color
-    QString color = iconIsWhite(mainColor) ? "white" : "black";
+    QString color = iconIsWhiteByColor(mainColor) ? "white" : "black";
 
     return baseSheet.arg(mainColor.name()).arg(contrast.name())
             .arg(BUTTON_SIZE/2).arg(color);
 }
+
+QString CaptureButton::getStyleSheet() const {
+    QString baseSheet = "CaptureButton { border-radius: %3;"
+                        "background-color: %1; color: %4 }"
+                        "CaptureButton:hover { background-color: %2; }"
+                        "CaptureButton:pressed:!hover { "
+                        "background-color: %1; }";
+    // define color when mouse is hovering
+    QColor contrast(m_mainColor.darker(120));
+    if (m_mainColor.value() < m_colorValueLimit ||
+            m_mainColor.saturation() > m_colorSaturationLimit) {
+        contrast = m_mainColor.lighter(140);
+    }
+    // foreground color
+    QString color = iconIsWhiteByColor(m_mainColor) ? "white" : "black";
+
+    return baseSheet.arg(m_mainColor.name()).arg(contrast.name())
+            .arg(BUTTON_SIZE/2).arg(color);
+}
+
 // get icon returns the icon for the type of button
-QIcon CaptureButton::getIcon(const Type t) {
-    return getIcon(t, iconIsWhite(m_mainColor));
+QIcon CaptureButton::getIcon() const {
+    QString color(iconIsWhiteByColor(m_mainColor) ? "White" : "Black");
+    QString iconPath = QString(":/img/buttonIcons%1/%2")
+            .arg(color).arg(m_tool->getIconName());
+    return QIcon(iconPath);
 }
 
 void CaptureButton::enterEvent(QEvent *e) {
@@ -180,6 +135,7 @@ void CaptureButton::mouseReleaseEvent(QMouseEvent *e) {
 
 void CaptureButton::mousePressEvent(QMouseEvent *) {
     m_pressed = true;
+    Q_EMIT pressed();
 }
 
 void CaptureButton::animatedShow() {
@@ -187,20 +143,26 @@ void CaptureButton::animatedShow() {
     emergeAnimation->start();
 }
 
-CaptureButton::Type CaptureButton::getButtonType() const {
+CaptureButton::ButtonType CaptureButton::getButtonType() const {
     return m_buttonType;
 }
 
-void CaptureButton::updateIconColor(const QColor &c) {
-    setIcon(getIcon(m_buttonType, iconIsWhite(c)));
+CaptureTool *CaptureButton::getTool() const {
+    return m_tool;
 }
 
-void CaptureButton::updateIconColor() {
-    setIcon(getIcon(m_buttonType, iconIsWhite()));
+void CaptureButton::setColor(const QColor &c) {
+    m_mainColor = c;
+    setStyleSheet(getStyleSheet());
+    setIcon(getIcon());
 }
-// iconIsWhite returns true if the passed color would contain a white icon
-// if applied to a button, and false otherwise
-bool CaptureButton::iconIsWhite(const QColor &c) {
+
+// getButtonBaseSize returns the base size of the buttons
+size_t CaptureButton::getButtonBaseSize() {
+    return BUTTON_SIZE;
+}
+
+bool CaptureButton::iconIsWhiteByColor(const QColor &c) {
     bool isWhite = false;
     if (c.value() < m_colorValueLimit ||
             c.saturation() > m_colorSaturationLimit) {
@@ -209,63 +171,21 @@ bool CaptureButton::iconIsWhite(const QColor &c) {
     return isWhite;
 }
 
-bool CaptureButton::iconIsWhite() const {
-    return iconIsWhite(m_mainColor);
-}
-// getButtonBaseSize returns the base size of the buttons
-size_t CaptureButton::getButtonBaseSize() {
-    return BUTTON_SIZE;
-}
-// getTypeByName receives a name and return the corresponding button type.
-// returns Button::Type::last when the corresponding button is not found.
-CaptureButton::Type CaptureButton::getTypeByName(const QString s) {
-    CaptureButton::Type res = Type::last;
-    for (auto i: typeName.toStdMap())
-        if (tr(i.second) == s)
-            res = i.first;
-    return res;
-}
+QColor CaptureButton::m_mainColor = ConfigHandler().getUIMainColor();
 
-QString CaptureButton::getTypeName(const CaptureButton::Type t) {
-    return tr(typeName[t]);
-}
-
-QString CaptureButton::getTypeTooltip(const CaptureButton::Type t) {
-    return tr(typeTooltip[t]);
-}
-
-CaptureButton::typeData CaptureButton::typeTooltip = {
-        {CaptureButton::Type::selectionIndicator, QT_TR_NOOP("Shows the dimensions of the selection (X Y)")},
-        {CaptureButton::Type::exit, QT_TR_NOOP("Leaves the capture screen")},
-        {CaptureButton::Type::copy, QT_TR_NOOP("Copies the selecion into the clipboard")},
-        {CaptureButton::Type::save, QT_TR_NOOP("Opens the save image window")},
-        {CaptureButton::Type::pencil, QT_TR_NOOP("Sets the Pencil as the paint tool")},
-        {CaptureButton::Type::line, QT_TR_NOOP("Sets the Line as the paint tool")},
-        {CaptureButton::Type::arrow, QT_TR_NOOP("Sets the Arrow as the paint tool")},
-        {CaptureButton::Type::rectangle, QT_TR_NOOP("Sets the Rectangle as the paint tool")},
-        {CaptureButton::Type::circle, QT_TR_NOOP("Sets the Circle as the paint tool")},
-        {CaptureButton::Type::marker, QT_TR_NOOP("Sets the Marker as the paint tool")},
-        {CaptureButton::Type::undo, QT_TR_NOOP("Undo the last modification")},
-        {CaptureButton::Type::imageUploader, QT_TR_NOOP("Uploads the selection to Imgur")},
-        {CaptureButton::Type::selection, QT_TR_NOOP("Sets the Selection as the paint tool")},
-        {CaptureButton::Type::move, QT_TR_NOOP("Move the selection area")}
+QVector<CaptureButton::ButtonType> CaptureButton::iterableButtonTypes = {
+    CaptureButton::TYPE_PENCIL,
+    CaptureButton::TYPE_LINE,
+    CaptureButton::TYPE_ARROW,
+    CaptureButton::TYPE_SELECTION,
+    CaptureButton::TYPE_RECTANGLE,
+    CaptureButton::TYPE_CIRCLE,
+    CaptureButton::TYPE_MARKER,
+    CaptureButton::TYPE_SELECTIONINDICATOR,
+    CaptureButton::TYPE_MOVESELECTION,
+    CaptureButton::TYPE_UNDO,
+    CaptureButton::TYPE_COPY,
+    CaptureButton::TYPE_SAVE,
+    CaptureButton::TYPE_EXIT,
+    CaptureButton::TYPE_IMAGEUPLOADER,
 };
-
-CaptureButton::typeData CaptureButton::typeName = {
-    {CaptureButton::Type::selectionIndicator, QT_TR_NOOP("Selection Size Indicator")},
-    {CaptureButton::Type::exit, QT_TR_NOOP("Exit")},
-    {CaptureButton::Type::copy, QT_TR_NOOP("Copy")},
-    {CaptureButton::Type::save, QT_TR_NOOP("Save")},
-    {CaptureButton::Type::pencil, QT_TR_NOOP("Pencil")},
-    {CaptureButton::Type::line, QT_TR_NOOP("Line")},
-    {CaptureButton::Type::arrow, QT_TR_NOOP("Arrow")},
-    {CaptureButton::Type::rectangle, QT_TR_NOOP("Rectangle")},
-    {CaptureButton::Type::circle, QT_TR_NOOP("Circle")},
-    {CaptureButton::Type::marker, QT_TR_NOOP("Marker")},
-    {CaptureButton::Type::undo, QT_TR_NOOP("Undo")},
-    {CaptureButton::Type::imageUploader, QT_TR_NOOP("Image Uploader")},
-    {CaptureButton::Type::selection, QT_TR_NOOP("Rectangular Selection")},
-    {CaptureButton::Type::move, QT_TR_NOOP("Move")}
-};
-
-QColor CaptureButton::m_mainColor = QSettings().value("uiColor").value<QColor>();
diff --git a/src/capture/capturebutton.h b/src/capture/capturebutton.h
index f165c605..6f964f0b 100644
--- a/src/capture/capturebutton.h
+++ b/src/capture/capturebutton.h
@@ -20,53 +20,52 @@
 
 #include <QPushButton>
 #include <QMap>
+#include <QVector>
 
 class QWidget;
 class QPropertyAnimation;
+class CaptureTool;
 
 class CaptureButton : public QPushButton {
     Q_OBJECT
-    Q_ENUMS(Type)
+    Q_ENUMS(ButtonType)
 
 public:
-    enum class Type {
-        pencil,
-        line,
-        arrow,
-        selection,
-        rectangle,
-        circle,
-        marker,
-        selectionIndicator,
-        move,
-        undo,
-        copy,
-        save,
-        exit,
-        imageUploader,
-        last, // used for iteration over the enum
+    // Don't forget to add the new types to CaptureButton::iterableButtonTypes
+    // in the .cpp
+    enum ButtonType {
+        TYPE_PENCIL,
+        TYPE_LINE,
+        TYPE_ARROW,
+        TYPE_SELECTION,
+        TYPE_RECTANGLE,
+        TYPE_CIRCLE,
+        TYPE_MARKER,
+        TYPE_SELECTIONINDICATOR,
+        TYPE_MOVESELECTION,
+        TYPE_UNDO,
+        TYPE_COPY,
+        TYPE_SAVE,
+        TYPE_EXIT,
+        TYPE_IMAGEUPLOADER,
     };
 
-    explicit CaptureButton(const Type, QWidget *parent = 0);
-    explicit CaptureButton(const Type, const bool isWhite, QWidget *parent = 0);
+    CaptureButton() = delete;
+    explicit CaptureButton(const ButtonType, QWidget *parent = nullptr);
 
-    static QIcon getIcon(const Type);
-    static QIcon getIcon(const Type, bool isWhite);
-    static QString getStyle();
-    static QString getStyle(const QColor &);
     static size_t getButtonBaseSize();
-    static CaptureButton::Type getTypeByName(const QString);
-    static QString getTypeName(const CaptureButton::Type);
-    static QString getTypeTooltip(const CaptureButton::Type);
+    static bool iconIsWhiteByColor(const QColor &);
+    static QString getGlobalStyleSheet();
+    static QVector<CaptureButton::ButtonType> getIterableButtonTypes();
 
-    Type getButtonType() const;
-
-    void updateIconColor(const QColor &);
-    void updateIconColor();
-
-    bool iconIsWhite() const;
-    static bool iconIsWhite(const QColor &);
+    QString getName() const;
+    QString getDescription() const;
+    QIcon getIcon() const;
+    QString getStyleSheet() const;
+    ButtonType getButtonType() const;
+    CaptureTool* getTool() const;
 
+    void setColor(const QColor &c);
     void animatedShow();
 
 protected:
@@ -74,6 +73,9 @@ protected:
     virtual void leaveEvent(QEvent *);
     virtual void mouseReleaseEvent(QMouseEvent *);
     virtual void mousePressEvent(QMouseEvent *);
+    static QVector<ButtonType> iterableButtonTypes;
+
+    CaptureTool *m_tool;
 
 signals:
     void hovered();
@@ -82,19 +84,16 @@ signals:
 
 private:
     CaptureButton(QWidget *parent = 0);
-    const Type m_buttonType;
+    ButtonType m_buttonType;
+    bool m_pressed;
+
     static const int m_colorValueLimit = 166;
     static const int m_colorSaturationLimit = 110;
-    bool m_pressed;
 
     QPropertyAnimation *emergeAnimation;
 
-    typedef QMap<CaptureButton::Type, const char *> typeData;
-    static typeData typeTooltip;
-    static typeData typeName;
     static QColor m_mainColor;
 
-
     void initButton();
 };
 
diff --git a/src/capture/capturemodification.cpp b/src/capture/capturemodification.cpp
index 04ae7a32..48f0815d 100644
--- a/src/capture/capturemodification.cpp
+++ b/src/capture/capturemodification.cpp
@@ -15,31 +15,32 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
+//#include "src/capture/tools/capturetool.h"
 #include "capturemodification.h"
+#include "src/capture/tools/toolfactory.h"
+#include "src/capture/tools/capturetool.h"
 #include <QColor>
 
 // CaptureModification is a single modification in the screenshot drawn
 // by the user.
 
-CaptureModification::CaptureModification(const CaptureButton::Type t, const QPoint p,
-                                         const QColor c) : m_color(c), m_type(t)
+CaptureModification::CaptureModification(
+        const CaptureButton::ButtonType t,
+        const QPoint &p,
+        const QColor &c,
+        QObject *parent) :
+    QObject(parent),
+    m_color(c),
+    m_type(t)
 {
+    m_tool = ToolFactory().CreateTool(t, this);
     m_coords.append(p);
-    if (m_type == CaptureButton::Type::circle
-            || m_type == CaptureButton::Type::rectangle
-            || m_type == CaptureButton::Type::arrow
-            || m_type == CaptureButton::Type::line
-            || m_type == CaptureButton::Type::marker
-            || m_type == CaptureButton::Type::selection) {
+    if (m_tool->isSelectable()) {
         m_coords.append(p);
     }
 }
 
-CaptureModification::CaptureModification() {
-
-}
-
-CaptureButton::Type CaptureModification::getType() const {
+CaptureButton::ButtonType CaptureModification::getType() const {
     return m_type;
 }
 
@@ -50,14 +51,14 @@ QColor CaptureModification::getColor() const {
 QVector<QPoint> CaptureModification::getPoints() const {
     return m_coords;
 }
+
+CaptureTool* CaptureModification::getTool() const{
+    return m_tool;
+}
+
 // addPoint adds a point to the vector of points
 void CaptureModification::addPoint(const QPoint p) {
-    if (m_type == CaptureButton::Type::circle
-            || m_type == CaptureButton::Type::rectangle
-            || m_type == CaptureButton::Type::arrow
-            || m_type == CaptureButton::Type::line
-            || m_type == CaptureButton::Type::marker
-            || m_type == CaptureButton::Type::selection) {
+    if(m_tool->getToolType() == CaptureTool::TYPE_LINE_DRAWER) {
         m_coords[1] = p;
     } else {
         m_coords.append(p);
diff --git a/src/capture/capturemodification.h b/src/capture/capturemodification.h
index 7aa69194..6444ee94 100644
--- a/src/capture/capturemodification.h
+++ b/src/capture/capturemodification.h
@@ -19,25 +19,35 @@
 #define CAPTURECHANGE_H
 
 #include "capturebutton.h"
+#include <QObject>
 #include <QVector>
 
+class CaptureButton;
 class QPoint;
 
-class CaptureModification {
+class CaptureModification : public QObject {
+    Q_OBJECT
 public:
-    CaptureModification();
-    CaptureModification(const CaptureButton::Type, const QPoint, const QColor);
-    CaptureButton::Type getType() const;
+    CaptureModification(QObject *parent = nullptr) = delete;
+    CaptureModification(
+            const CaptureButton::ButtonType,
+            const QPoint &,
+            const QColor &,
+            QObject *parent = nullptr
+            );
     QColor getColor() const;
     QVector<QPoint> getPoints() const;
+    CaptureTool* getTool() const;
+    CaptureButton::ButtonType getType() const;
     void addPoint(const QPoint);
 
 protected:
     QColor m_color;
-    CaptureButton::Type m_type;
+    CaptureButton::ButtonType m_type;
+    QVector<QPoint> m_coords;
+    CaptureTool *m_tool;
 
 private:
-    QVector<QPoint> m_coords;
 
 };
 
diff --git a/src/capture/capturewidget.cpp b/src/capture/capturewidget.cpp
index 2f044401..a7a1c0c1 100644
--- a/src/capture/capturewidget.cpp
+++ b/src/capture/capturewidget.cpp
@@ -26,6 +26,7 @@
 #include "capturewidget.h"
 #include "capturebutton.h"
 #include "src/capture/colorpicker.h"
+#include <src/utils/confighandler.h>
 #include <QScreen>
 #include <QWindow>
 #include <QGuiApplication>
@@ -35,11 +36,9 @@
 #include <QPaintEvent>
 #include <QMouseEvent>
 #include <QClipboard>
-#include <QSettings>
 #include <QNetworkReply>
 #include <QMessageBox>
 #include <QDesktopServices>
-#include <QDebug>
 
 // CaptureWidget is the main component used to capture the screen. It contains an
 // are of selection with its respective buttons.
@@ -55,9 +54,9 @@ CaptureWidget::CaptureWidget(bool enableSaveWindow, QWidget *parent) :
     QWidget(parent), m_mouseOverHandle(0), m_mouseIsClicked(false),
     m_rightClick(false), m_newSelection(false), m_grabbing(false),
     m_onButton(false), m_enableSaveWindow(enableSaveWindow),
-    m_state(CaptureButton::Type::move)
+    m_state(CaptureButton::TYPE_MOVESELECTION)
 {
-    m_showInitialMsg = QSettings().value("showHelp").toBool();
+    m_showInitialMsg = ConfigHandler().getShowHelp();
 
     setAttribute(Qt::WA_DeleteOnClose);
     // create selection handlers
@@ -102,27 +101,25 @@ CaptureWidget::~CaptureWidget() {
 // redefineButtons retrieves the buttons configured to be shown with the
 // selection in the capture
 void CaptureWidget::updateButtons() {
-    QSettings settings;
-    m_uiColor = settings.value("uiColor").value<QColor>();
-    m_contrastUiColor = settings.value("contastUiColor").value<QColor>();
+    ConfigHandler config;
+    m_uiColor = config.getUIMainColor();
+    m_contrastUiColor = config.getUIContrastColor();
 
-    auto buttonsInt = settings.value("buttons").value<QList<int> >();
+    auto buttons = config.getButtons();
     QVector<CaptureButton*> vectorButtons;
 
-    bool iconIsWhite = CaptureButton::iconIsWhite(m_uiColor);
-    QString buttonStyle = CaptureButton::getStyle(m_uiColor);
-
-    for (auto i: buttonsInt) {
-        auto t = static_cast<CaptureButton::Type>(i);
-        CaptureButton *b = new CaptureButton(t, iconIsWhite, this);
-        if (t == CaptureButton::Type::selectionIndicator) {
+    for (auto t: buttons) {
+        CaptureButton *b = new CaptureButton(t, this);
+        if (t == CaptureButton::TYPE_SELECTIONINDICATOR) {
             m_sizeIndButton = b;
         }
-        b->setStyleSheet(buttonStyle);
+        b->setColor(m_uiColor);
 
         connect(b, &CaptureButton::hovered, this, &CaptureWidget::enterButton);
         connect(b, &CaptureButton::mouseExited, this, &CaptureWidget::leaveButton);
         connect(b, &CaptureButton::pressedButton, this, &CaptureWidget::setState);
+        connect(b->getTool(), &CaptureTool::requestAction,
+                this, &CaptureWidget::handleButtonSignal);
         vectorButtons << b;
     }
     m_buttonHandler->setButtons(vectorButtons);
@@ -138,7 +135,7 @@ void CaptureWidget::paintEvent(QPaintEvent *) {
     // if we are creating a new modification to the screenshot we just draw
     // a temporal modification without antialiasing in the pencil tool for
     // performance. When we are not drawing we just shot the modified screenshot
-    if (m_mouseIsClicked && m_state != CaptureButton::Type::move) {
+    if (m_mouseIsClicked && m_state != CaptureButton::TYPE_MOVESELECTION) {
         painter.drawPixmap(0, 0, m_screenshot->paintTemporalModification(
                                m_modifications.last()));
     } else {
@@ -167,7 +164,8 @@ void CaptureWidget::paintEvent(QPaintEvent *) {
         //same text and options to get the boundingRect that the text will have.
         QColor rectColor = m_uiColor;
         rectColor.setAlpha(180);
-        QColor textColor((CaptureButton::iconIsWhite(rectColor) ? Qt::white : Qt::black));
+        QColor textColor((CaptureButton::iconIsWhiteByColor(rectColor) ?
+                              Qt::white : Qt::black));
         painter.setPen(QPen(textColor));
         painter.setBrush(QBrush(rectColor, Qt::SolidPattern));
         QRectF bRect = painter.boundingRect(helpRect, Qt::AlignCenter, helpTxt);
@@ -213,9 +211,12 @@ void CaptureWidget::mousePressEvent(QMouseEvent *e) {
     if (e->button() == Qt::LeftButton) {
         m_showInitialMsg = false;
         m_mouseIsClicked = true;
-        if (m_state != CaptureButton::Type::move) {
-            m_modifications.append(CaptureModification(m_state, e->pos(),
-                                                       m_colorPicker->getDrawColor()));
+        if (m_state != CaptureButton::TYPE_MOVESELECTION) {
+            m_modifications.append(
+                        new CaptureModification(m_state, e->pos(),
+                                                m_colorPicker->getDrawColor(),
+                                                this)
+                        );
             return;
         }
         m_dragStartPoint = e->pos();
@@ -233,7 +234,7 @@ void CaptureWidget::mousePressEvent(QMouseEvent *e) {
 }
 
 void CaptureWidget::mouseMoveEvent(QMouseEvent *e) {
-    if (m_mouseIsClicked && m_state == CaptureButton::Type::move) {
+    if (m_mouseIsClicked && m_state == CaptureButton::TYPE_MOVESELECTION) {
         m_mousePos = e->pos();
 
         if (m_newSelection) {
@@ -295,7 +296,7 @@ void CaptureWidget::mouseMoveEvent(QMouseEvent *e) {
         update();
 
     } else if (m_mouseIsClicked) {
-        m_modifications.last().addPoint(e->pos());
+        m_modifications.last()->addPoint(e->pos());
     } else {
         if (m_selection.isNull()) {
             update();
@@ -309,21 +310,20 @@ void CaptureWidget::mouseMoveEvent(QMouseEvent *e) {
                 break;
             }
         }
-
         if (!found) {
             m_mouseOverHandle = 0;
 
             if (m_rightClick) {
                 setCursor(Qt::ArrowCursor);
             } else if (m_selection.contains(e->pos()) && !m_onButton &&
-                    m_state == CaptureButton::Type::move) {
+                    m_state == CaptureButton::TYPE_MOVESELECTION) {
                 setCursor(Qt::OpenHandCursor);
             } else if (m_onButton) {
                 setCursor(Qt::ArrowCursor);
             } else {
                 setCursor(Qt::CrossCursor);
             }
-        } else if (m_state == CaptureButton::Type::move){
+        } else if (m_state == CaptureButton::TYPE_MOVESELECTION){
             // cursor on the handlers
             if (m_mouseOverHandle == &m_TLHandle || m_mouseOverHandle == &m_BRHandle) {
                 setCursor(Qt::SizeFDiagCursor);
@@ -346,7 +346,7 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent *e) {
         return;
     // when we end the drawing of a modification in the capture we have to
     // register the last point and add the whole modification to the screenshot
-    } else if (m_mouseIsClicked && m_state != CaptureButton::Type::move) {
+    } else if (m_mouseIsClicked && m_state != CaptureButton::TYPE_MOVESELECTION) {
         m_screenshot->paintModification(m_modifications.last());
     }
 
@@ -358,7 +358,7 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent *e) {
     m_mouseIsClicked = false;
     m_newSelection = false;
 
-    if (m_state == CaptureButton::Type::move && m_mouseOverHandle == 0 &&
+    if (m_state == CaptureButton::TYPE_MOVESELECTION && m_mouseOverHandle == 0 &&
             m_selection.contains(e->pos())) {
         setCursor(Qt::OpenHandCursor);
     }
@@ -409,19 +409,20 @@ QString CaptureWidget::saveScreenshot(bool toClipboard) {
 }
 
 QString CaptureWidget::saveScreenshot(QString path, bool toClipboard) {
-    QSettings().setValue("savePath", path);
+    ConfigHandler().setSavePath(path);
+    QString savePath;
     if (m_selection.isNull()) {
-        m_screenshot->fileSave();
+        savePath = m_screenshot->fileSave();
     } else { // save full screen when no selection
-        m_screenshot->fileSave(getExtendedSelection());
+        savePath = m_screenshot->fileSave(getExtendedSelection());
     }
     if (toClipboard) {
         copyScreenshot();
     }
     QString saveMessage(tr("Capture saved in "));
-    Q_EMIT newMessage(saveMessage + path);
+    Q_EMIT newMessage(saveMessage + savePath);
     close();
-    return path;
+    return savePath;
 }
 
 void CaptureWidget::copyScreenshot() {
@@ -475,12 +476,16 @@ void CaptureWidget::uploadScreenshot() {
     Q_EMIT newMessage(tr("Uploading image..."));
 }
 
-void CaptureWidget::undo() {
+bool CaptureWidget::undo() {
+    bool itemRemoved = false;
     if (!m_modifications.isEmpty()) {
+        m_modifications.last()->deleteLater();
         m_modifications.pop_back();
         m_screenshot->paintBaseModifications(m_modifications);
         update();
+        itemRemoved = true;
     }
+    return itemRemoved;
 }
 
 void CaptureWidget::leftResize() {
@@ -520,38 +525,65 @@ void CaptureWidget::downResize() {
 }
 
 void CaptureWidget::setState(CaptureButton *b) {
-    CaptureButton::Type t = b->getButtonType();
-    if(t == CaptureButton::Type::selectionIndicator) {
-        return;
+    CaptureButton::ButtonType t = b->getButtonType();
+    if(b->getTool()->isSelectable()) {
+        if(t != m_state) {
+            m_state = t;
+            if (m_lastPressedButton) {
+                m_lastPressedButton->setColor(m_uiColor);
+            }
+            m_lastPressedButton = b;
+            m_lastPressedButton->setColor(m_contrastUiColor);
+        } else {
+            handleButtonSignal(CaptureTool::REQ_MOVE_MODE);
+        }
     }
-    CaptureButton::Type newState = t;
-    if (m_state == t) {
-        newState =  CaptureButton::Type::move;
-    }
-    if (t == CaptureButton::Type::save) {
+}
+
+void CaptureWidget::handleButtonSignal(CaptureTool::Request r) {
+    switch (r) {
+    case CaptureTool::REQ_CLEAR_MODIFICATIONS:
+        while(undo());
+        break;
+    case CaptureTool::REQ_CLOSE_GUI:
+        close();
+        break;
+    case CaptureTool::REQ_HIDE_GUI:
+        hide();
+        break;
+    case CaptureTool::REQ_HIDE_SELECTION:
+        m_newSelection = true;
+        m_selection = QRect();
+        setCursor(Qt::CrossCursor);
+        break;
+    case CaptureTool::REQ_SAVE_SCREENSHOT:
         m_enableSaveWindow ?
                     saveScreenshot() :
-                    saveScreenshot(QSettings().value("savePath").toString());
-    } else if (t == CaptureButton::Type::copy) {
+                    saveScreenshot(ConfigHandler().getSavePath());
+        break;
+    case CaptureTool::REQ_SELECT_ALL:
+        m_selection = rect();
+        break;
+    case CaptureTool::REQ_TO_CLIPBOARD:
         copyScreenshot();
-    } else if (t == CaptureButton::Type::exit) {
-        close();
-    } else if (t == CaptureButton::Type::undo) {
+        break;
+    case CaptureTool::REQ_UNDO_MODIFICATION:
         undo();
-    } else if (t == CaptureButton::Type::imageUploader) {
+        break;
+    case CaptureTool::REQ_UPLOAD_TO_IMGUR:
         uploadScreenshot();
-    } else {
-        m_state = newState;
+        break;
+    case CaptureTool::REQ_MOVE_MODE:
+        m_state = CaptureButton::TYPE_MOVESELECTION;
         if (m_lastPressedButton) {
-            m_lastPressedButton->setStyleSheet(CaptureButton::getStyle());
-            m_lastPressedButton->updateIconColor();
-        }
-        m_lastPressedButton = b;
-        if (m_state != CaptureButton::Type::move) {
-            m_lastPressedButton->setStyleSheet(CaptureButton::getStyle(m_contrastUiColor));
-            m_lastPressedButton->updateIconColor(m_contrastUiColor);
+            m_lastPressedButton->setColor(m_uiColor);
+            m_lastPressedButton = nullptr;
         }
+        break;
+    default:
+        break;
     }
+    update();
 }
 
 void CaptureWidget::leaveButton() {
diff --git a/src/capture/capturewidget.h b/src/capture/capturewidget.h
index e2df50f0..7554fa49 100644
--- a/src/capture/capturewidget.h
+++ b/src/capture/capturewidget.h
@@ -25,6 +25,7 @@
 #define CAPTUREWIDGET_H
 
 #include "capturebutton.h"
+#include "src/capture/tools/capturetool.h"
 #include "buttonhandler.h"
 #include <QWidget>
 #include <QPointer>
@@ -44,13 +45,14 @@ class CaptureWidget : public QWidget {
     friend class CaptureButton;
 
 public:
-    explicit CaptureWidget(bool enableSaveWindow = true, QWidget *parent = 0);
+    explicit CaptureWidget(bool enableSaveWindow = true, QWidget *parent = nullptr);
     ~CaptureWidget();
 
     void updateButtons();
 public slots:
     QString saveScreenshot(bool toClipboard = false);
     QString saveScreenshot(QString path, bool toClipboard = false);
+    void handleButtonSignal(CaptureTool::Request r);
 
 signals:
     void newMessage(QString);
@@ -60,7 +62,7 @@ private slots:
     void openURL(QNetworkReply *reply);
     void leaveButton();
     void enterButton();
-    void undo();
+    bool undo();
 
     void leftResize();
     void rightResize();
@@ -114,11 +116,11 @@ private:
     void updateSizeIndicator();
 
     QRect getExtendedSelection() const;
-    QVector<CaptureModification> m_modifications;
+    QVector<CaptureModification*> m_modifications;
     QPointer<CaptureButton> m_sizeIndButton;
     QPointer<CaptureButton> m_lastPressedButton;
 
-    CaptureButton::Type m_state;
+    CaptureButton::ButtonType m_state;
     ButtonHandler *m_buttonHandler;
 
     QColor m_uiColor;
diff --git a/src/capture/colorpicker.cpp b/src/capture/colorpicker.cpp
index 9a5e04ce..2877f2b5 100644
--- a/src/capture/colorpicker.cpp
+++ b/src/capture/colorpicker.cpp
@@ -18,7 +18,7 @@
 #include "colorpicker.h"
 #include <QPainter>
 #include <QMouseEvent>
-#include <QSettings>
+#include "src/utils/confighandler.h"
 
 
 ColorPicker::ColorPicker(QWidget *parent) : QWidget(parent),
@@ -26,9 +26,9 @@ ColorPicker::ColorPicker(QWidget *parent) : QWidget(parent),
 {
     setMouseTracking(true);
     // save the color values in member variables for faster access
-    QSettings settings;
-    m_uiColor = settings.value("uiColor").value<QColor>();
-    m_drawColor = settings.value("drawColor").value<QColor>();
+    ConfigHandler config;
+    m_uiColor = config.getUIMainColor();
+    m_drawColor = config.getDrawColor();
     // extraSize represents the extra space needed for the highlight of the
     // selected color.
     const int extraSize = 6;
@@ -51,7 +51,7 @@ ColorPicker::ColorPicker(QWidget *parent) : QWidget(parent),
 }
 
 ColorPicker::~ColorPicker() {
-    QSettings().setValue("drawColor", m_drawColor);
+    ConfigHandler().setDrawColor(m_drawColor);
 }
 
 QColor ColorPicker::getDrawColor() {
diff --git a/src/capture/colorpicker.h b/src/capture/colorpicker.h
index 77e54feb..0bd877f0 100644
--- a/src/capture/colorpicker.h
+++ b/src/capture/colorpicker.h
@@ -24,7 +24,7 @@ class ColorPicker : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ColorPicker(QWidget *parent = 0);
+    explicit ColorPicker(QWidget *parent = nullptr);
     ~ColorPicker();
 
     QColor getDrawColor();
diff --git a/src/capture/screenshot.cpp b/src/capture/screenshot.cpp
index 2687141a..bf0087a9 100644
--- a/src/capture/screenshot.cpp
+++ b/src/capture/screenshot.cpp
@@ -18,12 +18,9 @@
 #include "screenshot.h"
 #include "capturebutton.h"
 #include "capturemodification.h"
+#include "src/capture/tools/capturetool.h"
 #include "src/utils/filenamehandler.h"
-#include <QStandardPaths>
-#include <QIcon>
-#include <QSettings>
-#include <QObject>
-#include <QString>
+#include "src/utils/confighandler.h"
 #include <QMessageBox>
 #include <QImageWriter>
 #include <QFileDialog>
@@ -63,34 +60,8 @@ QPixmap Screenshot::getScreenshot() const {
 // graphicalSave generates a graphical window to ask about the save path and
 // saves the screenshot with all the modifications in such directory
 QString Screenshot::graphicalSave(const QRect &selection, QWidget *parent) const {
-    const QString format = "png";
-    QSettings settings;
-    QString savePath = settings.value("savePath").toString();
-    if (savePath.isEmpty() || !QDir(savePath).exists()) {
-        savePath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-        if (savePath.isEmpty()) {
-            savePath = QDir::currentPath();
-        }
-    }
-
-    QString tempName = "/"+ FileNameHandler().getParsedPattern();
-    // find unused name adding _n where n is a number
-    QFileInfo checkFile(savePath + tempName + "." + format);
-    if (checkFile.exists()) {
-        tempName += "_";
-        int i = 1;
-        while (true) {
-            checkFile.setFile(
-                        savePath + tempName + QString::number(i) + "." + format);
-            if (!checkFile.exists()) {
-                tempName += QString::number(i);
-                break;
-            }
-            ++i;
-        }
-    }
-    savePath += tempName + "." + format;
-
+    QString savePath = FileNameHandler().getAbsoluteSavePath();
+    // setup window
     QFileDialog fileDialog(parent, QObject::tr("Save As"), savePath);
     fileDialog.setAcceptMode(QFileDialog::AcceptSave);
     fileDialog.setFileMode(QFileDialog::AnyFile);
@@ -99,18 +70,18 @@ QString Screenshot::graphicalSave(const QRect &selection, QWidget *parent) const
     for (const QByteArray &bf: QImageWriter::supportedMimeTypes())
         mimeTypes.append(QLatin1String(bf));
     fileDialog.setMimeTypeFilters(mimeTypes);
-    fileDialog.selectMimeTypeFilter("image/" + format);
-    fileDialog.setDefaultSuffix(format);
+    fileDialog.selectMimeTypeFilter("image/png");
+    fileDialog.setDefaultSuffix("png");
     fileDialog.setWindowIcon(QIcon(":img/flameshot.png"));
 
     bool saved = false;
-    QString fileName, pathNoFile;
+    QString fileName;
     do {
         if (fileDialog.exec() != QDialog::Accepted) { return ""; }
         fileName = fileDialog.selectedFiles().first();
 
-        pathNoFile = fileName.left(fileName.lastIndexOf("/"));
-        settings.setValue("savePath", pathNoFile);
+        QString pathNoFile = fileName.left(fileName.lastIndexOf("/"));
+        ConfigHandler().setSavePath(pathNoFile);
 
         QPixmap pixToSave;
         if (selection.isEmpty()) {
@@ -118,47 +89,22 @@ QString Screenshot::graphicalSave(const QRect &selection, QWidget *parent) const
         } else { // save full screen when no selection
             pixToSave = m_modifiedScreenshot.copy(selection);
         }
-
         saved = pixToSave.save(fileName);
         if (!saved) {
-            QMessageBox saveErrBox(QMessageBox::Warning, QObject::tr("Save Error"),
-                                   QObject::tr("The image could not be saved to \"%1\".")
-                                   .arg(QDir::toNativeSeparators(fileName)));
+            QMessageBox saveErrBox(
+                        QMessageBox::Warning,
+                        QObject::tr("Save Error"),
+                        QObject::tr("The image could not be saved to \"%1\".")
+                        .arg(QDir::toNativeSeparators(fileName)));
             saveErrBox.setWindowIcon(QIcon(":img/flameshot.png"));
             saveErrBox.exec();
         }
     } while(!saved);
-
-    return pathNoFile;
+    return savePath;
 }
 
 QString Screenshot::fileSave(const QRect &selection) const {
-    const QString format = "png";
-    QSettings settings;
-    QString savePath = settings.value("savePath").toString();
-    if (savePath.isEmpty() || !QDir(savePath).exists()) {
-        savePath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
-        if (savePath.isEmpty()) {
-            savePath = QDir::currentPath();
-        }
-    }
-    // find unused name adding _n where n is a number
-    QString tempName = QObject::tr("/screenshot");
-    QFileInfo checkFile(savePath + tempName + "." + format);
-    if (checkFile.exists()) {
-        tempName += "_";
-        int i = 1;
-        while (true) {
-            checkFile.setFile(
-                        savePath + tempName + QString::number(i) + "." + format);
-            if (!checkFile.exists()) {
-                tempName += QString::number(i);
-                break;
-            }
-            ++i;
-        }
-    }
-    savePath += tempName + "." + format;
+    QString savePath = FileNameHandler().getAbsoluteSavePath();
     QPixmap pixToSave;
     if (selection.isEmpty()) {
         pixToSave = m_modifiedScreenshot;
@@ -169,7 +115,7 @@ QString Screenshot::fileSave(const QRect &selection) const {
 }
 
 // paintModification adds a new modification to the screenshot
-QPixmap Screenshot::paintModification(const CaptureModification &modification) {
+QPixmap Screenshot::paintModification(const CaptureModification *modification) {
     QPainter painter(&m_modifiedScreenshot);
     painter.setRenderHint(QPainter::Antialiasing);
 
@@ -180,11 +126,11 @@ QPixmap Screenshot::paintModification(const CaptureModification &modification) {
 // paintTemporalModification paints a modification without updating the
 // member pixmap
 QPixmap Screenshot::paintTemporalModification(
-        const CaptureModification &modification)
+        const CaptureModification *modification)
 {
     QPixmap tempPix = m_modifiedScreenshot;
     QPainter painter(&tempPix);
-    if (modification.getType() != CaptureButton::Type::pencil) {
+    if (modification->getType() != CaptureButton::TYPE_PENCIL) {
         painter.setRenderHint(QPainter::Antialiasing);
     }
     paintInPainter(painter, modification);
@@ -194,94 +140,23 @@ QPixmap Screenshot::paintTemporalModification(
 // paintBaseModifications overrides the modifications of the screenshot
 // with new ones.
 QPixmap Screenshot::paintBaseModifications(
-        const QVector<CaptureModification> &m)
+        const QVector<CaptureModification*> &m)
 {
     m_modifiedScreenshot = m_baseScreenshot;
-    for (const CaptureModification modification: m) {
+    for (const CaptureModification *modification: m) {
         paintModification(modification);
     }
     return m_modifiedScreenshot;
 }
 
-namespace {
-    const int ArrowWidth = 10;
-    const int ArrowHeight = 18;
-
-    QPainterPath getArrowHead(QPoint p1, QPoint p2) {
-        QLineF body(p1, p2);
-        int originalLength = body.length();
-        body.setLength(ArrowWidth);
-        // move across the line up to the head
-        QLineF temp(QPoint(0,0), p2-p1);
-        temp.setLength(originalLength-ArrowHeight);
-        QPointF bottonTranslation(temp.p2());
-
-        // generates the transformation to center of the arrowhead
-        body.setAngle(body.angle()+90);
-        QPointF temp2 = p1-body.p2();
-        QPointF centerTranslation((temp2.x()/2), (temp2.y()/2));
-
-        body.translate(bottonTranslation);
-        body.translate(centerTranslation);
-
-        QPainterPath path;
-        path.moveTo(p2);
-        path.lineTo(body.p1());
-        path.lineTo(body.p2());
-        path.lineTo(p2);
-        return path;
-    }
-
-    // gets a shorter line to prevent overlap in the point of the arrow
-    QLine getShorterLine(QPoint p1, QPoint p2) {
-        QLineF l(p1, p2);
-        l.setLength(l.length()-ArrowHeight);
-        return l.toLine();
-    }
-
-}
-
-
-
-
 // paintInPainter is an aux method to prevent duplicated code, it draws the
 // passed modification to the painter.
 void Screenshot::paintInPainter(QPainter &painter,
-                                const CaptureModification &modification)
+                                const CaptureModification *modification)
 {
-    painter.setPen(QPen(modification.getColor(), 2));
-    QVector<QPoint> points = modification.getPoints();
-    switch (modification.getType()) {
-    case CaptureButton::Type::arrow:
-        painter.drawLine(getShorterLine(points[0], points[1]));
-        painter.fillPath(getArrowHead(points[0], points[1]),
-                QBrush(modification.getColor()));
-        break;
-    case CaptureButton::Type::circle:
-        painter.drawEllipse(QRect(points[0], points[1]));
-        break;
-    case CaptureButton::Type::line:
-        painter.drawLine(points[0], points[1]);
-        break;
-    case CaptureButton::Type::marker:
-        painter.setOpacity(0.35);
-        painter.setPen(QPen(modification.getColor(), 14));
-        painter.drawLine(points[0], points[1]);
-        painter.setOpacity(1);
-        break;
-    case CaptureButton::Type::pencil:
-        painter.drawPolyline(points.data(), points.size());
-        break;
-    case CaptureButton::Type::selection:
-        painter.drawRect(QRect(points[0], points[1]));
-        break;
-    case CaptureButton::Type::rectangle:
-        painter.setBrush(QBrush(modification.getColor()));
-        painter.drawRect(QRect(points[0], points[1]));
-        break;
-    default:
-        break;
-    }
+    const QVector<QPoint> &points = modification->getPoints();
+    QColor color = modification->getColor();
+    modification->getTool()->processImage(painter, points, color);
 }
 
 void Screenshot::uploadToImgur(QNetworkAccessManager *accessManager,
diff --git a/src/capture/screenshot.h b/src/capture/screenshot.h
index 1d32f4b3..2e9b5e22 100644
--- a/src/capture/screenshot.h
+++ b/src/capture/screenshot.h
@@ -30,7 +30,7 @@ class QNetworkAccessManager;
 class Screenshot : public QObject {
    Q_OBJECT
 public:
-    Screenshot(const QPixmap &, QObject *parent = 0);
+    Screenshot(const QPixmap &, QObject *parent = nullptr);
     ~Screenshot();
 
     void setScreenshot(const QPixmap &);
@@ -41,16 +41,16 @@ public:
     QString fileSave(const QRect &selection = QRect()) const;
     void uploadToImgur(QNetworkAccessManager *,
                        const QRect &selection = QRect());
-    QPixmap paintModification(const CaptureModification &);
-    QPixmap paintTemporalModification(const CaptureModification &);
-    QPixmap paintBaseModifications(const QVector<CaptureModification> &);
+    QPixmap paintModification(const CaptureModification*);
+    QPixmap paintTemporalModification(const CaptureModification*);
+    QPixmap paintBaseModifications(const QVector<CaptureModification*> &);
 
 private:
     QPixmap m_baseScreenshot;
     QPixmap m_modifiedScreenshot;
     QPointer<QNetworkAccessManager> m_accessManager;
 
-    void paintInPainter(QPainter &, const CaptureModification &);
+    void paintInPainter(QPainter &, const CaptureModification *);
 };
 
 #endif // SCREENSHOT_H
diff --git a/src/capture/tools/arrowtool.cpp b/src/capture/tools/arrowtool.cpp
new file mode 100644
index 00000000..1d2ae662
--- /dev/null
+++ b/src/capture/tools/arrowtool.cpp
@@ -0,0 +1,95 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "arrowtool.h"
+#include <QPainter>
+
+namespace {
+    const int ArrowWidth = 10;
+    const int ArrowHeight = 18;
+
+    QPainterPath getArrowHead(QPoint p1, QPoint p2) {
+        QLineF body(p1, p2);
+        int originalLength = body.length();
+        body.setLength(ArrowWidth);
+        // move across the line up to the head
+        //QPointF  =;
+        QLineF temp(QPoint(0,0), p2-p1);
+        temp.setLength(originalLength-ArrowHeight);
+        QPointF bottonTranslation(temp.p2());
+
+        // generates the transformation to center of the arrowhead
+        body.setAngle(body.angle()+90);
+        QPointF temp2 = p1-body.p2();
+        QPointF centerTranslation((temp2.x()/2), (temp2.y()/2));
+
+        body.translate(bottonTranslation);
+        body.translate(centerTranslation);
+
+        QPainterPath path;
+        path.moveTo(p2);
+        path.lineTo(body.p1());
+        path.lineTo(body.p2());
+        path.lineTo(p2);
+        return path;
+    }
+
+    // gets a shorter line to prevent overlap in the point of the arrow
+    QLine getShorterLine(QPoint p1, QPoint p2) {
+        QLineF l(p1, p2);
+        l.setLength(l.length()-ArrowHeight);
+        return l.toLine();
+    }
+
+}
+
+ArrowTool::ArrowTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool ArrowTool::isSelectable() {
+    return true;
+}
+
+QString ArrowTool::getIconName() {
+    return "arrow-bottom-left.png";
+}
+
+QString ArrowTool::getName() {
+    return tr("Arrow");
+}
+
+QString ArrowTool::getDescription() {
+    return tr("Sets the Arrow as the paint tool");
+}
+
+CaptureTool::ToolWorkType ArrowTool::getToolType() {
+    return TYPE_LINE_DRAWER;
+}
+
+void ArrowTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setPen(QPen(color, 2));
+    painter.drawLine(getShorterLine(points[0], points[1]));
+    painter.fillPath(getArrowHead(points[0], points[1]), QBrush(color));
+}
+
+void ArrowTool::onPressed() {
+}
diff --git a/src/capture/tools/arrowtool.h b/src/capture/tools/arrowtool.h
new file mode 100644
index 00000000..0e7c2f65
--- /dev/null
+++ b/src/capture/tools/arrowtool.h
@@ -0,0 +1,46 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef ARROWTOOL_H
+#define ARROWTOOL_H
+
+#include "capturetool.h"
+
+class ArrowTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit ArrowTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+
+};
+
+#endif // ARROWTOOL_H
diff --git a/src/capture/tools/capturetool.cpp b/src/capture/tools/capturetool.cpp
index eacdd35c..613932cf 100644
--- a/src/capture/tools/capturetool.cpp
+++ b/src/capture/tools/capturetool.cpp
@@ -1,6 +1,22 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #include "capturetool.h"
 
 CaptureTool::CaptureTool(QObject *parent) : QObject(parent)
 {
-
 }
diff --git a/src/capture/tools/capturetool.h b/src/capture/tools/capturetool.h
index b274ec5a..667455c6 100644
--- a/src/capture/tools/capturetool.h
+++ b/src/capture/tools/capturetool.h
@@ -1,26 +1,72 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef CAPTURETOOL_H
 #define CAPTURETOOL_H
 
 #include <QObject>
 #include <QVector>
 
+class QPainter;
+
 class CaptureTool : public QObject
 {
     Q_OBJECT
+
 public:
-    enum toolType{WORKER, PATH_DRAWER, LINE_DRAWER};
+    enum ToolWorkType {
+        TYPE_WORKER,
+        TYPE_PATH_DRAWER,
+        TYPE_LINE_DRAWER
+    };
+
+    enum Request {
+        REQ_CLOSE_GUI,
+        REQ_HIDE_GUI,
+        REQ_HIDE_SELECTION,
+        REQ_UNDO_MODIFICATION,
+        REQ_CLEAR_MODIFICATIONS,
+        REQ_SAVE_SCREENSHOT,
+        REQ_SELECT_ALL,
+        REQ_TO_CLIPBOARD,
+        REQ_UPLOAD_TO_IMGUR,
+        REQ_MOVE_MODE,
+    };
 
     explicit CaptureTool(QObject *parent = nullptr);
 
-    virtual int getID() = 0;
-    virtual bool isCheckable() = 0;
-    virtual void drawChanges(QPixmap &pm, const QVector<QPoint> &points) = 0;
-    virtual toolType getToolType() = 0;
+    virtual bool isSelectable() = 0;
+    virtual ToolWorkType getToolType() = 0;
+
+    virtual QString getIconName() = 0;
+    virtual QString getName() = 0;
+    virtual QString getDescription() = 0;
+
+    virtual void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color) = 0;
 
 signals:
-    void requestAction();
+    void requestAction(Request r);
 
 public slots:
+    virtual void onPressed() = 0;
+
 };
 
 #endif // CAPTURETOOL_H
diff --git a/src/capture/tools/circletool.cpp b/src/capture/tools/circletool.cpp
new file mode 100644
index 00000000..e374235e
--- /dev/null
+++ b/src/capture/tools/circletool.cpp
@@ -0,0 +1,55 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "circletool.h"
+#include <QPainter>
+
+CircleTool::CircleTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool CircleTool::isSelectable() {
+    return true;
+}
+
+QString CircleTool::getIconName() {
+    return "circle-outline.png";
+}
+
+QString CircleTool::getName() {
+    return tr("Circle");
+}
+
+QString CircleTool::getDescription() {
+    return tr("Sets the Circle as the paint tool");
+}
+
+CaptureTool::ToolWorkType CircleTool::getToolType() {
+    return TYPE_LINE_DRAWER;
+}
+
+void CircleTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setPen(QPen(color, 2));
+    painter.drawEllipse(QRect(points[0], points[1]));
+}
+
+void CircleTool::onPressed() {
+}
diff --git a/src/capture/tools/circletool.h b/src/capture/tools/circletool.h
new file mode 100644
index 00000000..983b7181
--- /dev/null
+++ b/src/capture/tools/circletool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CIRCLETOOL_H
+#define CIRCLETOOL_H
+
+#include "capturetool.h"
+
+class CircleTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit CircleTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // CIRCLETOOL_H
diff --git a/src/capture/tools/copytool.cpp b/src/capture/tools/copytool.cpp
new file mode 100644
index 00000000..e80f12b3
--- /dev/null
+++ b/src/capture/tools/copytool.cpp
@@ -0,0 +1,58 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "copytool.h"
+#include <QPainter>
+
+CopyTool::CopyTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool CopyTool::isSelectable() {
+    return false;
+}
+
+QString CopyTool::getIconName() {
+    return "content-copy.png";
+}
+
+QString CopyTool::getName() {
+    return tr("Copy");
+}
+
+QString CopyTool::getDescription() {
+    return tr("Copies the selecion into the clipboard");
+}
+
+CaptureTool::ToolWorkType CopyTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void CopyTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void CopyTool::onPressed() {
+    Q_EMIT requestAction(REQ_TO_CLIPBOARD);
+    Q_EMIT requestAction(REQ_CLOSE_GUI);
+}
diff --git a/src/capture/tools/copytool.h b/src/capture/tools/copytool.h
new file mode 100644
index 00000000..8f6e4b78
--- /dev/null
+++ b/src/capture/tools/copytool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef COPYTOOL_H
+#define COPYTOOL_H
+
+#include "capturetool.h"
+
+class CopyTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit CopyTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // COPYTOOL_H
diff --git a/src/capture/tools/exittool.cpp b/src/capture/tools/exittool.cpp
new file mode 100644
index 00000000..caf96866
--- /dev/null
+++ b/src/capture/tools/exittool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "exittool.h"
+#include <QPainter>
+
+ExitTool::ExitTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool ExitTool::isSelectable() {
+    return false;
+}
+
+QString ExitTool::getIconName() {
+    return "close.png";
+}
+
+QString ExitTool::getName() {
+    return tr("Exit");
+}
+
+QString ExitTool::getDescription() {
+    return tr("Leave the capture screen");
+}
+
+CaptureTool::ToolWorkType ExitTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void ExitTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void ExitTool::onPressed() {
+    Q_EMIT requestAction(REQ_CLOSE_GUI);
+}
diff --git a/src/capture/tools/exittool.h b/src/capture/tools/exittool.h
new file mode 100644
index 00000000..1d583f8a
--- /dev/null
+++ b/src/capture/tools/exittool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef EXITTOOL_H
+#define EXITTOOL_H
+
+#include "capturetool.h"
+
+class ExitTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit ExitTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // EXITTOOL_H
diff --git a/src/capture/tools/imguruploadertool.cpp b/src/capture/tools/imguruploadertool.cpp
new file mode 100644
index 00000000..8a14f8fe
--- /dev/null
+++ b/src/capture/tools/imguruploadertool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "imguruploadertool.h"
+#include <QPainter>
+
+ImgurUploaderTool::ImgurUploaderTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool ImgurUploaderTool::isSelectable() {
+    return false;
+}
+
+QString ImgurUploaderTool::getIconName() {
+    return "cloud-upload.png";
+}
+
+QString ImgurUploaderTool::getName() {
+    return tr("Image Uploader");
+}
+
+QString ImgurUploaderTool::getDescription() {
+    return tr("Uploads the selection to Imgur");
+}
+
+CaptureTool::ToolWorkType ImgurUploaderTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void ImgurUploaderTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void ImgurUploaderTool::onPressed() {
+    Q_EMIT requestAction(REQ_UPLOAD_TO_IMGUR);
+}
diff --git a/src/capture/tools/imguruploadertool.h b/src/capture/tools/imguruploadertool.h
new file mode 100644
index 00000000..59633787
--- /dev/null
+++ b/src/capture/tools/imguruploadertool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef IMGURUPLOADERTOOL_H
+#define IMGURUPLOADERTOOL_H
+
+#include "capturetool.h"
+
+class ImgurUploaderTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit ImgurUploaderTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // IMGURUPLOADERTOOL_H
diff --git a/src/capture/tools/linetool.cpp b/src/capture/tools/linetool.cpp
new file mode 100644
index 00000000..a084cb01
--- /dev/null
+++ b/src/capture/tools/linetool.cpp
@@ -0,0 +1,55 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "linetool.h"
+#include <QPainter>
+
+LineTool::LineTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool LineTool::isSelectable() {
+    return true;
+}
+
+QString LineTool::getIconName() {
+    return "line.png";
+}
+
+QString LineTool::getName() {
+    return tr("Line");
+}
+
+QString LineTool::getDescription() {
+    return tr("Sets the Line as the paint tool");
+}
+
+CaptureTool::ToolWorkType LineTool::getToolType() {
+    return TYPE_LINE_DRAWER;
+}
+
+void LineTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setPen(QPen(color, 2));
+    painter.drawLine(points[0], points[1]);
+}
+
+void LineTool::onPressed() {
+}
diff --git a/src/capture/tools/linetool.h b/src/capture/tools/linetool.h
new file mode 100644
index 00000000..377cdf7e
--- /dev/null
+++ b/src/capture/tools/linetool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef LINETOOL_H
+#define LINETOOL_H
+
+#include "capturetool.h"
+
+class LineTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit LineTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // LINETOOL_H
diff --git a/src/capture/tools/markertool.cpp b/src/capture/tools/markertool.cpp
new file mode 100644
index 00000000..f4f70190
--- /dev/null
+++ b/src/capture/tools/markertool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "markertool.h"
+#include <QPainter>
+
+MarkerTool::MarkerTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool MarkerTool::isSelectable() {
+    return true;
+}
+
+QString MarkerTool::getIconName() {
+    return "marker.png";
+}
+
+QString MarkerTool::getName() {
+    return tr("Marker");
+}
+
+QString MarkerTool::getDescription() {
+    return tr("Sets the Marker as the paint tool");
+}
+
+CaptureTool::ToolWorkType MarkerTool::getToolType() {
+    return TYPE_LINE_DRAWER;
+}
+
+void MarkerTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setOpacity(0.35);
+    painter.setPen(QPen(color, 14));
+    painter.drawLine(points[0], points[1]);
+    painter.setOpacity(1);
+}
+
+void MarkerTool::onPressed() {
+}
diff --git a/src/capture/tools/markertool.h b/src/capture/tools/markertool.h
new file mode 100644
index 00000000..c29df803
--- /dev/null
+++ b/src/capture/tools/markertool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef MARKERTOOL_H
+#define MARKERTOOL_H
+
+#include "capturetool.h"
+
+class MarkerTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit MarkerTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // MARKERTOOL_H
diff --git a/src/capture/tools/movetool.cpp b/src/capture/tools/movetool.cpp
new file mode 100644
index 00000000..41c1ab06
--- /dev/null
+++ b/src/capture/tools/movetool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "movetool.h"
+#include <QPainter>
+
+MoveTool::MoveTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool MoveTool::isSelectable() {
+    return false;
+}
+
+QString MoveTool::getIconName() {
+    return "cursor-move.png";
+}
+
+QString MoveTool::getName() {
+    return tr("Move");
+}
+
+QString MoveTool::getDescription() {
+    return tr("Move the selection area");
+}
+
+CaptureTool::ToolWorkType MoveTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void MoveTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void MoveTool::onPressed() {
+    Q_EMIT requestAction(REQ_MOVE_MODE);
+}
diff --git a/src/capture/tools/movetool.h b/src/capture/tools/movetool.h
new file mode 100644
index 00000000..b0a48d2d
--- /dev/null
+++ b/src/capture/tools/movetool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef MOVETOOL_H
+#define MOVETOOL_H
+
+#include "capturetool.h"
+
+class MoveTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit MoveTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // MOVETOOL_H
diff --git a/src/capture/tools/penciltool.cpp b/src/capture/tools/penciltool.cpp
new file mode 100644
index 00000000..8377d043
--- /dev/null
+++ b/src/capture/tools/penciltool.cpp
@@ -0,0 +1,55 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "penciltool.h"
+#include <QPainter>
+
+PencilTool::PencilTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool PencilTool::isSelectable() {
+    return true;
+}
+
+QString PencilTool::getIconName() {
+    return "pencil.png";
+}
+
+QString PencilTool::getName() {
+    return tr("Pencil");
+}
+
+QString PencilTool::getDescription() {
+    return tr("Sets the Pencil as the paint tool");
+}
+
+CaptureTool::ToolWorkType PencilTool::getToolType() {
+    return TYPE_PATH_DRAWER;
+}
+
+void PencilTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setPen(QPen(color, 2));
+    painter.drawPolyline(points.data(), points.size());
+}
+
+void PencilTool::onPressed() {
+}
diff --git a/src/capture/tools/penciltool.h b/src/capture/tools/penciltool.h
new file mode 100644
index 00000000..bde8b2e4
--- /dev/null
+++ b/src/capture/tools/penciltool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef PENCILTOOL_H
+#define PENCILTOOL_H
+
+#include "capturetool.h"
+
+class PencilTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit PencilTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // PENCILTOOL_H
diff --git a/src/capture/tools/rectangletool.cpp b/src/capture/tools/rectangletool.cpp
new file mode 100644
index 00000000..a9c18760
--- /dev/null
+++ b/src/capture/tools/rectangletool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "rectangletool.h"
+#include <QPainter>
+
+RectangleTool::RectangleTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool RectangleTool::isSelectable() {
+    return true;
+}
+
+QString RectangleTool::getIconName() {
+    return "square.png";
+}
+
+QString RectangleTool::getName() {
+    return tr("Rectangle");
+}
+
+QString RectangleTool::getDescription() {
+    return tr("Sets the Rectangle as the paint tool");
+}
+
+CaptureTool::ToolWorkType RectangleTool::getToolType() {
+    return TYPE_LINE_DRAWER;
+}
+
+void RectangleTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setPen(QPen(color, 2));
+    painter.setBrush(QBrush(color));
+    painter.drawRect(QRect(points[0], points[1]));
+    painter.setBrush(QBrush());
+}
+
+void RectangleTool::onPressed() {
+}
diff --git a/src/capture/tools/rectangletool.h b/src/capture/tools/rectangletool.h
new file mode 100644
index 00000000..c36ec043
--- /dev/null
+++ b/src/capture/tools/rectangletool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef RECTANGLELTOOL_H
+#define RECTANGLELTOOL_H
+
+#include "capturetool.h"
+
+class RectangleTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit RectangleTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // RECTANGLELTOOL_H
diff --git a/src/capture/tools/savetool.cpp b/src/capture/tools/savetool.cpp
new file mode 100644
index 00000000..ee661508
--- /dev/null
+++ b/src/capture/tools/savetool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "savetool.h"
+#include <QPainter>
+
+SaveTool::SaveTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool SaveTool::isSelectable() {
+    return false;
+}
+
+QString SaveTool::getIconName() {
+    return "content-save.png";
+}
+
+QString SaveTool::getName() {
+    return tr("Save");
+}
+
+QString SaveTool::getDescription() {
+    return tr("Save the capture");
+}
+
+CaptureTool::ToolWorkType SaveTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void SaveTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void SaveTool::onPressed() {
+    Q_EMIT requestAction(REQ_SAVE_SCREENSHOT);
+}
diff --git a/src/capture/tools/savetool.h b/src/capture/tools/savetool.h
new file mode 100644
index 00000000..7c6d4b29
--- /dev/null
+++ b/src/capture/tools/savetool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef SAVETOOL_H
+#define SAVETOOL_H
+
+#include "capturetool.h"
+
+class SaveTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit SaveTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // SAVETOOL_H
diff --git a/src/capture/tools/selectiontool.cpp b/src/capture/tools/selectiontool.cpp
new file mode 100644
index 00000000..9ad66acb
--- /dev/null
+++ b/src/capture/tools/selectiontool.cpp
@@ -0,0 +1,55 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "selectiontool.h"
+#include <QPainter>
+
+SelectionTool::SelectionTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool SelectionTool::isSelectable() {
+    return true;
+}
+
+QString SelectionTool::getIconName() {
+    return "square-outline.png";
+}
+
+QString SelectionTool::getName() {
+    return tr("Rectangular Selection");
+}
+
+QString SelectionTool::getDescription() {
+    return tr("Sets the Selection as the paint tool");
+}
+
+CaptureTool::ToolWorkType SelectionTool::getToolType() {
+    return TYPE_LINE_DRAWER;
+}
+
+void SelectionTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    painter.setPen(QPen(color, 2));
+    painter.drawRect(QRect(points[0], points[1]));
+}
+
+void SelectionTool::onPressed() {
+}
diff --git a/src/capture/tools/selectiontool.h b/src/capture/tools/selectiontool.h
new file mode 100644
index 00000000..c8317c3c
--- /dev/null
+++ b/src/capture/tools/selectiontool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef SELECTIONTOOL_H
+#define SELECTIONTOOL_H
+
+#include "capturetool.h"
+
+class SelectionTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit SelectionTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // SELECTIONTOOL_H
diff --git a/src/capture/tools/sizeindicatortool.cpp b/src/capture/tools/sizeindicatortool.cpp
new file mode 100644
index 00000000..38faff8b
--- /dev/null
+++ b/src/capture/tools/sizeindicatortool.cpp
@@ -0,0 +1,56 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "sizeindicatortool.h"
+#include <QPainter>
+
+SizeIndicatorTool::SizeIndicatorTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool SizeIndicatorTool::isSelectable() {
+    return false;
+}
+
+QString SizeIndicatorTool::getIconName() {
+    return "";
+}
+
+QString SizeIndicatorTool::getName() {
+    return tr("Selection Size Indicator");
+}
+
+QString SizeIndicatorTool::getDescription() {
+    return tr("Shows the dimensions of the selection (X Y)");
+}
+
+CaptureTool::ToolWorkType SizeIndicatorTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void SizeIndicatorTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void SizeIndicatorTool::onPressed() {
+}
diff --git a/src/capture/tools/sizeindicatortool.h b/src/capture/tools/sizeindicatortool.h
new file mode 100644
index 00000000..24316f5a
--- /dev/null
+++ b/src/capture/tools/sizeindicatortool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef SIZEINDICATORTOOL_H
+#define SIZEINDICATORTOOL_H
+
+#include "capturetool.h"
+
+class SizeIndicatorTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit SizeIndicatorTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // SIZEINDICATORTOOL_H
diff --git a/src/capture/tools/toolfactory.cpp b/src/capture/tools/toolfactory.cpp
new file mode 100644
index 00000000..efff2672
--- /dev/null
+++ b/src/capture/tools/toolfactory.cpp
@@ -0,0 +1,92 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "toolfactory.h"
+#include "arrowtool.h"
+#include "circletool.h"
+#include "copytool.h"
+#include "exittool.h"
+#include "imguruploadertool.h"
+#include "linetool.h"
+#include "markertool.h"
+#include "movetool.h"
+#include "penciltool.h"
+#include "rectangletool.h"
+#include "savetool.h"
+#include "selectiontool.h"
+#include "sizeindicatortool.h"
+#include "undotool.h"
+
+ToolFactory::ToolFactory(QObject *parent) : QObject(parent)
+{
+
+}
+
+CaptureTool* ToolFactory::CreateTool(
+        CaptureButton::ButtonType t,
+        QObject *parent)
+{
+    CaptureTool *tool;
+    switch (t) {
+    case CaptureButton::TYPE_ARROW:
+        tool = new ArrowTool(parent);
+        break;
+    case CaptureButton::TYPE_CIRCLE:
+        tool = new CircleTool(parent);
+        break;
+    case CaptureButton::TYPE_COPY:
+        tool = new CopyTool(parent);
+        break;
+    case CaptureButton::TYPE_EXIT:
+        tool = new ExitTool(parent);
+        break;
+    case CaptureButton::TYPE_IMAGEUPLOADER:
+        tool = new ImgurUploaderTool(parent);
+        break;
+    case CaptureButton::TYPE_LINE:
+        tool = new LineTool(parent);
+        break;
+    case CaptureButton::TYPE_MARKER:
+        tool = new MarkerTool(parent);
+        break;
+    case CaptureButton::TYPE_MOVESELECTION:
+        tool = new MoveTool(parent);
+        break;
+    case CaptureButton::TYPE_PENCIL:
+        tool = new PencilTool(parent);
+        break;
+    case CaptureButton::TYPE_RECTANGLE:
+        tool = new RectangleTool(parent);
+        break;
+    case CaptureButton::TYPE_SAVE:
+        tool = new SaveTool(parent);
+        break;
+    case CaptureButton::TYPE_SELECTION:
+        tool = new SelectionTool(parent);
+        break;
+    case CaptureButton::TYPE_SELECTIONINDICATOR:
+        tool = new SizeIndicatorTool(parent);
+        break;
+    case CaptureButton::TYPE_UNDO:
+        tool = new UndoTool(parent);
+        break;
+    default:
+        tool = nullptr;
+        break;
+    }
+    return tool;
+}
diff --git a/src/capture/tools/toolfactory.h b/src/capture/tools/toolfactory.h
new file mode 100644
index 00000000..b29d2a47
--- /dev/null
+++ b/src/capture/tools/toolfactory.h
@@ -0,0 +1,48 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef TOOLFACTORY_H
+#define TOOLFACTORY_H
+
+#include <QObject>
+#include "src/capture/capturebutton.h"
+#include "src/capture/tools/capturetool.h"
+
+class CaptureTool;
+
+class ToolFactory : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum ToolType {
+
+    };
+
+    explicit ToolFactory(QObject *parent = nullptr);
+
+    ToolFactory(const ToolFactory &) = delete;
+    ToolFactory & operator=(const ToolFactory &) = delete;
+
+    CaptureTool* CreateTool(
+            CaptureButton::ButtonType t,
+            QObject *parent = nullptr);
+private:
+    //void registerTool();
+};
+
+#endif // TOOLFACTORY_H
diff --git a/src/capture/tools/undotool.cpp b/src/capture/tools/undotool.cpp
new file mode 100644
index 00000000..553dfb71
--- /dev/null
+++ b/src/capture/tools/undotool.cpp
@@ -0,0 +1,57 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "undotool.h"
+#include <QPainter>
+
+UndoTool::UndoTool(QObject *parent) : CaptureTool(parent) {
+
+}
+
+bool UndoTool::isSelectable() {
+    return false;
+}
+
+QString UndoTool::getIconName() {
+    return "undo-variant.png";
+}
+
+QString UndoTool::getName() {
+    return tr("Undo");
+}
+
+QString UndoTool::getDescription() {
+    return tr("Undo the last modification");
+}
+
+CaptureTool::ToolWorkType UndoTool::getToolType() {
+    return TYPE_WORKER;
+}
+
+void UndoTool::processImage(
+        QPainter &painter,
+        const QVector<QPoint> &points,
+        const QColor &color)
+{
+    Q_UNUSED(painter);
+    Q_UNUSED(points);
+    Q_UNUSED(color);
+}
+
+void UndoTool::onPressed() {
+    Q_EMIT requestAction(REQ_UNDO_MODIFICATION);
+}
diff --git a/src/capture/tools/undotool.h b/src/capture/tools/undotool.h
new file mode 100644
index 00000000..0efd81b0
--- /dev/null
+++ b/src/capture/tools/undotool.h
@@ -0,0 +1,45 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef UNDOTOOL_H
+#define UNDOTOOL_H
+
+#include "capturetool.h"
+
+class UndoTool : public CaptureTool
+{
+    Q_OBJECT
+public:
+    explicit UndoTool(QObject *parent = nullptr);
+
+    int getID();
+    bool isSelectable();
+    ToolWorkType getToolType();
+
+    QString getIconName();
+    QString getName();
+    QString getDescription();
+
+    void processImage(
+            QPainter &painter,
+            const QVector<QPoint> &points,
+            const QColor &color);
+
+    void onPressed();
+};
+
+#endif // UNDOTOOL_H
diff --git a/src/config/buttonlistview.cpp b/src/config/buttonlistview.cpp
index 92773faa..436d8005 100644
--- a/src/config/buttonlistview.cpp
+++ b/src/config/buttonlistview.cpp
@@ -16,7 +16,7 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "buttonlistview.h"
-#include "src/capture/capturebutton.h"
+#include "src/capture/tools/toolfactory.h"
 #include <QListWidgetItem>
 #include <QListWidgetItem>
 #include <QSettings>
@@ -24,12 +24,7 @@
 
 ButtonListView::ButtonListView(QWidget *parent) : QListWidget(parent) {
     setMouseTracking(true);
-
-    QSettings settings;
-    m_listButtons = settings.value("buttons").value<QList<int> >();
-
     initButtonList();
-
     connect(this, &QListWidget::itemChanged, this,
             &ButtonListView::updateActiveButtons);
     connect(this, &QListWidget::itemClicked, this,
@@ -37,38 +32,49 @@ ButtonListView::ButtonListView(QWidget *parent) : QListWidget(parent) {
 }
 
 void ButtonListView::initButtonList() {
-    for (int i = 0; i != static_cast<int>(CaptureButton::Type::last); ++i) {
-        auto t = static_cast<CaptureButton::Type>(i);
+    m_listButtons = QSettings().value("buttons").value<QList<int> >();
+    ToolFactory factory;
+    auto listTypes = CaptureButton::getIterableButtonTypes();
+
+    for (CaptureButton::ButtonType t: listTypes) {
+        CaptureTool *tool = factory.CreateTool(t);
+
+        // add element to the local map
+        m_buttonTypeByName[tool->getName()] = t;
+
+        // init the menu option
+
         QListWidgetItem *buttonItem = new QListWidgetItem(this);
 
-        bool iconsAreWhite = false;
-        QColor bgColor = this->palette().color(QWidget::backgroundRole());
         // when the background is lighter than gray, it uses the white icons
-        if (bgColor.valueF() < 0.6) {
-            iconsAreWhite = true;
-        }
-        buttonItem->setIcon(CaptureButton::getIcon(t, iconsAreWhite));
+        QColor bgColor = this->palette().color(QWidget::backgroundRole());
+        QString color = bgColor.valueF() < 0.6 ? "White" : "Black";
+        QString iconPath = QString(":/img/buttonIcons%1/%2")
+                .arg(color).arg(tool->getIconName());
+        buttonItem->setIcon(QIcon(iconPath));
+
         buttonItem->setFlags(Qt::ItemIsUserCheckable);
         QColor foregroundColor = this->palette().color(QWidget::foregroundRole());
         buttonItem->setTextColor(foregroundColor);
 
-        buttonItem->setText(CaptureButton::getTypeName(t));
-        buttonItem->setToolTip(CaptureButton::getTypeTooltip(t));
-        if (m_listButtons.contains(i)) {
+        buttonItem->setText(tool->getName());
+        buttonItem->setToolTip(tool->getDescription());
+        if (m_listButtons.contains(static_cast<int>(t))) {
             buttonItem->setCheckState(Qt::Checked);
         } else {
             buttonItem->setCheckState(Qt::Unchecked);
         }
+        tool->deleteLater();
     }
 }
 
 void ButtonListView::updateActiveButtons(QListWidgetItem *item) {
-    int buttonIndex = static_cast<int>(CaptureButton::getTypeByName(item->text()));
+    CaptureButton::ButtonType bType = m_buttonTypeByName[item->text()];
+    int buttonIndex = static_cast<int>(bType);
 
     if (item->checkState() == Qt::Checked) {
         m_listButtons.append(buttonIndex);
         std::sort(m_listButtons.begin(), m_listButtons.end());
-
     } else {
         m_listButtons.removeOne(buttonIndex);
     }
diff --git a/src/config/buttonlistview.h b/src/config/buttonlistview.h
index 0d595870..d062ef1e 100644
--- a/src/config/buttonlistview.h
+++ b/src/config/buttonlistview.h
@@ -19,10 +19,11 @@
 #define BUTTONLISTVIEW_H
 
 #include <QListWidget>
+#include "src/capture/capturebutton.h"
 
 class ButtonListView : public QListWidget {
 public:
-    ButtonListView(QWidget *parent= 0);
+    ButtonListView(QWidget *parent= nullptr);
 
 private slots:
     void updateActiveButtons(QListWidgetItem *);
@@ -33,6 +34,7 @@ protected:
 
 private:
     QList<int> m_listButtons;
+    QMap<QString, CaptureButton::ButtonType> m_buttonTypeByName;
 };
 
 #endif // BUTTONLISTVIEW_H
diff --git a/src/config/clickablelabel.cpp b/src/config/clickablelabel.cpp
index 0ed8575d..f38c2d41 100644
--- a/src/config/clickablelabel.cpp
+++ b/src/config/clickablelabel.cpp
@@ -1,5 +1,21 @@
-#include "clickablelabel.h"
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "clickablelabel.h"
 
 ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent) {
 
diff --git a/src/config/clickablelabel.h b/src/config/clickablelabel.h
index 9505206e..d23b6f8c 100644
--- a/src/config/clickablelabel.h
+++ b/src/config/clickablelabel.h
@@ -1,3 +1,20 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef CLICKABLELABEL_H
 #define CLICKABLELABEL_H
 
@@ -14,7 +31,7 @@ signals:
     void clicked();
 
 private:
-    void mousePressEvent (QMouseEvent *) ;
+    void mousePressEvent (QMouseEvent *);
 };
 
 #endif // CLICKABLELABEL_H
diff --git a/src/config/configwindow.h b/src/config/configwindow.h
index 28ae5fc4..bd0d5b42 100644
--- a/src/config/configwindow.h
+++ b/src/config/configwindow.h
@@ -28,7 +28,7 @@ class QListWidget;
 class ConfigWindow : public QWidget {
     Q_OBJECT
 public:
-    explicit ConfigWindow(QWidget *parent = 0);
+    explicit ConfigWindow(QWidget *parent = nullptr);
 
 protected:
     void keyPressEvent(QKeyEvent *);
diff --git a/src/config/filenameeditor.cpp b/src/config/filenameeditor.cpp
index 7daecb38..fb1147c0 100644
--- a/src/config/filenameeditor.cpp
+++ b/src/config/filenameeditor.cpp
@@ -17,6 +17,7 @@
 
 #include "filenameeditor.h"
 #include "src/utils/filenamehandler.h"
+#include "src/utils/confighandler.h"
 #include <QGridLayout>
 #include <QLineEdit>
 #include <QPushButton>
@@ -47,7 +48,7 @@ void FileNameEditor::initWidgets() {
 
     connect(m_nameEditor, &QLineEdit::textChanged, this,
             &FileNameEditor::showParsedPattern);
-    m_nameEditor->setText(m_nameHandler->getActualPattern());
+    m_nameEditor->setText(ConfigHandler().getFilenamePattern());
     m_outputLabel->setText(m_nameHandler->getParsedPattern());
 
     connect(m_saveButton, &QPushButton::clicked, this, &FileNameEditor::savePattern);
diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp
index 1b8fc2d1..86d5ce9f 100644
--- a/src/config/geneneralconf.cpp
+++ b/src/config/geneneralconf.cpp
@@ -1,7 +1,23 @@
-#include "geneneralconf.h"
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "geneneralconf.h"
+#include "src/utils/confighandler.h"
 #include <QVBoxLayout>
-#include <QSettings>
 #include <QCheckBox>
 
 GeneneralConf::GeneneralConf(QWidget *parent) : QFrame(parent) {
@@ -13,17 +29,17 @@ GeneneralConf::GeneneralConf(QWidget *parent) : QFrame(parent) {
 }
 
 void GeneneralConf::showHelpChanged(bool checked) {
-    QSettings().setValue("showHelp", checked);
+    ConfigHandler().setShowHelp(checked);
 }
 
 void GeneneralConf::showDesktopNotificationChanged(bool checked) {
-    QSettings().setValue("showDesktopNotification", checked);
+    ConfigHandler().setDesktopNotification(checked);
 }
 
 void GeneneralConf::initShowHelp() {
     QCheckBox *c = new QCheckBox(tr("Show help message"), this);
-    QSettings settings;
-    bool checked = settings.value("showHelp").toBool();
+    ConfigHandler config;
+    bool checked = config.getShowHelp();
     c->setChecked(checked);
     c->setToolTip(tr("Show the help message at the beginning "
                        "in the capture mode."));
@@ -34,8 +50,8 @@ void GeneneralConf::initShowHelp() {
 
 void GeneneralConf::initShowDesktopNotification() {
     QCheckBox *c = new QCheckBox(tr("Show desktop notifications"), this);
-    QSettings settings;
-    bool checked = settings.value("showDesktopNotification").toBool();
+    ConfigHandler config;
+    bool checked = config.getDesktopNotification();
     c->setChecked(checked);
     c->setToolTip(tr("Show desktop notifications"));
     m_layout->addWidget(c);
diff --git a/src/config/geneneralconf.h b/src/config/geneneralconf.h
index 98818699..3837d330 100644
--- a/src/config/geneneralconf.h
+++ b/src/config/geneneralconf.h
@@ -1,3 +1,20 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef GENENERALCONF_H
 #define GENENERALCONF_H
 
@@ -8,7 +25,7 @@ class QVBoxLayout;
 class GeneneralConf : public QFrame {
     Q_OBJECT
 public:
-    GeneneralConf(QWidget *parent = 0);
+    GeneneralConf(QWidget *parent = nullptr);
 
 private slots:
    void showHelpChanged(bool checked);
diff --git a/src/config/strftimechooserwidget.cpp b/src/config/strftimechooserwidget.cpp
index 0641d288..28ef34aa 100644
--- a/src/config/strftimechooserwidget.cpp
+++ b/src/config/strftimechooserwidget.cpp
@@ -1,3 +1,20 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #include "strftimechooserwidget.h"
 
 StrftimeChooserWidget::StrftimeChooserWidget(QWidget *parent) : QWidget(parent) {
diff --git a/src/config/strftimechooserwidget.h b/src/config/strftimechooserwidget.h
index 1fccdb0e..fb01e7fe 100644
--- a/src/config/strftimechooserwidget.h
+++ b/src/config/strftimechooserwidget.h
@@ -1,3 +1,20 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef STRFTIMECHOOSERWIDGET_H
 #define STRFTIMECHOOSERWIDGET_H
 
diff --git a/src/config/uicoloreditor.cpp b/src/config/uicoloreditor.cpp
index 6172eefe..3acfbe82 100644
--- a/src/config/uicoloreditor.cpp
+++ b/src/config/uicoloreditor.cpp
@@ -15,11 +15,11 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "src/utils/confighandler.h"
 #include "uicoloreditor.h"
 #include "clickablelabel.h"
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QSettings>
 #include <QComboBox>
 #include <QMap>
 
@@ -29,9 +29,9 @@ UIcolorEditor::UIcolorEditor(QWidget *parent) : QFrame(parent) {
     hLayout = new QHBoxLayout;
     vLayout = new QVBoxLayout;
 
-    QSettings settings;
-    m_uiColor = settings.value("uiColor").value<QColor>();
-    m_contrastColor = settings.value("contastUiColor").value<QColor>();
+    ConfigHandler config;
+    m_uiColor = config.getUIMainColor();
+    m_contrastColor = config.getUIContrastColor();
 
     initButtons();
     initColorWheel();
@@ -40,11 +40,11 @@ UIcolorEditor::UIcolorEditor(QWidget *parent) : QFrame(parent) {
 }
 // updateUIcolor updates the appearance of the buttons
 void UIcolorEditor::updateUIcolor() {
-    QSettings settings;
+    ConfigHandler config;
     if (m_lastButtonPressed == m_buttonMainColor) {
-        settings.setValue("uiColor", m_uiColor);
+        config.setUIMainColor(m_uiColor);
     } else {
-        settings.setValue("contastUiColor", m_contrastColor);
+        config.setUIContrastColor(m_contrastColor);
     }
 }
 // updateLocalColor updates the local button
@@ -54,9 +54,7 @@ void UIcolorEditor::updateLocalColor(const QColor c) {
     } else {
         m_contrastColor = c;
     }
-    QString style = CaptureButton::getStyle(c);
-    m_lastButtonPressed->setStyleSheet(style);
-    updateButtonIcon();
+    m_lastButtonPressed->setColor(c);
 }
 
 void UIcolorEditor::initColorWheel() {
@@ -103,7 +101,7 @@ void UIcolorEditor::initButtons() {
 
     m_buttonContrast = new CaptureButton(m_buttonIconType, frame2);
     m_buttonContrast->setIcon(QIcon());
-    m_buttonContrast->setStyleSheet(CaptureButton::getStyle(m_contrastColor));
+    m_buttonContrast->setColor(m_contrastColor);
     m_buttonContrast->move(m_buttonContrast->x() + extraSize/2,
                            m_buttonContrast->y() + extraSize/2);
 
@@ -129,10 +127,6 @@ void UIcolorEditor::initButtons() {
             this, [this]{ changeLastButton(m_buttonContrast); });
 }
 
-void UIcolorEditor::updateButtonIcon() {
-    m_lastButtonPressed->setIcon(CaptureButton::getIcon(m_buttonMainColor->getButtonType()));
-}
-
 // visual update for the selected button
 void UIcolorEditor::changeLastButton(CaptureButton *b) {
     if (m_lastButtonPressed != b) {
@@ -150,6 +144,6 @@ void UIcolorEditor::changeLastButton(CaptureButton *b) {
             m_labelContrast->setStyleSheet(styleSheet());
             m_labelMain->setStyleSheet(offStyle);
         }
-        b->setIcon(b->getIcon(m_buttonIconType));
+        b->setIcon(b->getIcon());
     }
 }
diff --git a/src/config/uicoloreditor.h b/src/config/uicoloreditor.h
index 3c4856dd..191d7d49 100644
--- a/src/config/uicoloreditor.h
+++ b/src/config/uicoloreditor.h
@@ -30,12 +30,11 @@ class ClickableLabel;
 class UIcolorEditor : public QFrame {
     Q_OBJECT
 public:
-    explicit UIcolorEditor(QWidget *parent = 0);
+    explicit UIcolorEditor(QWidget *parent = nullptr);
 
 private slots:
     void updateUIcolor();
     void updateLocalColor(const QColor);
-    void updateButtonIcon();
     void changeLastButton(CaptureButton *);
 
 private:
@@ -47,7 +46,7 @@ private:
     CaptureButton *m_lastButtonPressed;
     color_widgets::ColorWheel *m_colorWheel;
 
-    static const CaptureButton::Type m_buttonIconType = CaptureButton::Type::circle;
+    static const CaptureButton::ButtonType m_buttonIconType = CaptureButton::TYPE_CIRCLE;
 
     QHBoxLayout *hLayout;
     QVBoxLayout *vLayout;
diff --git a/src/controller.cpp b/src/controller.cpp
index 2b2c433f..5eba09c6 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -17,13 +17,13 @@
 
 #include "controller.h"
 #include "capture/capturewidget.h"
+#include "src/utils/confighandler.h"
 #include "infowindow.h"
 #include "config/configwindow.h"
 #include "capture/capturebutton.h"
 #include <QAction>
 #include <QApplication>
 #include <QMenu>
-#include <QSettings>
 #include <QFile>
 
 // Controller is the core component of Flameshot, creates the trayIcon and
@@ -41,7 +41,7 @@ Controller::Controller(QObject *parent) : QObject(parent),
     initDefaults();
     qApp->setQuitOnLastWindowClosed(false);
 
-    QString StyleSheet = CaptureButton::getStyle();
+    QString StyleSheet = CaptureButton::getGlobalStyleSheet();
     qApp->setStyleSheet(StyleSheet);
 
 }
@@ -90,33 +90,16 @@ void Controller::createTrayIcon() {
 
 // initDefaults inits the global config in the very first run of the program
 void Controller::initDefaults() {
-    QSettings settings;
-    //settings.setValue("initiated", false); // testing change
-    if (!settings.value("initiated").toBool()) {
-        settings.setValue("initiated", true);
-        settings.setValue("showHelp", true);
-        settings.setValue("showDesktopNotification", true);
-        settings.setValue("drawColor", QColor(Qt::red));
-        settings.setValue("uiColor", QColor(116, 0, 150));
-        settings.setValue("contastUiColor", QColor(86, 0, 120));
-
-        QList<int> buttons;
-        for (int i = 0; i < static_cast<int>(CaptureButton::Type::last); ++i) {
-            buttons << i;
-        }
-        settings.setValue("buttons", QVariant::fromValue(buttons));
-    } else {
-        // disabled buttons cleanup
-        int higherValue = static_cast<int>(CaptureButton::Type::last) - 1;
-        QList<int> buttons = settings.value("buttons").value<QList<int> >();
-
-        QMutableListIterator<int> i(buttons);
-        while (i.hasNext()) {
-            if (i.next() > higherValue) {
-                i.remove();
-            }
-        }
-        settings.setValue("buttons", QVariant::fromValue(buttons));
+    ConfigHandler config;
+    //config.setNotInitiated();
+    if (!config.initiatedIsSet()) {
+        config.setInitiated();
+        config.setShowHelp(true);
+        config.setDesktopNotification(true);
+        config.setDrawColor(QColor(Qt::red));
+        config.setUIMainColor(QColor(116, 0, 150));
+        config.setUIContrastColor(QColor(86, 0, 120));
+        config.setAllTheButtons();
     }
 }
 
@@ -157,7 +140,7 @@ void Controller::openInfoWindow() {
 }
 
 void Controller::showDesktopNotification(QString msg) {
-    bool showMessages = QSettings().value("showDesktopNotification").toBool();
+    bool showMessages = ConfigHandler().getDesktopNotification();
     if (showMessages && m_trayIcon->supportsMessages()) {
         m_trayIcon->showMessage("Flameshot Info", msg);
     }
diff --git a/src/controller.h b/src/controller.h
index 59940874..26573c10 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -31,11 +31,13 @@ class InfoWindow;
 
 class Controller : public QObject {
     Q_OBJECT
+
 public:
-    explicit Controller(QObject *parent = 0);
+    explicit Controller(QObject *parent = nullptr);
 
     QString saveScreenshot(bool toClipboard = false);
     QString saveScreenshot(QString path, bool toClipboard = false);
+
 public slots:
     QPointer<CaptureWidget> createCapture(bool enableSaveWindow = true);
     void createVisualCapture(bool enableSaveWindow = true);
diff --git a/src/flameshotdbusadapter.cpp b/src/flameshotdbusadapter.cpp
index e2fe7cec..403e4e66 100644
--- a/src/flameshotdbusadapter.cpp
+++ b/src/flameshotdbusadapter.cpp
@@ -16,7 +16,7 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "flameshotdbusadapter.h"
-#include <QSettings>
+#include "src/utils/confighandler.h"
 
 FlameshotDBusAdapter::FlameshotDBusAdapter(Controller *parent)
     : QDBusAbstractAdaptor(parent)
@@ -37,7 +37,7 @@ void FlameshotDBusAdapter::openCapture() {
 }
 
 void FlameshotDBusAdapter::openCaptureWithPath(QString path) {
-    QSettings().setValue("savePath", path);
+    ConfigHandler().setSavePath(path);
     parent()->createVisualCapture(false);
 }
 
diff --git a/src/flameshotdbusadapter.h b/src/flameshotdbusadapter.h
index 63d6b02d..5b53de70 100644
--- a/src/flameshotdbusadapter.h
+++ b/src/flameshotdbusadapter.h
@@ -27,7 +27,7 @@ class FlameshotDBusAdapter : public QDBusAbstractAdaptor
     Q_CLASSINFO("D-Bus Interface", "org.dharkael.Flameshot")
 
 public:
-    FlameshotDBusAdapter(Controller *parent = 0);
+    FlameshotDBusAdapter(Controller *parent = nullptr);
     virtual ~FlameshotDBusAdapter();
     inline Controller *parent() const;
 
diff --git a/src/infowindow.h b/src/infowindow.h
index 7cead82a..5a56a8fc 100644
--- a/src/infowindow.h
+++ b/src/infowindow.h
@@ -25,7 +25,7 @@ class QVBoxLayout;
 class InfoWindow : public QWidget {
     Q_OBJECT
 public:
-    explicit InfoWindow(QWidget *parent = 0);
+    explicit InfoWindow(QWidget *parent = nullptr);
 
 protected:
     void keyPressEvent(QKeyEvent *);
diff --git a/src/main.cpp b/src/main.cpp
index 72eeb9ed..8a5676af 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,6 @@
 #include <QDBusMessage>
 #include <QCommandLineParser>
 #include <QDir>
-#include <QDebug>
 
 int main(int argc, char *argv[]) {
     QTranslator translator;
diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
new file mode 100644
index 00000000..111e833d
--- /dev/null
+++ b/src/utils/confighandler.cpp
@@ -0,0 +1,149 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "confighandler.h"
+#include <QSettings>
+
+ConfigHandler::ConfigHandler(QObject *parent) : QObject(parent) {
+    m_settings = new QSettings(this);
+}
+
+QList<CaptureButton::ButtonType> ConfigHandler::getButtons() {
+    QList<int> buttons = m_settings->value("buttons").value<QList<int> >();
+    bool modified = normalizeButtons(buttons);
+    if (modified) {
+        m_settings->setValue("buttons", QVariant::fromValue(buttons));
+    }
+    return fromIntToButton(buttons);
+}
+
+void ConfigHandler::setButtons(const QList<CaptureButton::ButtonType> &buttons) {
+    QList<int> l = fromButtonToInt(buttons);
+    normalizeButtons(l);
+    m_settings->setValue("buttons", QVariant::fromValue(l));
+}
+
+QString ConfigHandler::getSavePath() {
+    return m_settings->value("savePath").toString();
+}
+
+void ConfigHandler::setSavePath(const QString &savePath) {
+    m_settings->setValue("savePath", savePath);
+}
+
+QColor ConfigHandler::getUIMainColor() {
+    return m_settings->value("uiColor").value<QColor>();
+}
+
+void ConfigHandler::setUIMainColor(const QColor &c) {
+    m_settings->setValue("uiColor", c);
+}
+
+QColor ConfigHandler::getUIContrastColor() {
+    return m_settings->value("contastUiColor").value<QColor>();
+}
+
+void ConfigHandler::setUIContrastColor(const QColor &c) {
+    m_settings->setValue("contastUiColor", c);
+}
+
+QColor ConfigHandler::getDrawColor() {
+    return m_settings->value("drawColor").value<QColor>();
+}
+
+void ConfigHandler::setDrawColor(const QColor &c) {
+    m_settings->setValue("drawColor", c);
+}
+
+bool ConfigHandler::getShowHelp() {
+    return m_settings->value("showHelp").toBool();
+}
+
+void ConfigHandler::setShowHelp(const bool showHelp) {
+    m_settings->setValue("showHelp", showHelp);
+}
+
+bool ConfigHandler::getDesktopNotification() {
+    return m_settings->value("showDesktopNotification").toBool();
+}
+
+void ConfigHandler::setDesktopNotification(const bool showDesktopNotification) {
+    m_settings->setValue("showDesktopNotification", showDesktopNotification);
+}
+
+QString ConfigHandler::getFilenamePattern() {
+    return m_settings->value("filenamePattern").toString();
+}
+
+void ConfigHandler::setFilenamePattern(const QString &pattern) {
+    return m_settings->setValue("filenamePattern", pattern);
+}
+
+bool ConfigHandler::initiatedIsSet() {
+    return m_settings->value("initiated").toBool();
+}
+
+void ConfigHandler::setInitiated() {
+    m_settings->setValue("initiated", true);
+}
+
+void ConfigHandler::setNotInitiated() {
+    m_settings->setValue("initiated", false);
+}
+
+void ConfigHandler::setAllTheButtons() {
+    QList<int> buttons;
+    auto listTypes = CaptureButton::getIterableButtonTypes();
+    for (CaptureButton::ButtonType t: listTypes) {
+        buttons << static_cast<int>(t);
+    }
+    m_settings->setValue("buttons", QVariant::fromValue(buttons));
+}
+
+bool ConfigHandler::normalizeButtons(QList<int> &buttons) {
+    auto listTypes = CaptureButton::getIterableButtonTypes();
+    QList<int> listTypesInt;
+    for(auto i: listTypes) listTypesInt << static_cast<int>(i);
+
+    bool hasChanged = false;
+    QMutableListIterator<int> i(buttons);
+    while (i.hasNext()) {
+        if (!listTypesInt.contains(i.next())) {
+            i.remove();
+            hasChanged = true;
+        }
+    }
+    return hasChanged;
+}
+
+QList<CaptureButton::ButtonType> ConfigHandler::fromIntToButton(
+        const QList<int> &l)
+{
+    QList<CaptureButton::ButtonType> buttons;
+    for(auto i: l)
+        buttons << static_cast<CaptureButton::ButtonType>(i);
+    return buttons;
+}
+
+QList<int> ConfigHandler::fromButtonToInt(
+        const QList<CaptureButton::ButtonType> &l)
+{
+    QList<int> buttons;
+    for(auto i: l)
+        buttons << static_cast<int>(i);
+    return buttons;
+}
diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h
new file mode 100644
index 00000000..c266714b
--- /dev/null
+++ b/src/utils/confighandler.h
@@ -0,0 +1,75 @@
+// Copyright 2017 Alejandro Sirgo Rica
+//
+// This file is part of Flameshot.
+//
+//     Flameshot is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+//
+//     Flameshot is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+//
+//     You should have received a copy of the GNU General Public License
+//     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CONFIGHANDLER_H
+#define CONFIGHANDLER_H
+
+#include "src/capture/capturebutton.h"
+#include <QObject>
+#include <QList>
+
+class QSettings;
+
+class ConfigHandler : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ConfigHandler(QObject *parent = nullptr);
+
+    QList<CaptureButton::ButtonType> getButtons();
+    void setButtons(const QList<CaptureButton::ButtonType> &);
+
+    QString getSavePath();
+    void setSavePath(const QString &);
+
+    QColor getUIMainColor();
+    void setUIMainColor(const QColor &);
+
+    QColor getUIContrastColor();
+    void setUIContrastColor(const QColor &);
+
+    QColor getDrawColor();
+    void setDrawColor(const QColor &);
+
+    bool getShowHelp();
+    void setShowHelp(const bool);
+
+    bool getDesktopNotification();
+    void setDesktopNotification(const bool);
+
+    QString getFilenamePattern();
+    void setFilenamePattern(const QString &);
+
+    bool initiatedIsSet();
+    void setInitiated();
+    void setNotInitiated();
+
+    void setAllTheButtons();
+
+private:
+    QSettings *m_settings;
+
+    bool normalizeButtons(QList<int> &);
+
+    QList<CaptureButton::ButtonType> fromIntToButton(const QList<int> &l);
+    QList<int> fromButtonToInt(const QList<CaptureButton::ButtonType> &l);
+
+
+
+};
+
+#endif // CONFIGHANDLER_H
diff --git a/src/utils/filenamehandler.cpp b/src/utils/filenamehandler.cpp
index 1c05a563..88b828de 100644
--- a/src/utils/filenamehandler.cpp
+++ b/src/utils/filenamehandler.cpp
@@ -16,20 +16,18 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "filenamehandler.h"
+#include "src/utils/confighandler.h"
 #include <ctime>
 #include <locale>
-#include <QSettings>
+#include <QStandardPaths>
+#include <QDir>
 
 FileNameHandler::FileNameHandler(QObject *parent) : QObject(parent) {
     std::locale::global(std::locale(std::locale("").name()));
 }
 
-QString FileNameHandler::getActualPattern() {
-    return QSettings().value("filenamePattern").toString();
-}
-
 QString FileNameHandler::getParsedPattern() {
-    return parseFilename(getActualPattern());
+    return parseFilename(ConfigHandler().getFilenamePattern());
 }
 
 QString FileNameHandler::parseFilename(const QString &name) {
@@ -50,7 +48,40 @@ QString FileNameHandler::parseFilename(const QString &name) {
 }
 
 void FileNameHandler::savePattern(const QString &pattern) {
-    QSettings().setValue("filenamePattern", pattern);
+    ConfigHandler().setFilenamePattern(pattern);
+}
+
+QString FileNameHandler::getAbsoluteSavePath() {
+    ConfigHandler config;
+    QString savePath = config.getSavePath();
+    bool changed = false;
+    if (savePath.isEmpty() || !QDir(savePath).exists() || !QFileInfo(savePath).isWritable()) {
+        changed = true;
+        savePath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+        if (savePath.isEmpty()) {
+            savePath = QDir::currentPath();
+        }
+    }
+    if(changed) {
+        config.setSavePath(savePath);
+    }
+    QString tempName = "/"+ FileNameHandler().getParsedPattern();
+    // find unused name adding _n where n is a number
+    QFileInfo checkFile(savePath + tempName + ".png");
+    if (checkFile.exists()) {
+        tempName += "_";
+        int i = 1;
+        while (true) {
+            checkFile.setFile(
+                        savePath + tempName + QString::number(i) + ".png");
+            if (!checkFile.exists()) {
+                tempName += QString::number(i);
+                break;
+            }
+            ++i;
+        }
+    }
+    return savePath + tempName + ".png";
 }
 
 QString FileNameHandler::charArrToQString(const char *c) {
diff --git a/src/utils/filenamehandler.h b/src/utils/filenamehandler.h
index ab734ba9..2b3f19ae 100644
--- a/src/utils/filenamehandler.h
+++ b/src/utils/filenamehandler.h
@@ -27,7 +27,6 @@ class FileNameHandler : public QObject
 public:
     explicit FileNameHandler(QObject *parent = nullptr);
 
-    QString getActualPattern();
     QString getParsedPattern();
     QString parseFilename(const QString &name);
 
@@ -35,6 +34,7 @@ public:
 
 public slots:
     void savePattern(const QString &pattern);
+    QString getAbsoluteSavePath();
 
 private:
     //using charArr = char[MAX_CHARACTERS];