diff --git a/scratch/TODO b/scratch/TODO
index 553a390e..4c9a20ad 100644
--- a/scratch/TODO
+++ b/scratch/TODO
@@ -1,6 +1,5 @@
 Gollum Editor
   - Style / Generate dialogs
-  - Dynamically show/hide different function bar buttons based on active language capabilities
   - Def: Org
   - Def: Pod
   - Def: RDoc
diff --git a/scratch/css/editor.css b/scratch/css/editor.css
index 1dfeb239..b5f0d329 100644
--- a/scratch/css/editor.css
+++ b/scratch/css/editor.css
@@ -71,6 +71,10 @@
   background: -moz-linear-gradient(top, #599bdc, #3072b3);
 }
 
+#gollum-editor #gollum-editor-function-bar a.disabled {
+  display: none;
+}
+
 #gollum-editor #gollum-editor-function-bar span.function-divider {
   display: block;
   float: left;
diff --git a/scratch/edit.html b/scratch/edit.html
index 0bc8f0ed..870e1307 100644
--- a/scratch/edit.html
+++ b/scratch/edit.html
@@ -41,14 +41,6 @@
         <span class="function-divider">&nbsp;</span>
         <a href="#" id="function-link" class="function-button">Link</a>
         <a href="#" id="function-image" class="function-button">Image</a>
-      
-        <div id="gollum-editor-format-selector">
-          <select name="gollum-editor-format-select"
-           id="gollum-editor-format-select" disabled>
-           <option name="Markdown" value="markdown" selected>
-             Markdown</option>
-          </select>
-        </div>
       </div>
       <fieldset id="gollum-editor-fields">
         <textarea id="gollum-editor-body"
diff --git a/scratch/js/gollum-editor/gollum.editor.js b/scratch/js/gollum-editor/gollum.editor.js
index c1a78335..261e30bb 100644
--- a/scratch/js/gollum-editor/gollum.editor.js
+++ b/scratch/js/gollum-editor/gollum.editor.js
@@ -5,7 +5,7 @@
  *  Usage:
  *  $.GollumEditor(); on DOM ready.
  */
-(function($) {
+// (function($) {
   
   // Editor options
   var DefaultOptions = {
@@ -258,8 +258,14 @@
        *
        */
       activate: function() {
-        $('#gollum-editor-function-bar a.function-button')
-          .click( FunctionBar.evtFunctionButtonClick );
+        // check these out
+        $('#gollum-editor-function-bar a.function-button').each(function() {
+          if ( LanguageDefinition.getDefinitionFor( $(this).attr('id') ) )
+            $(this).click( FunctionBar.evtFunctionButtonClick );
+          else 
+            $(this).addClass('disabled');
+        });
+
         // show bar as active
         $('#gollum-editor-function-bar').addClass( 'active' );
         FunctionBar.isActive = true;
@@ -422,7 +428,7 @@
     */
    var Dialog = {
      
-     markupCreated = false,
+     markupCreated: false,
      
      attachEvents: function( evtOK ) {
        $('#gollum-editor-action-ok').click( Dialog.eventOK( evtOK ) );
@@ -457,7 +463,7 @@
 
      hide: function() {
        $('#gollum-editor-dialog').animate({ opacity: 0 }, {
-          duration: 700 
+          duration: 700,
           complete: function() {
             $('#gollum-editor-dialog').removeClass('active');
           }
@@ -506,7 +512,7 @@
      
    };
   
-})(jQuery); 
+// })(jQuery); 
 
 jQuery(document).ready(function() {
   $.GollumEditor();
diff --git a/scratch/js/gollum-editor/langs/asciidoc.js b/scratch/js/gollum-editor/langs/asciidoc.js
index 03a9c729..f034c394 100644
--- a/scratch/js/gollum-editor/langs/asciidoc.js
+++ b/scratch/js/gollum-editor/langs/asciidoc.js
@@ -103,6 +103,6 @@ var ASCIIDoc = {
 
 
 // this is necessary for GollumEditor to pick this up
-jQuery.GollumEditor.defineLanguage('markdown', ASCIIDoc);
+jQuery.GollumEditor.defineLanguage('asciidoc', ASCIIDoc);
 
 })();
diff --git a/scratch/js/gollum-editor/langs/markdown.js b/scratch/js/gollum-editor/langs/markdown.js
index d2500db9..db7dc17f 100644
--- a/scratch/js/gollum-editor/langs/markdown.js
+++ b/scratch/js/gollum-editor/langs/markdown.js
@@ -54,7 +54,7 @@ var MarkDown = {
   'function-blockquote' :   {
                               search: /(.+)([\n]?)/gi,
                               replace: "> $1$2"
-                            },
+                            }, 
                             
   'function-link'       :   {
                               exec: function( txt, selText, $field ) {
diff --git a/scratch/js/gollum-editor/langs/textile.js b/scratch/js/gollum-editor/langs/textile.js
index 961ad247..ae0b958f 100644
--- a/scratch/js/gollum-editor/langs/textile.js
+++ b/scratch/js/gollum-editor/langs/textile.js
@@ -106,6 +106,6 @@ var Textile = {
                             
 };
 
-jQuery.GollumEditor.defineLanguage('markdown', Textile);
+jQuery.GollumEditor.defineLanguage('textile', Textile);
 
 })();