diff --git a/themes/sobriety/js/ui.init.js b/themes/sobriety/js/ui.init.js
index 2e1e6e89..4393a04a 100644
--- a/themes/sobriety/js/ui.init.js
+++ b/themes/sobriety/js/ui.init.js
@@ -43,6 +43,9 @@ $(document).ready(function() {
     });
   }
 
+  // Remove titles for menu options since we're displaying that text anyway
+  $(".sf-menu a, .sf-menu li").removeAttr("title");
+
   // Album and search results views
   /*if ($("#g-album-grid").length) {
     // Set equal height for album items and vertically align thumbnails/metadata
diff --git a/themes/sobriety/theme.info b/themes/sobriety/theme.info
index f2bcb5f3..8ac699d6 100644
--- a/themes/sobriety/theme.info
+++ b/themes/sobriety/theme.info
@@ -4,5 +4,5 @@ version = 1
 author = "Romain LE DISEZ"
 site = 1
 admin = 0
-;wind commit = 2bbce8dddb0ab0a00aee727e2f639b793988a1d1
-;wind date = Thu Jun 17 09:10:01 2010 -0700
+;wind commit = c41bd46a744479813b3442f3e20ce17765353e70
+;wind date = Wed Jun 23 20:42:42 2010 +0800
diff --git a/themes/sobriety/views/album.html.php b/themes/sobriety/views/album.html.php
index eabe07c3..b9072e2b 100644
--- a/themes/sobriety/views/album.html.php
+++ b/themes/sobriety/views/album.html.php
@@ -29,7 +29,7 @@
   <? endforeach ?>
 <? else: ?>
   <? if ($user->admin || access::can("add", $item)): ?>
-  <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
+  <? $addurl = url::site("flash_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
             array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
   <? else: ?>
diff --git a/themes/sobriety/views/form_uploadify.html.php b/themes/sobriety/views/form_uploadify.html.php
index 6012f40b..62171c04 100644
--- a/themes/sobriety/views/form_uploadify.html.php
+++ b/themes/sobriety/views/form_uploadify.html.php
@@ -49,7 +49,7 @@
       uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>",
       script: "<?= url::site("simple_uploader/add_photo/{$album->id}") ?>",
       scriptData: <?= json_encode($script_data) ?>,
-      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
+      fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.m4v;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4;*.M4V",
       fileDesc: <?= t("Photos and movies")->for_js() ?>,
       cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
       simUploadLimit: <?= $simultaneous_upload_limit ?>,
@@ -166,4 +166,4 @@
   </ul>
 </div>
 */
-?>
\ No newline at end of file
+?>
diff --git a/themes/sobriety/views/page.html.php b/themes/sobriety/views/page.html.php
index 040ec1c5..cf10b85e 100644
--- a/themes/sobriety/views/page.html.php
+++ b/themes/sobriety/views/page.html.php
@@ -95,11 +95,13 @@
                  the immediate parent so that when you go back up a
                  level you're on the right page. -->
             <a href="<?= $parent->url($parent == $theme->item()->parent() ?
-                     "show={$theme->item()->id}" : null) ?>"><?= html::purify($parent->title) ?></a>
+                     "show={$theme->item()->id}" : null) ?>"><?= text::limit_chars(html::purify($parent->title), 15) ?></a>
           </li>
           <? $i++ ?>
           <? endforeach ?>
-          <li class="g-active<? if ($i == 0) print " g-first" ?>"><?= html::purify($theme->item()->title) ?></li>
+          <li class="g-active<? if ($i == 0) print " g-first" ?>">
+            <?= text::limit_chars(html::purify($theme->item()->title), 15) ?>
+          </li>
         </ul>
         <? endif ?>
       </div>