diff --git a/kdeplasma-addons/applets/frame/configdialog.cpp b/kdeplasma-addons/applets/frame/configdialog.cpp
index 16abee26..bf172e0d 100644
--- a/kdeplasma-addons/applets/frame/configdialog.cpp
+++ b/kdeplasma-addons/applets/frame/configdialog.cpp
@@ -39,7 +39,10 @@ ConfigDialog::ConfigDialog(QWidget *parent)
 
     imageUi.addDirButton->setIcon(KIcon("list-add"));
     imageUi.removeDirButton->setIcon(KIcon("list-remove"));
-    imageUi.slideShowDelay->setMinimumTime(QTime(0, 0, 1)); // minimum to 1 second
+    imageUi.slideShowDelay->setTimeRange(
+        QTime(0, 0, 1), // minimum to 1 second
+        imageUi.slideShowDelay->maximumTime()
+    );
 
     QString monitorPath = KStandardDirs::locate("data",  "kcontrol/pics/monitor.png");
     // Size of monitor image: 200x186
diff --git a/kdeplasma-addons/applets/frame/frame.cpp b/kdeplasma-addons/applets/frame/frame.cpp
index f0da3d2d..73feddc6 100644
--- a/kdeplasma-addons/applets/frame/frame.cpp
+++ b/kdeplasma-addons/applets/frame/frame.cpp
@@ -585,7 +585,7 @@ void Frame::createConfigurationInterface(KConfigDialog *parent)
     m_configDialog->imageUi.removeDirButton->setEnabled(!m_slideShowPaths.isEmpty());
     m_configDialog->imageUi.slideShowDelay->setTime(QTime(m_slideshowTime / 3600, (m_slideshowTime / 60) % 60, m_slideshowTime % 60));
     m_configDialog->previewPicture(m_mySlideShow->image());
-    m_configDialog->imageUi.autoUpdateTime->setTime(QTime(m_autoUpdateIntervall / 3600, (m_autoUpdateIntervall / 60) % 60));
+    m_configDialog->imageUi.autoUpdateTime->setTime(QTime(m_autoUpdateIntervall / 3600, (m_autoUpdateIntervall / 60) % 60, m_autoUpdateIntervall % 60));
     
     connect(m_configDialog->imageUi.slideShowDelay, SIGNAL(timeChanged(QTime)), 
                    parent, SLOT(settingsModified()));
@@ -663,7 +663,7 @@ void Frame::configAccepted()
     m_autoUpdateTimer->stop();
 
     QTime AutoUpdateTimer = m_configDialog->imageUi.autoUpdateTime->time();
-    m_autoUpdateIntervall = AutoUpdateTimer.minute() * 60 + AutoUpdateTimer.hour() * 3600;
+    m_autoUpdateIntervall = AutoUpdateTimer.second() + AutoUpdateTimer.minute() * 60 + AutoUpdateTimer.hour() * 3600;
     cg.writeEntry("autoupdate time", m_autoUpdateIntervall);
 
     QString potdProvider = m_configDialog->imageUi.potdComboBox->itemData(m_configDialog->imageUi.potdComboBox->currentIndex()).toString();
diff --git a/kdeplasma-addons/applets/frame/imageSettings.ui b/kdeplasma-addons/applets/frame/imageSettings.ui
index e509a341..379e16fc 100644
--- a/kdeplasma-addons/applets/frame/imageSettings.ui
+++ b/kdeplasma-addons/applets/frame/imageSettings.ui
@@ -141,12 +141,6 @@
             <string>Updates the picture from the source in the given time.
 Useful if you want a live cam or weather data to be up to date.</string>
            </property>
-           <property name="specialValueText">
-            <string>never</string>
-           </property>
-           <property name="displayFormat">
-            <string>hh'h' mm'min'</string>
-           </property>
           </widget>
          </item>
          <item>
@@ -310,12 +304,6 @@ Useful if you want a live cam or weather data to be up to date.</string>
              <day>1</day>
             </datetime>
            </property>
-           <property name="currentSection">
-            <enum>QDateTimeEdit::HourSection</enum>
-           </property>
-           <property name="displayFormat">
-            <string comment="(qtdt-format) Please do not change the quotes (') and translate only the content of the quotes.">hh 'Hours' mm 'Mins' ss 'Secs'</string>
-           </property>
            <property name="time">
             <time>
              <hour>0</hour>
diff --git a/kdeplasma-addons/applets/timer/CMakeLists.txt b/kdeplasma-addons/applets/timer/CMakeLists.txt
index ab369ed8..77473b35 100644
--- a/kdeplasma-addons/applets/timer/CMakeLists.txt
+++ b/kdeplasma-addons/applets/timer/CMakeLists.txt
@@ -23,4 +23,4 @@ install(FILES plasma-applet-timer.desktop
         DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
 
 install(FILES timer.svgz
-	DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/)
+        DESTINATION ${KDE4_DATA_INSTALL_DIR}/desktoptheme/default/widgets/)
diff --git a/kdeplasma-addons/applets/timer/customtimeeditor.cpp b/kdeplasma-addons/applets/timer/customtimeeditor.cpp
index 87d486c6..03c92dcb 100644
--- a/kdeplasma-addons/applets/timer/customtimeeditor.cpp
+++ b/kdeplasma-addons/applets/timer/customtimeeditor.cpp
@@ -28,7 +28,6 @@ CustomTimeEditor::CustomTimeEditor()
     : QObject()
 {
     timeEdit=new QTimeEdit();
-    timeEdit->setDisplayFormat(toLocalizedTimer(TIME_FORMAT));
     editor=new KLineEdit();
     customEditor=new KEditListWidget::CustomEditor(timeEdit, editor);
     connect(timeEdit, SIGNAL(timeChanged(QTime)), this, SLOT(setEdit(QTime)));