diff --git a/src/NzbDrone.Core/Datastore/Migration/029_add_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/029_add_formats_to_naming_config.cs
index fbcd4cb2b..80f413e1c 100644
--- a/src/NzbDrone.Core/Datastore/Migration/029_add_formats_to_naming_config.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/029_add_formats_to_naming_config.cs
@@ -90,7 +90,7 @@ namespace NzbDrone.Core.Datastore.Migration
                         {
                             if (replaceSpaces)
                             {
-                                qualityFormat = " [{Quality.Title}]";
+                                qualityFormat = ".[{Quality.Title}]";
                             }
 
                             standardEpisodeFormat += qualityFormat;
diff --git a/src/UI/Content/checkbox-button.less b/src/UI/Content/checkbox-button.less
index becb5a7df..2de5b3dc1 100644
--- a/src/UI/Content/checkbox-button.less
+++ b/src/UI/Content/checkbox-button.less
@@ -26,7 +26,7 @@
     color: #333333;
   }
 
-    input:first-of-type:checked ~ .btn {
+    input:first-of-type:checked ~ .btn-primary {
       .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
     }
   }
diff --git a/src/UI/Content/font.less b/src/UI/Content/font.less
index 71636bcd6..163ada0a6 100644
--- a/src/UI/Content/font.less
+++ b/src/UI/Content/font.less
@@ -33,3 +33,15 @@
          url('/Content/fonts/opensans-semibold.woff') format('woff'),
          url('/Content/fonts/opensans-semibold.ttf') format('truetype')
 }
+
+@font-face {
+    font-family: 'Ubuntu Mono';
+    font-style: normal;
+    font-weight: 400;
+    src: url('/Content/fonts/ubuntumono-regular.eot');
+    src: local('Open Sans'),
+         local('OpenSans'),
+         url('/Content/fonts/ubuntumono-regular.eot?#iefix') format('embedded-opentype'),
+         url('/Content/fonts/ubuntumono-regular.woff') format('woff'),
+         url('/Content/fonts/ubuntumono-regular.ttf') format('truetype')
+}
\ No newline at end of file
diff --git a/src/UI/Content/fonts/UbuntuMono-Regular.ttf b/src/UI/Content/fonts/UbuntuMono-Regular.ttf
new file mode 100644
index 000000000..fdd309d71
Binary files /dev/null and b/src/UI/Content/fonts/UbuntuMono-Regular.ttf differ
diff --git a/src/UI/Content/fonts/ubuntumono-regular.eot b/src/UI/Content/fonts/ubuntumono-regular.eot
new file mode 100644
index 000000000..7a03fb512
Binary files /dev/null and b/src/UI/Content/fonts/ubuntumono-regular.eot differ
diff --git a/src/UI/Content/fonts/ubuntumono-regular.woff b/src/UI/Content/fonts/ubuntumono-regular.woff
new file mode 100644
index 000000000..0289699c0
Binary files /dev/null and b/src/UI/Content/fonts/ubuntumono-regular.woff differ
diff --git a/src/UI/Content/icons.less b/src/UI/Content/icons.less
index 849830f91..3a648cf33 100644
--- a/src/UI/Content/icons.less
+++ b/src/UI/Content/icons.less
@@ -166,4 +166,4 @@
 .icon-nd-download-failed:before {
   .icon(@cloud-download);
   color: @errorText;
-}
\ No newline at end of file
+}
diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less
index f3a77ecbe..eb99df003 100644
--- a/src/UI/Content/theme.less
+++ b/src/UI/Content/theme.less
@@ -12,6 +12,7 @@
 @import "legend";
 @import "../Shared/Styles/clickable";
 @import "../Shared/Styles/card";
+@import "../Rename/rename";
 
 .progress.episode-progress {
   width         : 125px;
@@ -185,16 +186,10 @@ footer {
   display : none;
 }
 
-.rename-preview-item {
-  margin-bottom: 5px;
-  padding: 5px;
-  border-bottom: 1px solid #e5e5e5;
+.mono-space {
+  font-family: "ubuntu mono"
+}
 
-  .checkbox {
-    width: 80px;
-    margin-left: 0px;
-    display: inline-block;
-    padding-top: 0px;
-    margin-bottom: 0px;
-  }
+.file-path {
+  .mono-space();
 }
\ No newline at end of file
diff --git a/src/UI/Rename/RenamePreviewItemView.js b/src/UI/Rename/RenamePreviewItemView.js
index 71994e208..fc654aa09 100644
--- a/src/UI/Rename/RenamePreviewItemView.js
+++ b/src/UI/Rename/RenamePreviewItemView.js
@@ -6,7 +6,39 @@ define(
         'Mixins/AsModelBoundView'
     ], function (vent, Marionette, AsModelBoundView) {
         var view = Marionette.ItemView.extend({
-            template: 'Rename/RenamePreviewItemViewTemplate'
+            template: 'Rename/RenamePreviewItemViewTemplate',
+
+            ui: {
+                itemDiv: '.rename-preview-item',
+                checkboxIcon: '.rename-checkbox i'
+            },
+
+            onRender: function () {
+                this._setItemState();
+                this.listenTo(this.model, 'change', this._setItemState);
+                this.listenTo(this.model, 'rename:select', this._onRenameAll);
+            },
+
+            _setItemState: function () {
+                var checked = this.model.get('rename');
+                this.model.trigger('rename:select', this.model, checked);
+
+                if (checked) {
+                    this.ui.itemDiv.removeClass('do-not-rename');
+                    this.ui.checkboxIcon.addClass('icon-check');
+                    this.ui.checkboxIcon.removeClass('icon-check-empty');
+                }
+
+                else {
+                    this.ui.itemDiv.addClass('do-not-rename');
+                    this.ui.checkboxIcon.addClass('icon-check-empty');
+                    this.ui.checkboxIcon.removeClass('icon-check');
+                }
+            },
+
+            _onRenameAll: function (model, checked) {
+                this.model.set('rename', checked);
+            }
         });
 
         return AsModelBoundView.apply(view);
diff --git a/src/UI/Rename/RenamePreviewItemViewTemplate.html b/src/UI/Rename/RenamePreviewItemViewTemplate.html
index cb6dc2288..799eaf1b7 100644
--- a/src/UI/Rename/RenamePreviewItemViewTemplate.html
+++ b/src/UI/Rename/RenamePreviewItemViewTemplate.html
@@ -1,24 +1,19 @@
 <div class="rename-preview-item">
     <div class="row">
-        <div class="span1">
-            <label class="checkbox toggle well" title="Rename file">
+        <div class="rename-checkbox span">
+            <label class="checkbox-button" title="Rename File">
                 <input type="checkbox" name="rename"/>
-                <p>
-                    <span>Yes</span>
-                    <span>No</span>
-                </p>
-
-                <div class="btn btn-warning slide-button"/>
+                <div class="btn btn-icon-only">
+                    <i></i>
+                </div>
             </label>
         </div>
         <div class="span9">
             <div class="row">
-                <div class="span1">Existing</div>
-                <div class="span8">{{existingPath}}</div>
+                <div class="span9 file-path"><i class="icon-nd-existing" title="Existing path" /> {{existingPath}}</div>
             </div>
             <div class="row">
-                <div class="span1">Suggested</div>
-                <div class="span8">{{newPath}}</div>
+                <div class="span9 file-path"><i class="icon-nd-suggested" title="Suggested path" /> {{newPath}}</div>
             </div>
         </div>
     </div>
diff --git a/src/UI/Rename/RenamePreviewLayout.js b/src/UI/Rename/RenamePreviewLayout.js
index 469f75a7d..063789bda 100644
--- a/src/UI/Rename/RenamePreviewLayout.js
+++ b/src/UI/Rename/RenamePreviewLayout.js
@@ -19,11 +19,14 @@ define(
             },
 
             ui: {
-                pathInfo: '.x-path-info'
+                pathInfo     : '.x-path-info',
+                renameAll    : '.x-rename-all',
+                checkboxIcon: '.x-rename-all-button i'
             },
 
             events: {
-                'click .x-organize': '_organizeFiles'
+                'click .x-organize'   : '_organizeFiles',
+                'change .x-rename-all': '_toggleAll'
             },
 
             initialize: function (options) {
@@ -36,6 +39,7 @@ define(
 
                 this.collection = new RenamePreviewCollection(viewOptions);
                 this.listenTo(this.collection, 'sync', this._showPreviews);
+                this.listenTo(this.collection, 'rename:select', this._itemRenameChanged);
 
                 this.collection.fetch();
             },
@@ -51,6 +55,7 @@ define(
                     return;
                 }
 
+                this.ui.pathInfo.show();
                 this.collection.invoke('set', { rename: true });
                 this.renamePreviews.show(new RenamePreviewCollectionView({ collection: this.collection }));
             },
@@ -88,6 +93,37 @@ define(
                 }
 
                 vent.trigger(vent.Commands.CloseModalCommand);
+            },
+
+            _setCheckedState: function (checked) {
+                if (checked) {
+                    this.ui.checkboxIcon.addClass('icon-check');
+                    this.ui.checkboxIcon.removeClass('icon-check-empty');
+                }
+
+                else {
+                    this.ui.checkboxIcon.addClass('icon-check-empty');
+                    this.ui.checkboxIcon.removeClass('icon-check');
+                }
+            },
+
+            _toggleAll: function () {
+                var checked = this.ui.renameAll.prop('checked');
+                this._setCheckedState(checked);
+
+                this.collection.each(function (model) {
+                    model.trigger('rename:select', model, checked);
+                });
+            },
+
+            _itemRenameChanged: function (model, checked) {
+                var allChecked = this.collection.all(function (m) {
+                    return m.get('rename');
+                });
+
+                if (!checked || allChecked) {
+                    this._setCheckedState(checked);
+                }
             }
         });
     });
diff --git a/src/UI/Rename/RenamePreviewLayoutTemplate.html b/src/UI/Rename/RenamePreviewLayoutTemplate.html
index 5151e6257..399801f0d 100644
--- a/src/UI/Rename/RenamePreviewLayoutTemplate.html
+++ b/src/UI/Rename/RenamePreviewLayoutTemplate.html
@@ -1,19 +1,26 @@
 <div class="rename-preview-modal">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-
         <h3>
-            Organize & Rename
+            <i class="icon-nd-rename"></i> Organize & Rename
         </h3>
 
     </div>
     <div class="modal-body">
-        <div class="alert alert-info x-path-info">All paths are relative to: <strong>{{path}}</strong></div>
+        <div class="alert alert-info path-info x-path-info">All paths are relative to: <strong>{{path}}</strong></div>
         <div id="rename-previews"></div>
     </div>
     <div class="modal-footer">
+        <span class="rename-all-button x-rename-all-button pull-left">
+            <label class="checkbox-button" title="Toggle all">
+                <input type="checkbox" checked="checked" class="x-rename-all"/>
+                <div class="btn btn-icon-only">
+                    <i class="icon-check"></i>
+                </div>
+            </label>
+        </span>
         <button class="btn" data-dismiss="modal">close</button>
-        <button class="btn x-organize">Organize</button>
+        <button class="btn btn-primary x-organize">Organize</button>
     </div>
 </div>
 
diff --git a/src/UI/Rename/rename.less b/src/UI/Rename/rename.less
new file mode 100644
index 000000000..65f9a3007
--- /dev/null
+++ b/src/UI/Rename/rename.less
@@ -0,0 +1,55 @@
+@import "../Content/FontAwesome/font-awesome";
+@import "../Content/Bootstrap/variables";
+@import "../Content/variables";
+
+.rename-preview-item {
+  margin-bottom: 5px;
+  padding: 5px;
+  border-bottom: 1px solid #e5e5e5;
+
+  &.do-not-rename {
+    background-color: #aaaaaa;
+    opacity: 0.7;
+  }
+
+  .icon-nd-existing:before {
+    .icon(@minus);
+    color : @errorText;
+  }
+
+  .icon-nd-suggested:before {
+    .icon(@plus);
+    color : @successText;
+  }
+
+  .rename-checkbox {
+    width: 20px;
+    padding-top: 5px;
+    margin-right: 10px;
+
+    .checkbox-button {
+      .btn {
+        text-align: left;
+        min-width: 10px;
+        width: 10px;
+      }
+    }
+  }
+}
+
+.path-info {
+  display: none;
+}
+
+.rename-all-button {
+  display: inline-block;
+
+  .checkbox-button {
+    .btn {
+      text-align: left;
+      min-width: 10px;
+      width: 10px;
+    }
+  }
+}
+
diff --git a/src/UpgradeLog.htm b/src/UpgradeLog.htm
new file mode 100644
index 000000000..2732cdfdc
Binary files /dev/null and b/src/UpgradeLog.htm differ
diff --git a/src/UpgradeLog2.htm b/src/UpgradeLog2.htm
new file mode 100644
index 000000000..2732cdfdc
Binary files /dev/null and b/src/UpgradeLog2.htm differ