diff --git a/luci-app-omr-tracker/htdocs/luci-static/resources/view/omr-tracker/network/interface.js b/luci-app-omr-tracker/htdocs/luci-static/resources/view/omr-tracker/network/interface.js
index 0f2506ff3..5d8e24008 100644
--- a/luci-app-omr-tracker/htdocs/luci-static/resources/view/omr-tracker/network/interface.js
+++ b/luci-app-omr-tracker/htdocs/luci-static/resources/view/omr-tracker/network/interface.js
@@ -199,14 +199,15 @@ return view.extend({
 		o.value('25');
 		o.modalonly = true;
 
-		o = s.option(form.ListValue, "timeout", _("Ping timeout"));
+		o = s.option(form.Value, "timeout", _("Ping timeout"));
 		o.default = '4';
 		o.value('1', _('%d second').format('1'));
 		for (var i = 2; i <= 10; i++)
 			o.value(String(i), _('%d seconds').format(i));
+		o.rmempty = false;
 		o.modalonly = true;
 
-		o = s.option(form.ListValue, 'interval', _('Ping interval'));
+		o = s.option(form.Value, 'interval', _('Ping interval'));
 		o.default = '10';
 		o.value('1', _('%d second').format('1'));
 		o.value('3', _('%d seconds').format('3'));
@@ -220,6 +221,8 @@ return view.extend({
 		o.value('900', _('%d minutes').format('15'));
 		o.value('1800', _('%d minutes').format('30'));
 		o.value('3600', _('%d hour').format('1'));
+		o.modalonly = true;
+		o.rmempty = false;
 
 		o = s.option(form.Value, 'failure_interval', _('Failure interval'),
 			_('Ping interval during failure detection'));
diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 05f0a4ba6..4bfae5380 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -578,7 +578,7 @@ function wizard_add()
 	--	ucic:set("sqm","omrvpn","enabled","0")
 	--end
 
-	ucic:set("sqm","omrvpn","enabled","1")
+	ucic:set("sqm","omrvpn","enabled","0")
 	ucic:set("sqm","omrvpn","download","0")
 	ucic:set("sqm","omrvpn","upload","0")
 
diff --git a/luci-theme-design/root/etc/uci-defaults/30_luci-theme-design b/luci-theme-design/root/etc/uci-defaults/30_luci-theme-design
new file mode 100644
index 000000000..f3cc6f8ad
--- /dev/null
+++ b/luci-theme-design/root/etc/uci-defaults/30_luci-theme-design
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+uci get luci.themes.Design >/dev/null 2>&1 || \
+uci batch <<-EOF
+	set luci.themes.Design=/luci-static/design
+	commit luci
+EOF
+
+exit 0
diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
index b7848b036..f4a054412 100755
--- a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
+++ b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
@@ -93,10 +93,10 @@ if [ "$(uci -q get sqm.omrvpn)" = "" ] || [ -z "$(uci -q get sqm.omrvpn.delay_th
 		set sqm.omrvpn.verbosity='5'
 		set sqm.omrvpn.overhead='44'
 		set sqm.omrvpn.iqdisc_opts='autorate-ingress'
-		set sqm.omrvpn.delay_thr_ms='300'
+		set sqm.omrvpn.delay_thr_ms='300.0'
 		set sqm.omrvpn.reflector_ping_interval_s='0.5'
 		set sqm.omrvpn.enable_sleep_function='0'
-		set sqm.omrvpn.autorate='1'
+		set sqm.omrvpn.autorate='0'
 		commit sqm
 	EOF
 fi