diff --git a/devel_themer.install b/devel_themer.install
index 2878a49..78b30ff 100644
--- a/devel_themer.install
+++ b/devel_themer.install
@@ -5,6 +5,11 @@
  * Install and uninstall hooks for theme developer
  *
  */
+
+function devel_themer_disable() {
+  devel_themer_cleanup();
+}
+
 function devel_themer_requirements($phase) {
   // Ensure translations don't break at install time
   $t = get_t();
diff --git a/devel_themer.module b/devel_themer.module
index 05740fa..cd0e09d 100644
--- a/devel_themer.module
+++ b/devel_themer.module
@@ -646,10 +646,12 @@ EOT;
  *   void.
  */
 function devel_themer_cleanup() {
-  $scan = file_scan_directory('temporary://', '/^devel_themer_/', array('recurse' => FALSE));
-  foreach (array_keys($scan) as $file) {
-    $fid = db_query('SELECT fid FROM {file_managed} WHERE uri = :uri', array(':uri' => "temporary://$file"))->fetchField();
+  $scan = file_scan_directory(variable_get("file_temporary_path","/tmp"), '/^devel_themer_/', array('recurse' => FALSE));
+  foreach ($scan as $file) {
+    $fid = db_query('SELECT fid FROM {file_managed} WHERE uri = :uri', array(':uri' => "temporary://".$file->filename))->fetchField();
     if (!empty($fid)) {
+      $file->fid = $fid;
+      $file->uri = "temporary://".$file->filename;
       file_delete($file);
     }
   }