diff --git a/weather.module b/weather.module
index 7804deb..29f2931 100644
--- a/weather.module
+++ b/weather.module
@@ -1,5 +1,5 @@
 <?php
-/* $Id$
+/* $Id: weather.module,v 1.205.2.27 2010/12/16 16:58:13 toddy Exp $
  *
  * Copyright © 2006-2010 Tobias Quathamer <t.quathamer@gmx.net>
  *
@@ -528,11 +528,15 @@ function _weather_get_image($metar) {
       }
     }
   }
-
+  
   // Support a custom image directory. If the variable is not set or the specified
   // file is not available, fall back to the default images of the module.
   $path = variable_get('weather_image_directory', '');
-  $filename = file_directory_path() .'/'. $path .'/'. $name .'.png';
+  //use the current theme path instead of the files directory
+  global $theme;
+  $theme_path = drupal_get_path('theme', $theme);
+  $filename = $theme_path .'/'. $path .'/'. $name .'.png';
+  
   if (!is_readable($filename)) {
     $filename = drupal_get_path('module', 'weather') .'/images/'. $name .'.png';
   }
@@ -667,7 +671,7 @@ function weather_main_page_form() {
   $form['weather_image_directory'] = array(
     '#type' => 'textfield',
     '#title' => t('Directory for custom images'),
-    '#description' => t('Override the default image directory. This directory must be a subdirectory of the Drupal \'files\' path.'),
+    '#description' => t('Override the default image directory. This directory must be a subdirectory of the current theme path.'),
     '#default_value' => variable_get('weather_image_directory', ''),
   );
   $form['submit'] = array(