diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index fa3a0a3..e8d6221 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -1,336 +1,336 @@
 /*
  *  Copyright 2019 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2 or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.12
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 3.0 as PlasmaComponents
 import org.kde.draganddrop 2.0 as DragDrop
 
 import "launcher" as Launcher
 
 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager 
 
 import org.kde.phone.homescreen 1.0
 
 Item {
     id: root
     width: 640
     height: 480
 
     property Item toolBox
 
 //BEGIN functions
     //Autoscroll related functions
     function scrollUp() {
         autoScrollTimer.scrollDown = false;
         autoScrollTimer.running = true;
         scrollUpIndicator.opacity = 1;
         scrollDownIndicator.opacity = 0;
     }
 
     function scrollDown() {
         autoScrollTimer.scrollDown = true;
         autoScrollTimer.running = true;
         scrollUpIndicator.opacity = 0;
         scrollDownIndicator.opacity = 1;
     }
 
     function stopScroll() {
         autoScrollTimer.running = false;
         scrollUpIndicator.opacity = 0;
         scrollDownIndicator.opacity = 0;
     }
 
     function recalculateMaxFavoriteCount() {
         if (!componentComplete) {
             return;
         }
 
         plasmoid.nativeInterface.applicationListModel.maxFavoriteCount = Math.floor(Math.min(width, height) / launcher.cellWidth);
     }
 //END functions
 
 
     property bool componentComplete: false
     onWidthChanged: recalculateMaxFavoriteCount()
     onHeightChanged:recalculateMaxFavoriteCount()
     Component.onCompleted: {
         componentComplete = true;
         recalculateMaxFavoriteCount()
     }
 
     Timer {
         id: autoScrollTimer
         property bool scrollDown: true
         repeat: true
         interval: 1500
         onTriggered: {
             scrollAnim.to = scrollDown ?
             //Scroll down
                 Math.min(mainFlickable.contentItem.height - root.height, mainFlickable.contentY + root.height/2) :
             //Scroll up
                 Math.max(0, mainFlickable.contentY - root.height/2);
 
             scrollAnim.running = true;
         }
     }
 
     Connections {
         target: plasmoid
         onEditModeChanged: {
             appletsLayout.editMode = plasmoid.editMode
         }
     }
 
     FeedbackWindow {
         id: feedbackWindow
     }
     SequentialAnimation {
         id: clickFedbackAnimation
         property Item target
         NumberAnimation {
             target: clickFedbackAnimation.target
             properties: "scale"
             to: 2
             duration: units.longDuration
             easing.type: Easing.InOutQuad
         }
         PauseAnimation {
             duration: units.shortDuration
         }
         NumberAnimation {
             target: clickFedbackAnimation.target
             properties: "scale"
             to: 1
             duration: units.longDuration
             easing.type: Easing.InOutQuad
         }
     }
 
     Launcher.LauncherDragManager {
         id: launcherDragManager
         anchors.fill: parent
         z: 2
         appletsLayout: appletsLayout
         launcherGrid: launcher
         favoriteStrip: favoriteStrip
     }
 
     Flickable {
         id: mainFlickable
         width: parent.width
         anchors {
             fill: parent
             topMargin: plasmoid.availableScreenRect.y + krunner.inputHeight
             bottomMargin: plasmoid.screenGeometry.height - plasmoid.availableScreenRect.height - plasmoid.availableScreenRect.y
         }
         
         bottomMargin: favoriteStrip.height
         contentWidth: width
         contentHeight: flickableContents.height
         interactive: !plasmoid.editMode && !launcherDragManager.active
 
         PlasmaComponents.ScrollBar.vertical: PlasmaComponents.ScrollBar {
             id: scrollabr
             opacity: mainFlickable.moving
             interactive: false
             Behavior on opacity {
                 OpacityAnimator {
                     duration: units.longDuration * 2
                     easing.type: Easing.InOutQuad
                 }
             }
         }
         NumberAnimation {
             id: scrollAnim
             target: mainFlickable
             properties: "contentY"
             duration: units.longDuration
             easing.type: Easing.InOutQuad
         }
 
         Column {
             id: flickableContents
             width: mainFlickable.width
-            spacing: Math.max(0, favoriteStrip.frame.height - mainFlickable.contentY)
+            spacing: Math.max(0, favoriteStrip.frame.height + favoriteStrip.anchors.bottomMargin - mainFlickable.contentY)
 
             DragDrop.DropArea {
                 anchors {
                     left: parent.left
                     right: parent.right
                 }
                 height: mainFlickable.height - favoriteStrip.frame.height //TODO: multiple widgets pages
 
                 onDragEnter: {
                     event.accept(event.proposedAction);
                 }
                 onDragMove: {
                     appletsLayout.showPlaceHolderAt(
                         Qt.rect(event.x - appletsLayout.defaultItemWidth / 2,
                         event.y - appletsLayout.defaultItemHeight / 2,
                         appletsLayout.defaultItemWidth,
                         appletsLayout.defaultItemHeight)
                     );
                 }
 
                 onDragLeave: {
                     appletsLayout.hidePlaceHolder();
                 }
 
                 preventStealing: true
 
                 onDrop: {
                     plasmoid.processMimeData(event.mimeData,
                                 event.x - appletsLayout.placeHolder.width / 2, event.y - appletsLayout.placeHolder.height / 2);
                     event.accept(event.proposedAction);
                     appletsLayout.hidePlaceHolder();
                 }
 
                 PlasmaCore.Svg {
                     id: arrowsSvg
                     imagePath: "widgets/arrows"
                     colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
                 }
                 PlasmaCore.IconItem {
                     z: 9
                     anchors {
                         horizontalCenter: parent.horizontalCenter
                         bottom: parent.bottom
                     }
                     source: "arrow-up"
                     width: units.iconSizes.medium
                     height: width
                     colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
                     MouseArea {
                         anchors {
                             fill: parent
                             margins: -units.smallSpacing
                         }
                         onClicked: mainFlickable.flick(0, -mainFlickable.height)
                     }
                 }
 
                 ContainmentLayoutManager.AppletsLayout {
                     id: appletsLayout
 
                     anchors.fill: parent
 
                     cellWidth: Math.floor(width / launcher.columns)
                     cellHeight: launcher.cellHeight
 
                     configKey: width > height ? "ItemGeometriesHorizontal" : "ItemGeometriesVertical"
                     containment: plasmoid
                     editModeCondition: plasmoid.immutable
                             ? ContainmentLayoutManager.AppletsLayout.Manual
                             : ContainmentLayoutManager.AppletsLayout.AfterPressAndHold
 
                     // Sets the containment in edit mode when we go in edit mode as well
                     onEditModeChanged: plasmoid.editMode = editMode
 
                     minimumItemWidth: units.gridUnit * 3
                     minimumItemHeight: minimumItemWidth
 
                     defaultItemWidth: units.gridUnit * 6
                     defaultItemHeight: defaultItemWidth
 
                     //cellWidth: units.iconSizes.small
                     //cellHeight: cellWidth
 
                     acceptsAppletCallback: function(applet, x, y) {
                         print("Applet: "+applet+" "+x+" "+y)
                         return true;
                     }
 
                     appletContainerComponent: ContainmentLayoutManager.BasicAppletContainer {
                         id: appletContainer
                         configOverlayComponent: ConfigOverlay {}
 
                         onEditModeChanged: {
                             launcherDragManager.active = dragActive || editMode;
                         }
                         onDragActiveChanged: {
                             launcherDragManager.active = dragActive || editMode;
                         }
                     }
 
                     placeHolder: ContainmentLayoutManager.PlaceHolder {}
                 }
             }
 
             Launcher.LauncherGrid {
                 id: launcher
                 anchors {
                     left: parent.left
                     right: parent.right
                 }
                 
                 favoriteStrip: favoriteStrip
                 appletsLayout: appletsLayout
             }
         }
     }
 
     ScrollIndicator {
         id: scrollUpIndicator
         anchors {
             top: parent.top
             topMargin: units.gridUnit * 2
         }
         elementId: "up-arrow"
     }
     ScrollIndicator {
         id: scrollDownIndicator
         anchors {
             bottom: favoriteStrip.top
             bottomMargin: units.gridUnit
         }
         elementId: "down-arrow"
     }
 
     Launcher.FavoriteStrip {
         id: favoriteStrip
         anchors {
             left: parent.left
             right: parent.right
             bottom: parent.bottom
             bottomMargin: plasmoid.screenGeometry.height - plasmoid.availableScreenRect.height - plasmoid.availableScreenRect.y
         }
         appletsLayout: appletsLayout
         launcherGrid: launcher
         //y: Math.max(krunner.inputHeight, root.height - height - mainFlickable.contentY)
     }
 
     KRunner {
         id: krunner
         z: 998
         height: plasmoid.availableScreenRect.height
         topPadding: plasmoid.availableScreenRect.y
         anchors {
             top: parent.top
             left: parent.left
             right: parent.right
         }
     }
 }
 
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index d2fcb0e..d11bec6 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -1,157 +1,183 @@
 /*
  *  Copyright 2015 Marco Martin <mart@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  2.010-1301, USA.
  */
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
 
 import org.kde.taskmanager 0.1 as TaskManager
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 
 PlasmaCore.ColorScope {
     id: root
     width: 600
     height: 480
     //colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
 
-    Plasmoid.backgroundHints: plasmoid.configuration.PanelButtonsVisible ? PlasmaCore.Types.StandardBackground : PlasmaCore.Types.NoBackground
+    Plasmoid.backgroundHints: PlasmaCore.Types.NoBackground
+
+    readonly property bool showingApp: tasksModel.activeTask && tasksModel.activeTask.valid && !tasksModel.data(tasksModel.activeTask, TaskManager.AbstractTasksModel.IsFullScreen)
 
     property QtObject taskSwitcher: taskSwitcherLoader.item ? taskSwitcherLoader.item : null
     Loader {
         id: taskSwitcherLoader
     }
     //FIXME: why it crashes on startup if TaskSwitcher is loaded immediately?
     Timer {
         running: true
         interval: 200
         onTriggered: taskSwitcherLoader.source = Qt.resolvedUrl("TaskSwitcher.qml")
     }
 
+    TaskManager.TasksModel {
+        id: tasksModel
+        sortMode: TaskManager.TasksModel.SortVirtualDesktop
+        groupMode: TaskManager.TasksModel.GroupDisabled
+
+        screenGeometry: plasmoid.screenGeometry
+        filterByScreen: plasmoid.configuration.showForCurrentScreenOnly
+
+    }
+
     MouseArea {
         id: mainMouseArea
         anchors.fill: parent
         property int oldMouseY: 0
         property int startMouseY: 0
         property bool isDragging: false
         drag.filterChildren: true
         function managePressed(mouse) {
             startMouseY = oldMouseY = mouse.y;
             taskSwitcher.offset = -taskSwitcher.height
         }
         onPressed: managePressed(mouse);
         onPositionChanged: {
             if (!isDragging && Math.abs(startMouseY - oldMouseY) < root.height) {
                 oldMouseY = mouse.y;
                 return;
             } else {
                 isDragging = true;
             }
 
             taskSwitcher.offset = taskSwitcher.offset - (mouse.y - oldMouseY);
             oldMouseY = mouse.y;
             if (taskSwitcher.visibility == Window.Hidden && taskSwitcher.offset > -taskSwitcher.height + units.gridUnit && taskSwitcher.tasksCount) {
                 taskSwitcher.visible = true;
             }
         }
         onReleased: {
             if (!isDragging) {
                 return;
             }
 
             if (taskSwitcher.visibility == Window.Hidden) {
                 return;
             }
             if (taskSwitcher.offset > -taskSwitcher.height/2) {
                 taskSwitcher.currentTaskIndex = -1
                 taskSwitcher.show();
             } else {
                 taskSwitcher.hide();
                 taskSwitcher.setSingleActiveWindow(taskSwitcher.currentTaskIndex);
             }
         }
 
-        Rectangle {
+        Item {
             anchors.fill: parent
-            color: root.backgroundColor
 
             visible: plasmoid.configuration.PanelButtonsVisible
-            property Item toolBox
+
+            Rectangle {
+                anchors.fill: parent
+                color: root.backgroundColor
+                opacity: showingApp ? 1 : 0.9
+                Rectangle {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
+                    height: 1
+                    color: PlasmaCore.ColorScope.textColor
+                    opacity: 0.2
+                }
+            }
 
             Button {
                 anchors.left: parent.left
                 height: parent.height
                 width: parent.width/3
                 enabled: taskSwitcher.tasksCount > 0;
                 iconSource: "box"
                 onClicked: {
                     plasmoid.nativeInterface.showDesktop = false;
                     taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show();
                 }
                 onPressed: mainMouseArea.managePressed(mouse);
                 onPositionChanged: mainMouseArea.positionChanged(mouse);
                 onReleased: mainMouseArea.released(mouse);
             }
 
             Button {
                 id: showDesktopButton
                 height: parent.height
                 width: parent.width/3
                 anchors.horizontalCenter: parent.horizontalCenter
                 iconSource: "start-here-kde"
                 enabled: taskSwitcher.tasksCount > 0
                 checkable: true
                 onCheckedChanged: {
                     taskSwitcher.hide();
                     plasmoid.nativeInterface.showDesktop = checked;
                 }
                 onPressed: mainMouseArea.managePressed(mouse);
                 onPositionChanged: mainMouseArea.positionChanged(mouse);
                 onReleased: mainMouseArea.released(mouse);
                 Connections {
                     target: root.taskSwitcher
                     onCurrentTaskIndexChanged: {
                         if (root.taskSwitcher.currentTaskIndex < 0) {
                             showDesktopButton.checked = false;
                         }
                     }
                 }
             }
 
             Button {
                 height: parent.height
                 width: parent.width/3
                 anchors.right: parent.right
                 iconSource: "paint-none"
                 //FIXME:Qt.UserRole+9 is IsWindow Qt.UserRole+15 is IsClosable. We can't reach that enum from QML
                 enabled: plasmoid.nativeInterface.hasCloseableActiveWindow
                 onClicked: {
                     var index = taskSwitcher.model.activeTask;
                     if (index) {
                         taskSwitcher.model.requestClose(index);
                     }
                 }
                 onPressed: mainMouseArea.managePressed(mouse);
                 onPositionChanged: mainMouseArea.positionChanged(mouse);
                 onReleased: mainMouseArea.released(mouse);
             }
         }
     }
 }