diff --git a/overviewer.py b/overviewer.py
index 232f176..6ecf0cc 100755
--- a/overviewer.py
+++ b/overviewer.py
@@ -148,12 +148,12 @@ def main():
 
         logging.info("Looking for a few common texture files...")
         try:
-            f = tex.find_file("textures/blocks/stone.png", verbose=True)
-            f = tex.find_file("textures/blocks/tallgrass.png", verbose=True)
-            f = tex.find_file("textures/blocks/oreDiamond.png", verbose=True)
-            f = tex.find_file("textures/blocks/wood.png", verbose=True)
+            f = tex.find_file("assets/minecraft/textures/blocks/sandstone_top.png", verbose=True)
+            f = tex.find_file("assets/minecraft/textures/blocks/grass_top.png", verbose=True)
+            f = tex.find_file("assets/minecraft/textures/blocks/diamond_ore.png", verbose=True)
+            f = tex.find_file("assets/minecraft/textures/blocks/planks_oak.png", verbose=True)
         except IOError:
-            logging.error("Could not find the file stone.png")
+            logging.error("Could not find any texture files.")
             return 1
 
         return 0
diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py
index 3d4418e..879fb24 100644
--- a/overviewer_core/textures.py
+++ b/overviewer_core/textures.py
@@ -25,6 +25,7 @@ import numpy
 from PIL import Image, ImageEnhance, ImageOps, ImageDraw
 import logging
 import functools
+import glob
 
 import util
 from c_overviewer import alpha_over
@@ -184,9 +185,16 @@ class Textures(object):
         # Find minecraft.jar.
         jarpaths = []
         if "APPDATA" in os.environ:
+            jarpaths += sorted(glob.glob(os.path.join(os.environ['APPDATA'], ".minecraft", "versions", "*.*", "*.jar")),
+                    reverse=True)
             jarpaths.append( os.path.join(os.environ['APPDATA'], ".minecraft",
                 "bin", "minecraft.jar"))
         if "HOME" in os.environ:
+            jarpaths += sorted(glob.glob(os.path.join(os.environ['HOME'], ".minecraft", "versions", "*.*", "*.jar")),
+                    reverse=True)
+            jarpaths += sorted(glob.glob(os.path.join(os.environ['HOME'], "Library", "Application Support", "minecraft",
+                "versions", "*.*", "*.jar")),
+                reverse=True)
             jarpaths.append(os.path.join(os.environ['HOME'], "Library",
                     "Application Support", "minecraft","bin","minecraft.jar"))
             jarpaths.append(os.path.join(os.environ['HOME'], ".minecraft", "bin",