diff --git a/aomovie.cpp b/aomovie.cpp
index 2e7194a..9e1b64e 100644
--- a/aomovie.cpp
+++ b/aomovie.cpp
@@ -27,7 +27,6 @@ void AOMovie::play(QString p_gif, QString p_char)
   QString gif_path;
 
   QString custom_path = ao_app->get_character_path(p_char) + p_gif + ".gif";
-  QString alt_path = ao_app->get_character_path(p_char) + p_gif + ".png";
   QString theme_path = ao_app->get_theme_path() + p_gif + ".gif";
   QString default_theme_path = ao_app->get_default_theme_path() + p_gif + ".gif";
   QString placeholder_path = ao_app->get_theme_path() + "placeholder.gif";
@@ -35,8 +34,6 @@ void AOMovie::play(QString p_gif, QString p_char)
 
   if (file_exists(custom_path))
     gif_path = custom_path;
-  else if (file_exists(alt_path))
-    gif_path = alt_path;
   else if (file_exists(theme_path))
     gif_path = theme_path;
   else if (file_exists(default_theme_path))
diff --git a/path_functions.cpp b/path_functions.cpp
index 47fab06..58c7038 100644
--- a/path_functions.cpp
+++ b/path_functions.cpp
@@ -79,7 +79,14 @@ QString AOApplication::get_default_background_path()
 
 QString AOApplication::get_evidence_path()
 {
-  return get_base_path() + "evidence/";
+    QString default_path = "evidence/";
+    QString alt_path = "items/";
+    if (dir_exists(default_path))
+      return get_base_path() + default_path;
+    else if (dir_exists(alt_path))
+      return get_base_path() + alt_path;
+    else
+      return get_base_path() + default_path;
 }
 
 QString Courtroom::get_background_path()