diff --git a/flextype/Themes.php b/flextype/Themes.php
index e793b95d..b8d8cb97 100644
--- a/flextype/Themes.php
+++ b/flextype/Themes.php
@@ -137,6 +137,9 @@ class Themes
             }
         }
 
+        // sort partials
+        sort($partials);
+
         // return partials
         return $partials;
     }
@@ -164,6 +167,9 @@ class Themes
             }
         }
 
+        // sort templates
+        sort($templates);
+
         // return templates
         return $templates;
     }
@@ -192,6 +198,9 @@ class Themes
             }
         }
 
+        // sort fieldsets
+        sort($fieldsets);
+
         // return fieldsets
         return $fieldsets;
     }