diff --git a/src/module-magespices-core/etc/adminhtml/system.xml b/src/module-magespices-core/etc/adminhtml/system.xml
index b5187a7..ea96b55 100644
--- a/src/module-magespices-core/etc/adminhtml/system.xml
+++ b/src/module-magespices-core/etc/adminhtml/system.xml
@@ -16,7 +16,7 @@
         </tab>
         <section id="mage2dark" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
             <class>separator-top</class>
-            <label><![CDATA[Mage2Dark Theme Feedback]]></label>
+            <label><![CDATA[Mage2Dark Theme]]></label>
             <tab>magespices</tab>
             <resource>MageSpices_Core::config</resource>
             <group id="settings" translate="label" type="text" sortOrder="5" showInDefault="1" showInWebsite="1"
diff --git a/src/module-magespices-mage2dark/Block/Adminhtml/Config/TimeSlider.php b/src/module-magespices-mage2dark/Block/Adminhtml/Config/TimeSlider.php
new file mode 100644
index 0000000..c19497b
--- /dev/null
+++ b/src/module-magespices-mage2dark/Block/Adminhtml/Config/TimeSlider.php
@@ -0,0 +1,133 @@
+<?php
+namespace MageSpices\Mage2Dark\Block\Adminhtml\Config;
+
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\View\Element\Template;
+use Magento\Widget\Block\BlockInterface;
+
+/**
+ * Class TimeSlider
+ */
+class TimeSlider extends Template implements RendererInterface, BlockInterface
+{
+    const BASE_CONFIG_PATH = "mage2dark/settings/";
+    const TIME_NAME_FROM = 'light_theme_time_from';
+    const TIME_NAME_TO   = 'light_theme_time_to';
+
+    /**
+     * Form element which re-rendering
+     *
+     * @var Fieldset
+     */
+    protected $element;
+
+    /**
+     * @var string
+     */
+    protected $_template = 'MageSpices_Mage2Dark::config/renderer/time_slider.phtml';
+
+    /**
+     * @var string
+     */
+    protected $_htmlId = 'time-range';
+
+    /**
+     * Retrieve an element
+     *
+     * @return Fieldset
+     */
+    public function getElement()
+    {
+        return $this->element;
+    }
+
+    /**
+     * Set an element
+     *
+     * @param AbstractElement $element
+     * @return $this
+     */
+    public function setElement(AbstractElement $element)
+    {
+        $this->element = $element;
+
+        return $this;
+    }
+
+    /**
+     * Render element
+     *
+     * @param AbstractElement $element
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        $this->element = $element;
+
+        return $this->toHtml();
+    }
+
+    /**
+     * @return string
+     */
+    public function getHtmlId()
+    {
+        return $this->_htmlId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNameFrom()
+    {
+        return str_replace("/", "_", self::BASE_CONFIG_PATH).self::TIME_NAME_FROM;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNameTo()
+    {
+        return str_replace("/", "_", self::BASE_CONFIG_PATH).self::TIME_NAME_TO;
+    }
+
+    public function getTimeFrom()
+    {
+        return $this->_scopeConfig->getValue(self::BASE_CONFIG_PATH.self::TIME_NAME_FROM);
+    }
+
+    public function getTimeTo()
+    {
+        return $this->_scopeConfig->getValue(self::BASE_CONFIG_PATH.self::TIME_NAME_TO);
+    }
+
+    /**
+     * @param int $minutes
+     * @return string
+     */
+    public function minutesToTime($minutes)
+    {
+        $hours   = floor($minutes / 60);
+        $minutes = $minutes % 60;
+        $part    = $hours >= 12 ? 'PM' : 'AM';
+
+        return sprintf('%02d:%02d %s', $hours, $minutes, $part);
+    }
+
+    /**
+     * @return string
+     * @throws ValidatorException
+     */
+    protected function _toHtml()
+    {
+        if (!$this->getTemplate()) {
+            return '';
+        }
+
+        return $this->fetchView($this->getTemplateFile());
+    }
+}
\ No newline at end of file
diff --git a/src/module-magespices-mage2dark/Model/Config/FrontendModel/TimeSlider.php b/src/module-magespices-mage2dark/Model/Config/FrontendModel/TimeSlider.php
new file mode 100644
index 0000000..49dadff
--- /dev/null
+++ b/src/module-magespices-mage2dark/Model/Config/FrontendModel/TimeSlider.php
@@ -0,0 +1,27 @@
+<?php
+namespace MageSpices\Mage2Dark\Model\Config\FrontendModel;
+
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Exception\LocalizedException;
+
+class TimeSlider extends Field
+{
+
+    /**
+     * Retrieve element HTML markup
+     *
+     * @param AbstractElement $element
+     * @return string
+     * @throws LocalizedException
+     */
+    protected function _getElementHtml(AbstractElement $element)
+    {
+        $renderer = $this->getLayout()->createBlock(
+            \MageSpices\Mage2Dark\Block\Adminhtml\Config\TimeSlider::class
+        );
+        $renderer->setElement($element);
+
+        return $renderer->toHtml();
+    }
+}
\ No newline at end of file
diff --git a/src/module-magespices-mage2dark/Model/Config/Source/Selection.php b/src/module-magespices-mage2dark/Model/Config/Source/Selection.php
new file mode 100644
index 0000000..ec75129
--- /dev/null
+++ b/src/module-magespices-mage2dark/Model/Config/Source/Selection.php
@@ -0,0 +1,25 @@
+<?php
+namespace MageSpices\Mage2Dark\Model\Config\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class Selection implements  OptionSourceInterface
+{
+    public function toOptionArray()
+    {
+        return [
+            [
+                "value" => "auto",
+                "label" => __("Auto")
+            ],
+            [
+                "value" => "dark",
+                "label" => __("Dark")
+            ],
+            [
+                "value" => "light",
+                "label" => __("Light")
+            ]
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/module-magespices-mage2dark/Plugin/Model/View/Design.php b/src/module-magespices-mage2dark/Plugin/Model/View/Design.php
new file mode 100644
index 0000000..76d9c2b
--- /dev/null
+++ b/src/module-magespices-mage2dark/Plugin/Model/View/Design.php
@@ -0,0 +1,69 @@
+<?php
+namespace MageSpices\Mage2Dark\Plugin\Model\View;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
+class Design
+{
+    const BASE_CONFIG_PATH = "mage2dark/settings/";
+
+    protected $scopeConfig;
+
+    protected $timeZone;
+
+    protected $themeSelectionConfig;
+
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        TimezoneInterface $timezone
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->timeZone = $timezone;
+    }
+
+    /**
+     * @param \Magento\Theme\Model\View\Design $subject
+     * @param string|null $area
+     * @param $result
+     * @return string
+     */
+    public function afterGetConfigurationDesignTheme(
+        \Magento\Theme\Model\View\Design $subject,
+        $result,
+        $area = null
+    ) {
+        if (!$area) {
+            $area = $subject->getArea();
+        }
+        if ($area == Area::AREA_ADMINHTML && $this->getThemeSelectionConfig() == "dark") {
+            return "MageSpices/Mage2Dark";
+        }
+        return $result;
+    }
+
+    protected function getThemeSelectionConfig()
+    {
+        if (!$this->themeSelectionConfig) {
+            $this->themeSelectionConfig = $this->getConfig('theme_selection');
+            if ($this->themeSelectionConfig == "auto") {
+                $currentDate = $this->timeZone->date();
+                $currentTime = ($currentDate->format("H")*60)+$currentDate->format("i");
+                $lightThemeStartTime = $this->getConfig("light_theme_time_from");
+                $lightThemeEndTime = $this->getConfig("light_theme_time_to");
+                if ($currentTime >= $lightThemeStartTime && $currentTime <= $lightThemeEndTime) {
+                    $this->themeSelectionConfig = "light";
+                } else {
+                    $this->themeSelectionConfig = "dark";
+                }
+            }
+        }
+        return $this->themeSelectionConfig;
+    }
+
+    protected function getConfig($path)
+    {
+        return $this->scopeConfig->getValue(self::BASE_CONFIG_PATH.$path);
+    }
+}
\ No newline at end of file
diff --git a/src/module-magespices-mage2dark/etc/adminhtml/di.xml b/src/module-magespices-mage2dark/etc/adminhtml/di.xml
new file mode 100644
index 0000000..41e00d8
--- /dev/null
+++ b/src/module-magespices-mage2dark/etc/adminhtml/di.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Theme\Model\View\Design">
+        <plugin name="mageSpicesMage2DarkDesign" type="MageSpices\Mage2Dark\Plugin\Model\View\Design"/>
+    </type>
+</config>
\ No newline at end of file
diff --git a/src/module-magespices-mage2dark/etc/adminhtml/system.xml b/src/module-magespices-mage2dark/etc/adminhtml/system.xml
new file mode 100644
index 0000000..7da9636
--- /dev/null
+++ b/src/module-magespices-mage2dark/etc/adminhtml/system.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+/**
+ * Created by Q-Solutions Studio
+ *
+ * @category    MageSpices
+ * @package     MageSpices_Core
+ * @author      Sebastian Strojwas <sebastian@qsolutionsstudio.com>
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="mage2dark">
+            <group id="settings">
+                <field id="theme_selection" translate="label comment" type="select" sortOrder="20" showInDefault="1">
+                    <label>Theme Selection</label>
+                    <source_model>MageSpices\Mage2Dark\Model\Config\Source\Selection</source_model>
+                    <comment>If "Auto" is selected, then please select time slot for light theme from next setting and outside of that time slot Dark theme will be in use.</comment>
+                </field>
+                <field id="light_theme_time" translate="label comment" type="text" sortOrder="30" showInDefault="1">
+                    <label>Light Theme</label>
+                    <frontend_model>MageSpices\Mage2Dark\Model\Config\FrontendModel\TimeSlider</frontend_model>
+                    <depends>
+                        <field id="theme_selection">auto</field>
+                    </depends>
+                </field>
+                <field id="light_theme_time_from" translate="label comment" type="hidden" sortOrder="40" showInDefault="1">
+                    <label>Light Theme Time From</label>
+                    <depends>
+                        <field id="theme_selection">auto</field>
+                    </depends>
+                </field>
+                <field id="light_theme_time_to" translate="label comment" type="hidden" sortOrder="50" showInDefault="1">
+                    <label>Light Theme Time To</label>
+                    <depends>
+                        <field id="theme_selection">auto</field>
+                    </depends>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/src/module-magespices-mage2dark/etc/config.xml b/src/module-magespices-mage2dark/etc/config.xml
new file mode 100644
index 0000000..d73134c
--- /dev/null
+++ b/src/module-magespices-mage2dark/etc/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <mage2dark>
+            <settings>
+                <theme_selection>auto</theme_selection>
+                <light_theme_time_from>420</light_theme_time_from>
+                <light_theme_time_to>1140</light_theme_time_to>
+            </settings>
+        </mage2dark>
+    </default>
+</config>
diff --git a/src/module-magespices-mage2dark/etc/di.xml b/src/module-magespices-mage2dark/etc/di.xml
deleted file mode 100644
index f6f20a1..0000000
--- a/src/module-magespices-mage2dark/etc/di.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
-* Created by Q-Solutions Studio
-* MageSpices
-*
-* @package  MageSpices_Mage2Dark
-* @author   Jakub Winkler <jwinkler@qsolutionsstudio.com> @MagentoNinja
-* @author	Przemysław Jankowski <przemek@qsolutionsstudio.com>
-*/
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Theme\Model\View\Design">
-        <arguments>
-            <argument name="themes" xsi:type="array">
-                <item name="adminhtml" xsi:type="string">MageSpices/Mage2Dark</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/src/module-magespices-mage2dark/view/adminhtml/layout/adminhtml_system_config_edit.xml b/src/module-magespices-mage2dark/view/adminhtml/layout/adminhtml_system_config_edit.xml
new file mode 100644
index 0000000..9cc24f5
--- /dev/null
+++ b/src/module-magespices-mage2dark/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="MageSpices_Mage2Dark::css/config.css"/>
+    </head>
+</page>
diff --git a/src/module-magespices-mage2dark/view/adminhtml/templates/config/renderer/time_slider.phtml b/src/module-magespices-mage2dark/view/adminhtml/templates/config/renderer/time_slider.phtml
new file mode 100644
index 0000000..a825acd
--- /dev/null
+++ b/src/module-magespices-mage2dark/view/adminhtml/templates/config/renderer/time_slider.phtml
@@ -0,0 +1,78 @@
+<?php
+/** @var MageSpices\Mage2Dark\Block\Adminhtml\Config\TimeSlider $block */
+$timeFrom = $block->getTimeFrom();
+$timeTo = $block->getTimeTo();
+?>
+<div id="time-range" class="field field-time_range">
+    <label class="label" style="white-space: normal;">
+        <?php echo __('Time Slot: ');?>
+        <span class="slider-time">
+            <?php echo $block->minutesToTime($timeFrom);?>
+        </span>
+        <?php echo ' - '; ?>
+        <span class="slider-time2">
+            <?php echo $block->minutesToTime($timeTo);?>
+        </span>
+    </label>
+    <div class="sliders_step1 control">
+        <div id="slider-range" class="light-theme-slot"></div>
+    </div>
+</div>
+<script type="text/javascript">
+    require(['jquery', 'jquery/ui'], function($){
+        $("#slider-range").slider({
+            range: true,
+            min: 0,
+            max: 1440,
+            step: 15,
+            values: [<?php echo $timeFrom?>, <?php echo $timeTo?>],
+            slide: function (e, ui) {
+                var hours1 = Math.floor(ui.values[0] / 60);
+                var minutes1 = ui.values[0] - (hours1 * 60);
+
+                if (hours1.length == 1) hours1 = '0' + hours1;
+                if (minutes1.length == 1) minutes1 = '0' + minutes1;
+                if (minutes1 == 0) minutes1 = '00';
+                if (hours1 >= 12) {
+                    if (hours1 == 12) {
+                        minutes1 = minutes1 + " PM";
+                    } else {
+                        hours1 = hours1 - 12;
+                        minutes1 = minutes1 + " PM";
+                    }
+                } else {
+                    minutes1 = minutes1 + " AM";
+                }
+                if (hours1 == 0) {
+                    hours1 = 12;
+                }
+                $('.slider-time').html(hours1 + ':' + minutes1);
+
+                var hours2 = Math.floor(ui.values[1] / 60);
+                var minutes2 = ui.values[1] - (hours2 * 60);
+
+                if (hours2.length == 1) hours2 = '0' + hours2;
+                if (minutes2.length == 1) minutes2 = '0' + minutes2;
+                if (minutes2 == 0) minutes2 = '00';
+                if (hours2 >= 12) {
+                    if (hours2 == 12) {
+                        minutes2 = minutes2 + " PM";
+                    } else if (hours2 == 24) {
+                        hours2 = 11;
+                        minutes2 = "59 PM";
+                    } else {
+                        hours2 = hours2 - 12;
+                        minutes2 = minutes2 + " PM";
+                    }
+                } else {
+                    hours2 = hours2;
+                    minutes2 = minutes2 + " AM";
+                }
+                $('.slider-time2').html(hours2 + ':' + minutes2);
+
+                $('#<?php echo $block->getNameFrom();?>').val(ui.values[0]);
+                $('#<?php echo $block->getNameTo();?>').val(ui.values[1]);
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/src/module-magespices-mage2dark/view/adminhtml/web/css/config.css b/src/module-magespices-mage2dark/view/adminhtml/web/css/config.css
new file mode 100644
index 0000000..9b5c5d1
--- /dev/null
+++ b/src/module-magespices-mage2dark/view/adminhtml/web/css/config.css
@@ -0,0 +1,7 @@
+#row_mage2dark_settings_light_theme_time_from,
+#row_mage2dark_settings_light_theme_time_to {
+    display: none;
+}
+.light-theme-slot .ui-slider-handle {
+    background: #ec5102;
+}
\ No newline at end of file