Index: effects/showfps/showfps.h
===================================================================
--- effects/showfps/showfps.h
+++ effects/showfps/showfps.h
@@ -31,6 +31,11 @@
     Q_PROPERTY(int textAlign READ configuredTextAlign)
     Q_PROPERTY(QFont textFont READ configuredTextFont)
     Q_PROPERTY(QColor textColor READ configuredTextColor)
+    Q_PROPERTY(bool showGraph READ configuredShowGraph)
+    Q_PROPERTY(bool showNoBenchmark READ configuredShowNoBenchmark)
+    Q_PROPERTY(bool colorizeText READ configuredColorizeText)
+    Q_PROPERTY(bool forcePrimaryScreen READ configuredForcePrimaryScreen)
+
 public:
     ShowFpsEffect();
     void reconfigure(ReconfigureFlags) override;
@@ -62,6 +67,18 @@
     QColor configuredTextColor() const {
         return textColor;
     }
+    bool configuredShowGraph() const {
+        return m_showGraph;
+    }
+    bool configuredShowNoBenchmark() const {
+        return m_showNoBenchmark;
+    }
+    bool configuredColorizeText() const {
+        return m_colorizeText;
+    }
+    bool configuredForcePrimaryScreen() const {
+        return m_forcePrimaryScreen;
+    }
 private:
     void paintGL(int fps, const QMatrix4x4 &projectionMatrix);
 #ifdef KWIN_HAVE_XRENDER_COMPOSITING
@@ -81,6 +98,12 @@
     qint64 frames[ MAX_FPS ]; // the time when the frame was done
     int frames_pos; // position in the queue
     double alpha;
+    bool m_showNoBenchmark; 
+    bool m_showGraph;
+    bool m_colorizeText;
+    bool m_forcePrimaryScreen;
+    qreal detectedMaxFps;
+    int maxFpsSoFar;
     int x;
     int y;
     QRect fps_rect;
Index: effects/showfps/showfps.cpp
===================================================================
--- effects/showfps/showfps.cpp
+++ effects/showfps/showfps.cpp
@@ -25,6 +25,9 @@
 #include <QPainter>
 #include <QVector2D>
 #include <QPalette>
+#include <QScreen>
+#include <QApplication>
+#include <QGuiApplication>
 
 #include <cmath>
 
@@ -50,8 +53,19 @@
             i < MAX_FPS;
             ++i)
         frames[ i ] = 0;
-    m_noBenchmark->setAlignment(Qt::AlignTop | Qt::AlignRight);
-    m_noBenchmark->setText(i18n("This effect is not a benchmark"));
+    // detect highest monitor refresh rate
+    detectedMaxFps = 0.0;
+    int numMonitors = QApplication::screens().count();
+    for (int i = 0; i < numMonitors; i++) {
+        QScreen *screen = QApplication::screens().at(i);
+        if (screen->refreshRate() > detectedMaxFps){
+            detectedMaxFps = screen->refreshRate();
+        }
+    }
+    if (m_showNoBenchmark) {
+        m_noBenchmark->setAlignment(Qt::AlignTop | Qt::AlignRight);
+        m_noBenchmark->setText(i18n("This effect is not a benchmark"));
+    }
     reconfigure(ReconfigureAll);
 }
 
@@ -61,7 +75,16 @@
     alpha = ShowFpsConfig::alpha();
     x = ShowFpsConfig::x();
     y = ShowFpsConfig::y();
-    const QSize screenSize = effects->virtualScreenSize();
+    m_showNoBenchmark = ShowFpsConfig::showNoBenchmark();
+    m_showGraph = ShowFpsConfig::showGraph();
+    m_colorizeText = ShowFpsConfig::colorizeText();
+    m_forcePrimaryScreen = ShowFpsConfig::forcePrimaryScreen();
+    maxFpsSoFar = 0; // reset to 0
+    QSize screenSize;
+    if (m_forcePrimaryScreen) // useful for multimonitor setups
+        screenSize = QGuiApplication::primaryScreen()->size();
+    else
+        screenSize = effects->virtualScreenSize();
     if (x == -10000)   // there's no -0 :(
         x = screenSize.width() - 2 * NUM_PAINTS - FPS_WIDTH;
     else if (x < 0)
@@ -150,8 +173,6 @@
             ++i)
         if (abs(lastTimestamp - frames[ i ]) < 1000)
             ++fps; // count all frames in the last second
-    if (fps > MAX_TIME)
-        fps = MAX_TIME; // keep it the same height
     if (effects->isOpenGLCompositing()) {
         paintGL(fps, data.projectionMatrix());
         glFinish(); // make sure all rendering is done
@@ -165,7 +186,9 @@
     if (effects->compositingType() == QPainterCompositing) {
         paintQPainter(fps);
     }
-    m_noBenchmark->render(infiniteRegion(), 1.0, alpha);
+    if (m_showNoBenchmark) {
+        m_noBenchmark->render(infiniteRegion(), 1.0, alpha);
+    }
 }
 
 void ShowFpsEffect::paintGL(int fps, const QMatrix4x4 &projectionMatrix)
@@ -180,54 +203,55 @@
     binder.shader()->setUniform(GLShader::ModelViewProjectionMatrix, projectionMatrix);
     GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
     vbo->reset();
-    QColor color(255, 255, 255);
-    color.setAlphaF(alpha);
-    vbo->setColor(color);
-    QVector<float> verts;
-    verts.reserve(12);
-    verts << x + 2 * NUM_PAINTS + FPS_WIDTH << y;
-    verts << x << y;
-    verts << x << y + MAX_TIME;
-    verts << x << y + MAX_TIME;
-    verts << x + 2 * NUM_PAINTS + FPS_WIDTH << y + MAX_TIME;
-    verts << x + 2 * NUM_PAINTS + FPS_WIDTH << y;
-    vbo->setData(6, 2, verts.constData(), nullptr);
-    vbo->render(GL_TRIANGLES);
-    y += MAX_TIME; // paint up from the bottom
-    color.setRed(0);
-    color.setGreen(0);
-    vbo->setColor(color);
-    verts.clear();
-    verts << x + FPS_WIDTH << y - fps;
-    verts << x << y - fps;
-    verts << x << y;
-    verts << x << y;
-    verts << x + FPS_WIDTH << y;
-    verts << x + FPS_WIDTH << y - fps;
-    vbo->setData(6, 2, verts.constData(), nullptr);
-    vbo->render(GL_TRIANGLES);
-
-
-    color.setBlue(0);
-    vbo->setColor(color);
-    QVector<float> vertices;
-    for (int i = 10;
-            i < MAX_TIME;
-            i += 10) {
-        vertices << x << y - i;
-        vertices << x + FPS_WIDTH << y - i;
-    }
-    vbo->setData(vertices.size() / 2, 2, vertices.constData(), nullptr);
-    vbo->render(GL_LINES);
-    x += FPS_WIDTH;
+    if (m_showGraph) {
+        QColor color(255, 255, 255);
+        color.setAlphaF(alpha);
+        vbo->setColor(color);
+        QVector<float> verts;
+        verts.reserve(12);
+        verts << x + 2 * NUM_PAINTS + FPS_WIDTH << y;
+        verts << x << y;
+        verts << x << y + MAX_TIME;
+        verts << x << y + MAX_TIME;
+        verts << x + 2 * NUM_PAINTS + FPS_WIDTH << y + MAX_TIME;
+        verts << x + 2 * NUM_PAINTS + FPS_WIDTH << y;
+        vbo->setData(6, 2, verts.constData(), nullptr);
+        vbo->render(GL_TRIANGLES);
+        y += MAX_TIME; // paint up from the bottom
+        color.setRed(0);
+        color.setGreen(0);
+        vbo->setColor(color);
+        verts.clear();
+        verts << x + FPS_WIDTH << y - fps;
+        verts << x << y - fps;
+        verts << x << y;
+        verts << x << y;
+        verts << x + FPS_WIDTH << y;
+        verts << x + FPS_WIDTH << y - fps;
+        vbo->setData(6, 2, verts.constData(), nullptr);
+        vbo->render(GL_TRIANGLES);
 
-    // Paint FPS graph
-    paintFPSGraph(x, y);
-    x += NUM_PAINTS;
 
-    // Paint amount of rendered pixels graph
-    paintDrawSizeGraph(x, y);
+        color.setBlue(0);
+        vbo->setColor(color);
+        QVector<float> vertices;
+        for (int i = 10;
+                i < MAX_TIME;
+                i += 10) {
+            vertices << x << y - i;
+            vertices << x + FPS_WIDTH << y - i;
+        }
+        vbo->setData(vertices.size() / 2, 2, vertices.constData(), nullptr);
+        vbo->render(GL_LINES);
+        x += FPS_WIDTH;
 
+        // Paint FPS graph
+        paintFPSGraph(x, y);
+        x += NUM_PAINTS;
+
+        // Paint amount of rendered pixels graph
+        paintDrawSizeGraph(x, y);
+    }
     // Paint FPS numerical value
     if (fpsTextRect.isValid()) {
         fpsText.reset(new GLTexture(fpsTextImage(fps)));
@@ -253,45 +277,46 @@
 */
 void ShowFpsEffect::paintXrender(int fps)
 {
-    xcb_pixmap_t pixmap = xcb_generate_id(xcbConnection());
-    xcb_create_pixmap(xcbConnection(), 32, pixmap, x11RootWindow(), FPS_WIDTH, MAX_TIME);
-    XRenderPicture p(pixmap, 32);
-    xcb_free_pixmap(xcbConnection(), pixmap);
-    xcb_render_color_t col;
-    col.alpha = int(alpha * 0xffff);
-    col.red = int(alpha * 0xffff);   // white
-    col.green = int(alpha * 0xffff);
-    col.blue = int(alpha * 0xffff);
-    xcb_rectangle_t rect = {0, 0, FPS_WIDTH, MAX_TIME};
-    xcb_render_fill_rectangles(xcbConnection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
-    col.red = 0; // blue
-    col.green = 0;
-    col.blue = int(alpha * 0xffff);
-    rect.y = MAX_TIME - fps;
-    rect.width = FPS_WIDTH;
-    rect.height = fps;
-    xcb_render_fill_rectangles(xcbConnection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
-    col.red = 0; // black
-    col.green = 0;
-    col.blue = 0;
-    QVector<xcb_rectangle_t> rects;
-    for (int i = 10;
-            i < MAX_TIME;
-            i += 10) {
-        xcb_rectangle_t rect = {0, int16_t(MAX_TIME - i), uint16_t(FPS_WIDTH), 1};
-        rects << rect;
-    }
-    xcb_render_fill_rectangles(xcbConnection(), XCB_RENDER_PICT_OP_SRC, p, col, rects.count(), rects.constData());
-    xcb_render_composite(xcbConnection(), alpha != 1.0 ? XCB_RENDER_PICT_OP_OVER : XCB_RENDER_PICT_OP_SRC, p, XCB_RENDER_PICTURE_NONE,
-                         effects->xrenderBufferPicture(), 0, 0, 0, 0, x, y, FPS_WIDTH, MAX_TIME);
-
+    if (m_showGraph) {
+        xcb_pixmap_t pixmap = xcb_generate_id(xcbConnection());
+        xcb_create_pixmap(xcbConnection(), 32, pixmap, x11RootWindow(), FPS_WIDTH, MAX_TIME);
+        XRenderPicture p(pixmap, 32);
+        xcb_free_pixmap(xcbConnection(), pixmap);
+        xcb_render_color_t col;
+        col.alpha = int(alpha * 0xffff);
+        col.red = int(alpha * 0xffff);   // white
+        col.green = int(alpha * 0xffff);
+        col.blue = int(alpha * 0xffff);
+        xcb_rectangle_t rect = {0, 0, FPS_WIDTH, MAX_TIME};
+        xcb_render_fill_rectangles(xcbConnection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
+        col.red = 0; // blue
+        col.green = 0;
+        col.blue = int(alpha * 0xffff);
+        rect.y = MAX_TIME - fps;
+        rect.width = FPS_WIDTH;
+        rect.height = fps;
+        xcb_render_fill_rectangles(xcbConnection(), XCB_RENDER_PICT_OP_SRC, p, col, 1, &rect);
+        col.red = 0; // black
+        col.green = 0;
+        col.blue = 0;
+        QVector<xcb_rectangle_t> rects;
+        for (int i = 10;
+                i < MAX_TIME;
+                i += 10) {
+            xcb_rectangle_t rect = {0, int16_t(MAX_TIME - i), uint16_t(FPS_WIDTH), 1};
+            rects << rect;
+        }
+        xcb_render_fill_rectangles(xcbConnection(), XCB_RENDER_PICT_OP_SRC, p, col, rects.count(), rects.constData());
+        xcb_render_composite(xcbConnection(), alpha != 1.0 ? XCB_RENDER_PICT_OP_OVER : XCB_RENDER_PICT_OP_SRC, p, XCB_RENDER_PICTURE_NONE,
+                            effects->xrenderBufferPicture(), 0, 0, 0, 0, x, y, FPS_WIDTH, MAX_TIME);
 
-    // Paint FPS graph
-    paintFPSGraph(x + FPS_WIDTH, y);
 
-    // Paint amount of rendered pixels graph
-    paintDrawSizeGraph(x + FPS_WIDTH + MAX_TIME, y);
+        // Paint FPS graph
+        paintFPSGraph(x + FPS_WIDTH, y);
 
+        // Paint amount of rendered pixels graph
+        paintDrawSizeGraph(x + FPS_WIDTH + MAX_TIME, y);
+    }
     // Paint FPS numerical value
     if (fpsTextRect.isValid()) {
         QImage textImg(fpsTextImage(fps));
@@ -308,27 +333,28 @@
     QPainter *painter = effects->scenePainter();
     painter->save();
 
-    QColor color(255, 255, 255);
-    color.setAlphaF(alpha);
-
-    painter->setCompositionMode(QPainter::CompositionMode_SourceOver);
-    painter->fillRect(x, y, 2 * NUM_PAINTS + FPS_WIDTH, MAX_TIME, color);
-    color.setRed(0);
-    color.setGreen(0);
-    painter->fillRect(x, y + MAX_TIME - fps, FPS_WIDTH, fps, color);
+    if (m_showGraph) {
+        QColor color(255, 255, 255);
+        color.setAlphaF(alpha);
 
-    color.setBlue(0);
-    for (int i = 10; i < MAX_TIME; i += 10) {
-        painter->setPen(color);
-        painter->drawLine(x, y + MAX_TIME - i, x + FPS_WIDTH, y + MAX_TIME - i);
-    }
+        painter->setCompositionMode(QPainter::CompositionMode_SourceOver);
+        painter->fillRect(x, y, 2 * NUM_PAINTS + FPS_WIDTH, MAX_TIME, color);
+        color.setRed(0);
+        color.setGreen(0);
+        painter->fillRect(x, y + MAX_TIME - fps, FPS_WIDTH, fps, color);
 
-    // Paint FPS graph
-    paintFPSGraph(x + FPS_WIDTH, y + MAX_TIME - 1);
+        color.setBlue(0);
+        for (int i = 10; i < MAX_TIME; i += 10) {
+            painter->setPen(color);
+            painter->drawLine(x, y + MAX_TIME - i, x + FPS_WIDTH, y + MAX_TIME - i);
+        }
 
-    // Paint amount of rendered pixels graph
-    paintDrawSizeGraph(x + FPS_WIDTH + NUM_PAINTS, y + MAX_TIME - 1);
+        // Paint FPS graph
+        paintFPSGraph(x + FPS_WIDTH, y + MAX_TIME - 1);
 
+        // Paint amount of rendered pixels graph
+        paintDrawSizeGraph(x + FPS_WIDTH + NUM_PAINTS, y + MAX_TIME - 1);
+    }
     // Paint FPS numerical value
     painter->setPen(Qt::black);
     painter->drawText(fpsTextRect, textAlign, QString::number(fps));
@@ -531,7 +557,25 @@
     im.fill(Qt::transparent);
     QPainter painter(&im);
     painter.setFont(textFont);
-    painter.setPen(textColor);
+    QColor col = textColor;
+    if (detectedMaxFps > 0) {
+        fps = std::min(fps, qRound(detectedMaxFps));
+    }
+    if (fps > maxFpsSoFar) {
+        maxFpsSoFar = fps; // keep track of highest fps so far
+    }
+    if (m_colorizeText) {
+        if (fps >= maxFpsSoFar / 2) {
+            col = QColor(0, 255, 0); // green
+        } else if (fps >= maxFpsSoFar / 3) {
+            col = QColor(255, 255, 0); // yellow
+        } else if (fps >= maxFpsSoFar / 4) {
+            col = QColor(255, 0, 0); // red
+        } else {
+            col = QColor(0, 0, 0); // black
+        }
+    }
+    painter.setPen(col);
     painter.drawText(QRect(0, 0, 100, 100), textAlign, QString::number(fps));
     painter.end();
     return im;
Index: effects/showfps/showfps.kcfg
===================================================================
--- effects/showfps/showfps.kcfg
+++ effects/showfps/showfps.kcfg
@@ -8,6 +8,9 @@
         <entry name="TextPosition" type="Int">
             <default>0</default>
         </entry>
+        <entry name="ForcePrimaryScreen" type="Bool">
+            <default>false</default>
+        </entry>
         <entry name="TextFont" type="Font"/>
         <entry name="TextColor" type="Color">
             <default>invalid</default>
@@ -24,5 +27,14 @@
         <entry name="Y" type="Int">
             <default>0</default>
         </entry>
+        <entry name="ShowGraph" type="Bool">
+            <default>true</default>
+        </entry>
+        <entry name="ShowNoBenchmark" type="Bool">
+            <default>true</default>
+        </entry>
+        <entry name="ColorizeText" type="Bool">
+            <default>false</default>
+        </entry>
     </group>
 </kcfg>
Index: effects/showfps/showfps_config.ui
===================================================================
--- effects/showfps/showfps_config.ui
+++ effects/showfps/showfps_config.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>356</width>
-    <height>180</height>
+    <height>250</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -71,6 +71,26 @@
        </widget>
       </item>
       <item row="1" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Draw screen:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy">
+         <cstring>kcfg_ForcePrimaryScreen</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+        <widget class="QCheckBox" name="kcfg_ForcePrimaryScreen">
+        <property name="text">
+            <string>Primary</string>
+        </property>
+        </widget>
+      </item>
+      <item row="2" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>Text font:</string>
@@ -80,7 +100,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+      <item row="2" column="1">
        <widget class="KFontRequester" name="kcfg_TextFont">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -90,7 +110,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Text color:</string>
@@ -103,7 +123,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="3" column="1">
        <widget class="KColorButton" name="kcfg_TextColor">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -113,7 +133,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
+      <item row="5" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Text alpha:</string>
@@ -126,7 +146,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
+      <item row="5" column="1">
        <widget class="QDoubleSpinBox" name="kcfg_TextAlpha">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -148,6 +168,66 @@
         </property>
        </widget>
       </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Show graph:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy">
+         <cstring>kcfg_ShowGraph</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
+        <widget class="QCheckBox" name="kcfg_ShowGraph">
+        <property name="text">
+            <string>Show frametime graph</string>
+        </property>
+        </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Show Message:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy">
+         <cstring>kcfg_ShowNoBenchmark</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1">
+        <widget class="QCheckBox" name="kcfg_ShowNoBenchmark">
+        <property name="text">
+            <string>Show "not a benchmark" message</string>
+        </property>
+        </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Colorize Text:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="buddy">
+         <cstring>kcfg_ColorizeText</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="1">
+        <widget class="QCheckBox" name="kcfg_ColorizeText">
+        <property name="text">
+            <string>Color text by value (green > yellow > red)</string>
+        </property>
+        </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -172,4 +252,4 @@
  </customwidgets>
  <resources/>
  <connections/>
-</ui>
+</ui>
\ No newline at end of file