diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index a0a7427..db38055 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -268,7 +268,7 @@
     }
 
     public static boolean showWeatherHints() {
-        return showWeatherHints;
+        return sharedPrefs.getBoolean(res.getString(R.string.settings_hint_enable_key), true);
     }
 
     public static List<Location> getFoundLocations() {
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java
index 4ac94de..48cdd99 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java
@@ -3,7 +3,10 @@
 import android.app.Activity;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 
 /**
@@ -21,13 +24,35 @@
         mFragmentTransaction.commit();
 
     }
-    public static class PrefsFragment extends PreferenceFragment {
+    public static class PrefsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
         }
+
+        @Override
+        public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+            if(key.equals(getString(R.string.settings_hint_enable_key))) {
+                boolean val = sharedPreferences.getBoolean(key, true);
+                PreferenceCategory hintCategory = (PreferenceCategory) findPreference(getString(R.string.settings_hint_key));
+                for(int i=0; i<hintCategory.getPreferenceCount(); i++) {
+                    Preference p = hintCategory.getPreference(i);
+                    if(!p.getKey().equals(key)) p.setEnabled(val); //enable/disable hint options if hints are enabled/disabled
+                }
+            }
+        }
+        @Override
+        public void onResume() {
+            super.onResume();
+            getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+        }
+
+        @Override
+        public void onPause() {
+            getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+            super.onPause();
+        }
     }
 }
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
index 119518a..66844c6 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.app.FragmentManager;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.util.Log;
 
@@ -45,8 +46,10 @@
     private HistoricalWeather histWeather;
     private DayForecast todaysForecast;
     private DayForecast tomorrowsForecast;
-    private static float MIN_HOT_TEMP = 30;
-    private static float MAX_COLD_TEMP = 10;
+    private final static float MIN_HOT_TEMP_DEFAULT = 30.0f;
+    private final static float MAX_COLD_TEMP_DEFAULT = 10.0f;
+    private static float MIN_HOT_TEMP;
+    private static float MAX_COLD_TEMP;
     private static float minWindySpeed;
 
     private static Activity activity;
@@ -106,6 +109,12 @@
         weatherConfig.lang = MainActivity.getRes().getString(R.string.lang_identifier);
         weatherConfig.numDays = 2;
 
+        SharedPreferences sharedPrefs = MainActivity.getSharedPrefs();
+        Resources res = MainActivity.getRes();
+
+        MIN_HOT_TEMP = Float.parseFloat(sharedPrefs.getString(res.getString(R.string.settings_hint_min_hot_temp_key), String.valueOf(MIN_HOT_TEMP_DEFAULT)));
+        MAX_COLD_TEMP = Float.parseFloat(sharedPrefs.getString(res.getString(R.string.settings_hint_max_cold_temp_key), String.valueOf(MAX_COLD_TEMP_DEFAULT)));
+
         minWindySpeed = 8; //http://www.wettergefahren-fruehwarnung.de/Artikel/beaufort.html
         if(weatherConfig.unitSystem.equals(WeatherConfig.UNIT_SYSTEM.I)){
             MIN_HOT_TEMP = celsiusToFahrenheit(MIN_HOT_TEMP);
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index a09eb6e..3afb8a2 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -54,6 +54,15 @@
     <string name="action_example">Example action</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_about">Über</string>
+    <string name="ui">Oberfläche</string>
+    <string name="display_hints">Hinweise anzeigen</string>
+    <string name="minimal_hot_temp">Minimale \'Heiß\'-Temperatur</string>
+    <string name="minimal_hot_temp_summary">Definiert die minimale Temeratur bei der Hinweise zu heißem Wetter angezeigt werden sollen</string>
+    <string name="maximal_cold_temp">Maximale \'Kalt\'-Temperatur</string>
+    <string name="maximal_cold_temp_summary">Definiert die maximale Temeratur bei der Hinweise zu kaltem Wetter angezeigt werden sollen</string>
+    <string name="use_modern_marker">Verwende moderne Marker</string>
+    <string name="username">Benutzername</string>
+    <string name="password">Passwort</string>
 
     <string name="osm_contrib">© <a href="http://www.openstreetmap.org/">OpenStreetMap</a>-Mitwirkende</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36b7d2e..9ac0684 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,6 +55,16 @@
     <string name="action_example">Example action</string>
     <string name="action_settings">Settings</string>
     <string name="action_about">About</string>
+    <string name="ui">UI</string>
+    <string name="osm" translatable="false">OSM</string>
+    <string name="display_hints">Display hints</string>
+    <string name="minimal_hot_temp">Minimal hot temperature</string>
+    <string name="minimal_hot_temp_summary">Sets the minimal value at which a hint should be displayed for hot weather</string>
+    <string name="maximal_cold_temp">Maximal cold temperature</string>
+    <string name="maximal_cold_temp_summary">Sets the maximal value at which a hint should be displayed for cold weather</string>
+    <string name="use_modern_marker">Use modern markers</string>
+    <string name="username">Username</string>
+    <string name="password">Password</string>
 
     <string name="osm_contrib">© <a href="http://www.openstreetmap.org/">OpenStreetMap</a> contributors</string>
 
@@ -65,6 +75,13 @@
 
     <string name="menu_title_about_key" translatable="false">about</string>
     <string name="menu_title_settings_key" translatable="false">settings</string>
+    <string name="settings_hint_key" translatable="false">hints</string>
+    <string name="settings_hint_enable_key" translatable="false">dispHints</string>
+    <string name="settings_hint_min_hot_temp_key" translatable="false">maxHotTemp</string>
+    <string name="settings_hint_max_cold_temp_key" translatable="false">minColdTemp</string>
+    <string name="settings_ui_use_marker_key" translatable="false">useModernMarkers</string>
+    <string name="settings_osm_user_key" translatable="false">username</string>
+    <string name="settings_osm_password_key" translatable="false">password</string>
 
     <string-array name="toggleEntries">
         <item>Fountain</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index cc2e1df..bc8c33f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,39 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="Hints">
+    <PreferenceCategory
+        android:title="@string/hint_dialog_title"
+        android:key="@string/settings_hint_key">
+        <CheckBoxPreference
+            android:title="@string/display_hints"
+            android:key="@string/settings_hint_enable_key"
+            android:defaultValue="true">
+        </CheckBoxPreference>
         <EditTextPreference
-            android:title="Minimal Hot Temperature"
-            android:key="minHotTemp"
+            android:title="@string/minimal_hot_temp"
+            android:key="@string/settings_hint_min_hot_temp_key"
+            android:inputType="number"
             android:defaultValue="30"
-            android:summary="Sets the minimal value at which a hint should be displayed">
+            android:summary="@string/minimal_hot_temp_summary">
         </EditTextPreference>
         <EditTextPreference
-            android:title="Maximal Cold Temperature"
-            android:key="maxColdTemp"
+            android:title="@string/maximal_cold_temp"
+            android:key="@string/settings_hint_max_cold_temp_key"
+            android:inputType="number"
             android:defaultValue="10"
-            android:summary="Sets the maximal value at which a hint should be displayed">
+            android:summary="@string/maximal_cold_temp_summary">
         </EditTextPreference>
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/ui">
         <CheckBoxPreference
-            android:title="Display hints"
-            android:key="dispHints">
+            android:title="@string/use_modern_marker"
+            android:key="@string/settings_ui_use_marker_key"
+            android:defaultValue="true">
         </CheckBoxPreference>
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="UI">
-        <CheckBoxPreference
-            android:title="Use modern markers"
-            android:key="useModernMarkers">
-        </CheckBoxPreference>
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:title="OSM">
+        android:title="@string/osm">
         <EditTextPreference
-            android:title="Username"
-            android:key="osmUser">
+            android:title="@string/username"
+            android:key="@string/settings_osm_user_key">
         </EditTextPreference>
         <EditTextPreference
-            android:title="Password"
-            android:key="osmPassword">
+            android:title="@string/password"
+            android:key="@string/settings_osm_password_key">
         </EditTextPreference>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file