diff --git a/src/config/mouseinputbutton_p.h b/src/config/mouseinputbutton_p.h
index 81bc6f401b8570476b333e51c2054559364315ba..3429b79ec3f11776d708542dcf8226b62bf984d8 100644
--- a/src/config/mouseinputbutton_p.h
+++ b/src/config/mouseinputbutton_p.h
@@ -28,7 +28,7 @@ namespace Palapeli
 	{
 		Q_OBJECT
 		public:
-			FlatButton(const QIcon& icon, QWidget* parent = 0) : QLabel(parent), m_icon(icon)
+			explicit FlatButton(const QIcon& icon, QWidget* parent = 0) : QLabel(parent), m_icon(icon)
 			{
 				leaveEvent(0); //apply icon
 				setMouseTracking(true);
diff --git a/src/config/triggerconfigwidget.cpp b/src/config/triggerconfigwidget.cpp
index 299c7946fd3b3275d4c1c31368b0946d299ddae2..b82ca07691c9db2ff23306626efa1744f0eeb5b3 100644
--- a/src/config/triggerconfigwidget.cpp
+++ b/src/config/triggerconfigwidget.cpp
@@ -24,7 +24,7 @@
 #include <KLocalizedString>
 
 Palapeli::TriggerConfigWidget::TriggerConfigWidget(QWidget* parent)
-	: QTabWidget(parent)
+	: KTabWidget(parent)
 	, m_interactors(Palapeli::TriggerMapper::createInteractors(0)) //these interactors are just for reading metadata
 	, m_mouseView(new Palapeli::TriggerListView(m_interactors, Palapeli::MouseInteractor, this))
 	, m_wheelView(new Palapeli::TriggerListView(m_interactors, Palapeli::WheelInteractor, this))
diff --git a/src/config/triggerconfigwidget.h b/src/config/triggerconfigwidget.h
index a48e0768c431585b95154299f6c4fc1c083ff413..578f436f491c025dd8cdab479de3758e64d88697 100644
--- a/src/config/triggerconfigwidget.h
+++ b/src/config/triggerconfigwidget.h
@@ -20,14 +20,14 @@
 #define PALAPELI_TRIGGERCONFIGWIDGET_H
 
 #include <QMap>
-#include <QTabWidget>
+#include <KTabWidget>
 
 namespace Palapeli
 {
 	class Interactor;
 	class TriggerListView;
 
-	class TriggerConfigWidget : public QTabWidget
+	class TriggerConfigWidget : public KTabWidget
 	{
 		Q_OBJECT
 		public:
diff --git a/src/config/triggerlistview_p.h b/src/config/triggerlistview_p.h
index 884ae1b2382c591a3db98e6bfdc5d8c10f0c73c6..ca13c7d85d1b353b79970afa2c3ade8379284f12 100644
--- a/src/config/triggerlistview_p.h
+++ b/src/config/triggerlistview_p.h
@@ -108,7 +108,7 @@ namespace Palapeli
 	{
 		Q_OBJECT
 		public:
-			TriggerListDelegate(QAbstractItemView* view, QObject* parent = 0) : KWidgetItemDelegate(view, parent)
+			explicit TriggerListDelegate(QAbstractItemView* view, QObject* parent = 0) : KWidgetItemDelegate(view, parent)
 			{
 				m_calculator = new Palapeli::TriggerListDelegateWidget(view);
 				m_calculator->setVisible(false);
diff --git a/src/engine/triggermapper.cpp b/src/engine/triggermapper.cpp
index 6cba2397da3791711466b16f0310725dfcd3e2dc..f0da7cb55b6479ae6a87f97aa6243241f074f18d 100644
--- a/src/engine/triggermapper.cpp
+++ b/src/engine/triggermapper.cpp
@@ -67,7 +67,7 @@ Palapeli::TriggerMapper::TriggerMapper()
 	m_keyModifierMap[Qt::Key_Control] = Qt::ControlModifier;
 	m_keyModifierMap[Qt::Key_Alt] = Qt::AltModifier;
 	m_keyModifierMap[Qt::Key_Meta] = Qt::MetaModifier;
-	//intialize dynamic data
+	//initialize dynamic data
 	readSettings();
 }
 
diff --git a/src/settings.ui b/src/settings.ui
index 19162d74b7b57c4dab82f4157c3868410ead0446..f803b73ddab793834149070d7cf9ebadaf475399 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -51,7 +51,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>Piece behavior</string>
+      <string comment="@title:group">Piece behavior</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
@@ -100,7 +100,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string extracomment="description for the &quot;snapping precision&quot; setting">Very precise (harder)</string>
+           <string comment="@item:inrange description for the &quot;snapping precision&quot; setting">Very precise (harder)</string>
           </property>
          </widget>
         </item>
@@ -129,7 +129,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string extracomment="description for the &quot;snapping precision&quot; setting">Unprecise (easier)</string>
+           <string comment="@item:inrange description for the &quot;snapping precision&quot; setting">Unprecise (easier)</string>
           </property>
          </widget>
         </item>