diff --git a/Classes/Dashboard/Widgets/OwnRssFeed.php b/Classes/Dashboard/Widgets/OwnRssFeed.php
deleted file mode 100644
index 109c0ac..0000000
--- a/Classes/Dashboard/Widgets/OwnRssFeed.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace DanielSiepmann\DsSite\Dashboard\Widgets;
-
-/*
- * Copyright (C) 2020 Daniel Siepmann <coding@daniel-siepmann.de>
- *
- * 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
- * 02110-1301, USA.
- */
-
-use TYPO3\CMS\Dashboard\Widgets\AbstractRssWidget;
-
-class OwnRssFeed extends AbstractRssWidget
-{
-    protected $rssFile = 'https://daniel-siepmann.de/feed/rssFeedAllBlogPosts/sitemap.xml';
-    protected $lifeTime = 43200;
-    protected $title = 'Own RSS Feed';
-    protected $description = 'RSS Feed of Blog Posts';
-    protected $iconIdentifier = 'content-widget-rss';
-    protected $moreItemsLink = 'https://daniel-siepmann.de/';
-    protected $moreItemsText = 'Open Blog';
-    protected $width = 2;
-}
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 5ebbe30..597b23a 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -8,37 +8,34 @@ services:
     resource: '../Classes/*'
 
   # Widgets
-
-  DanielSiepmann\DsSite\Dashboard\Widgets\OwnRssFeed:
-    class: DanielSiepmann\DsSite\Dashboard\Widgets\OwnRssFeed
-    arguments: ['ownRss']
+  dashboard.widget.site_ownrss:
+    class: 'TYPO3\CMS\Dashboard\Widgets\RssWidget'
+    arguments:
+      $view: '@dashboard.views.widget'
+      $cache: '@cache.dashboard.rss'
+      $options:
+        feedUrl: 'https://daniel-siepmann.de/feed/rssFeedAllBlogPosts/sitemap.xml'
     tags:
       - name: dashboard.widget
-        identifier: ownRss
-        widgetGroups: 'own'
+        identifier: 'ownRss'
+        groupNames: 'typo3'
+        title: 'Own RSS Feed'
+        description: 'RSS Feed of Blog Posts'
+        iconIdentifier: 'content-widget-rss'
+        height: 'large'
+        width: 'medium'
 
-  # Foreign Classes
-  DanielSiepmann\Tracking\DI\Dashboard\Widgets\Settings\PageViewsBar:
-    factory:
-      - '@DanielSiepmann\Tracking\Dashboard\Widgets\SettingsFactory'
-      - 'fromArray'
+  DanielSiepmann\Tracking\Dashboard\Provider\PageviewsPerDay:
     arguments:
-      $widgetIdentifier: 'pageViewsBar'
-      $settings:
-        blackListedPages: [1, 11, 38]
-  DanielSiepmann\Tracking\DI\Dashboard\Widgets\Settings\PageViewsPerPageDoughnut:
-    factory:
-      - '@DanielSiepmann\Tracking\Dashboard\Widgets\SettingsFactory'
-      - 'fromArray'
+      $queryBuilder: '@querybuilder.tx_tracking_pageview'
+      $blackListedPages: [1, 11, 38]
+
+  DanielSiepmann\Tracking\Dashboard\Provider\PageviewsPerPage:
     arguments:
-      $widgetIdentifier: 'pageViewsPerPageDoughnut'
-      $settings:
-        blackListedPages: [1, 11, 38]
-  DanielSiepmann\Tracking\DI\Dashboard\Widgets\Settings\NewestPageviewsList:
-    factory:
-      - '@DanielSiepmann\Tracking\Dashboard\Widgets\SettingsFactory'
-      - 'fromArray'
+      $queryBuilder: '@querybuilder.tx_tracking_pageview'
+      $blackListedPages: [1, 11, 38]
+
+  DanielSiepmann\Tracking\Dashboard\Provider\NewestPageviews:
     arguments:
-      $widgetIdentifier: 'pageViewsPerPageDoughnut'
-      $settings:
-        blackListedPages: [1, 11, 38]
+      $queryBuilder: '@querybuilder.tx_tracking_pageview'
+      $blackListedPages: [1, 11, 38]