diff -r f7e492b43690 -r 3ef997c53b50 GUI/MainForm.cs
--- a/GUI/MainForm.cs	Tue May 18 19:16:55 2010 +0000
+++ b/GUI/MainForm.cs	Thu May 20 21:23:54 2010 +0000
@@ -149,7 +149,11 @@
       startMinMenuItem.Checked = Config.Get(startMinMenuItem.Name, false); 
       minTrayMenuItem.Checked = Config.Get(minTrayMenuItem.Name, true);
       startupMenuItem.Checked = startupManager.Startup;
-      hddMenuItem.Checked = Config.Get(hddMenuItem.Name, true);   
+      hddMenuItem.Checked = Config.Get(hddMenuItem.Name, true);
+
+      celciusToolStripMenuItem.Checked = 
+        UnitManager.TemperatureUnit == TemperatureUnit.Celcius;
+      fahrenheitToolStripMenuItem.Checked = !celciusToolStripMenuItem.Checked;
 
       if (startMinMenuItem.Checked) {
         if (!minTrayMenuItem.Checked) {
@@ -439,5 +443,17 @@
     private void limitMenuItem_CheckedChanged(object sender, EventArgs e) {
       treeView.Columns[4].IsVisible = limitMenuItem.Checked;
     }
+
+    private void celciusToolStripMenuItem_Click(object sender, EventArgs e) {
+      celciusToolStripMenuItem.Checked = true;
+      fahrenheitToolStripMenuItem.Checked = false;
+      UnitManager.TemperatureUnit = TemperatureUnit.Celcius;
+    }
+
+    private void fahrenheitToolStripMenuItem_Click(object sender, EventArgs e) {
+      celciusToolStripMenuItem.Checked = false;
+      fahrenheitToolStripMenuItem.Checked = true;
+      UnitManager.TemperatureUnit = TemperatureUnit.Fahrenheit;
+    }
   }
 }