diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 882dc57722..6032ff9117 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -179,7 +179,6 @@ set( COMMON_SRCS
     grid_tricks.cpp
     gr_basic.cpp
     hotkeys_basic.cpp
-    hotkey_grid_table.cpp
     html_messagebox.cpp
     kiface_i.cpp
     kiway.cpp
diff --git a/common/dialogs/dialog_hotkeys_editor.cpp b/common/dialogs/dialog_hotkeys_editor.cpp
index 1c249b7f3c..2f8bd4685d 100644
--- a/common/dialogs/dialog_hotkeys_editor.cpp
+++ b/common/dialogs/dialog_hotkeys_editor.cpp
@@ -5,7 +5,7 @@
 /*
  * This program source code file is part of KICAD, a free EDA CAD application.
  *
- * Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2014 Kicad Developers, see CHANGELOG.TXT for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,243 +30,355 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <common.h>
+#include <confirm.h>
 
 #include <dialog_hotkeys_editor.h>
 
-void InstallHotkeyFrame( EDA_DRAW_FRAME* parent, EDA_HOTKEY_CONFIG* hotkeys )
+
+HOTKEY_LIST_CTRL::HOTKEY_LIST_CTRL( wxWindow *aParent, struct EDA_HOTKEY_CONFIG* aSection ) :
+    wxListCtrl( aParent, wxID_ANY, wxDefaultPosition,
+                wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VIRTUAL )
 {
-    HOTKEYS_EDITOR_DIALOG dialog( parent, hotkeys );
+    m_sectionTag = aSection->m_SectionTag;
+    m_curEditingRow = -1;
 
-    int diag = dialog.ShowModal();
-    if( diag == wxID_OK )
+    InsertColumn( 0, _( "Command" ) );
+    InsertColumn( 1, _( "Hotkey" ) );
+
+    // Add a dummy hotkey_spec which is a header before each hotkey list
+    EDA_HOTKEY** hotkey_descr_list;
+
+    // Add a copy of hotkeys to our list
+    for( hotkey_descr_list = aSection->m_HK_InfoList; *hotkey_descr_list; hotkey_descr_list++ )
     {
-        parent->ReCreateMenuBar();
-        parent->Refresh();
+        EDA_HOTKEY* hotkey_descr = *hotkey_descr_list;
+        m_hotkeys.push_back( new EDA_HOTKEY( hotkey_descr ) );
     }
+
+    // Set item count to hotkey size, this gets it to autoload the entries
+    SetItemCount( m_hotkeys.size() );
+
+    SetColumnWidth( 0, wxLIST_AUTOSIZE );
+    SetColumnWidth( 1, wxLIST_AUTOSIZE );
+
+    Bind( wxEVT_CHAR, &HOTKEY_LIST_CTRL::OnChar, this );
+    Bind( wxEVT_LIST_ITEM_SELECTED, &HOTKEY_LIST_CTRL::OnListItemSelected, this );
+    Bind( wxEVT_SIZE, &HOTKEY_LIST_CTRL::OnSize, this );
 }
 
 
-HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME*    parent,
-                                              EDA_HOTKEY_CONFIG* hotkeys ) :
-    HOTKEYS_EDITOR_DIALOG_BASE( parent )
+void HOTKEY_LIST_CTRL::OnSize( wxSizeEvent& aEvent )
 {
-    m_parent  = parent;
-    m_hotkeys = hotkeys;
-    m_curEditingRow = -1;
+    recalculateColumns();
+    aEvent.Skip();
+}
 
-    m_table = new HOTKEY_EDITOR_GRID_TABLE( hotkeys );
-    m_hotkeyGrid->SetTable( m_table, true );
 
-    m_hotkeyGrid->AutoSizeColumn( 0 );
-    m_hotkeyGrid->EnableDragGridSize( false );
+void HOTKEY_LIST_CTRL::recalculateColumns()
+{
+    float totalLength = 0;
+    float scale = 0;
+
+    // Find max character length of first column
+    int maxInfoMsgLength = 0;
 
-    for( int i = 0; i < m_hotkeyGrid->GetNumberRows(); ++i )
+    for( int i = 0; i < GetItemCount(); i++ )
     {
-        m_hotkeyGrid->SetReadOnly( i, 0, true );
-        m_hotkeyGrid->SetReadOnly( i, 1, true );
+        int length = GetItemText( i, 0 ).Length();
+
+        if( length > maxInfoMsgLength )
+            maxInfoMsgLength = length;
     }
 
-    m_OKButton->SetDefault();
-    m_hotkeyGrid->SetFocus();
-    GetSizer()->SetSizeHints( this );
-    Center();
+    // Find max character length of second column
+    int maxKeyCodeLength = 0;
+
+    for( int i = 0; i < GetItemCount(); i++ )
+    {
+        int length = GetItemText( i, 1 ).Length();
+        if( length > maxKeyCodeLength )
+            maxKeyCodeLength = length;
+    }
+
+    // Use the lengths of column texts to create a scale of the max list width
+    // to set the column widths
+    totalLength = maxInfoMsgLength + maxKeyCodeLength;
+
+    scale = (float) GetClientSize().x / totalLength;
+
+    SetColumnWidth( 0, int( maxInfoMsgLength*scale ) - 2 );
+    SetColumnWidth( 1, int( maxKeyCodeLength*scale ) );
 }
 
 
-void HOTKEYS_EDITOR_DIALOG::OnOKClicked( wxCommandEvent& event )
+void HOTKEY_LIST_CTRL::OnListItemSelected( wxListEvent& aEvent )
 {
-    /* edit the live hotkey table */
-    HOTKEY_EDITOR_GRID_TABLE::hotkey_spec_vector& hotkey_vec = m_table->getHotkeys();
+    m_curEditingRow = aEvent.GetIndex();
+}
 
-    EDA_HOTKEY_CONFIG*      section;
 
-    for( section = m_hotkeys; section->m_HK_InfoList; section++ )
+void HOTKEY_LIST_CTRL::DeselectRow( int aRow )
+{
+    SetItemState( aRow, 0, wxLIST_STATE_SELECTED );
+}
+
+
+wxString HOTKEY_LIST_CTRL::OnGetItemText( long aRow, long aColumn ) const
+{
+    EDA_HOTKEY* hotkey_descr = m_hotkeys[aRow];
+
+    if( aColumn == 0 )
+    {
+        return hotkey_descr->m_InfoMsg;
+    }
+    else
     {
-        wxString     sectionTag = *section->m_SectionTag;
+        return KeyNameFromKeyCode( hotkey_descr->m_KeyCode );
+    }
+}
 
-        EDA_HOTKEY** info_ptr;
 
-        for( info_ptr = section->m_HK_InfoList; *info_ptr; info_ptr++ )
+void HOTKEY_LIST_CTRL::OnChar( wxKeyEvent& aEvent )
+{
+    if( m_curEditingRow != -1 )
+    {
+        long key = aEvent.GetKeyCode();
+
+        switch( key )
         {
-            EDA_HOTKEY* info = *info_ptr;
+        case WXK_ESCAPE:
+            // Remove selection
+            DeselectRow( m_curEditingRow );
+            m_curEditingRow = -1;
+            break;
+        default:
+            if( aEvent.ControlDown() )
+                key |= GR_KB_CTRL;
 
-            /* find the corresponding hotkey */
-            HOTKEY_EDITOR_GRID_TABLE::hotkey_spec_vector::iterator i;
+            if( aEvent.AltDown() )
+                key |= GR_KB_ALT;
+
+            if( aEvent.ShiftDown() && (key > 256) )
+                key |= GR_KB_SHIFT;
+
+            // Remap Ctrl A (=1+GR_KB_CTRL) to Ctrl Z(=26+GR_KB_CTRL)
+            // to GR_KB_CTRL+'A' .. GR_KB_CTRL+'Z'
+            if( (key > GR_KB_CTRL) && (key <= GR_KB_CTRL+26) )
+                key += ('A' - 1);
+
+            if( key >= 'a' && key <= 'z' ) // convert to uppercase
+                key = key + ('A' - 'a');
 
-            for( i = hotkey_vec.begin(); i != hotkey_vec.end(); ++i )
+            // See if this key code is handled in hotkeys names list
+            bool exists;
+            KeyNameFromKeyCode( key, &exists );
+
+            if( exists && m_hotkeys[m_curEditingRow]->m_KeyCode != key )
             {
-                if( i->first == sectionTag
-                    && i->second
-                    && i->second->m_Idcommand == info->m_Idcommand )
+                bool canUpdate = ((HOTKEY_SECTION_PAGE *)m_parent)->GetDialog()->CanSetKey( key, m_sectionTag );
+
+                if( canUpdate )
                 {
-                    info->m_KeyCode = i->second->m_KeyCode;
-                    break;
+                    m_hotkeys[m_curEditingRow]->m_KeyCode = key;
+                    recalculateColumns();
                 }
+
+                // Remove selection
+                DeselectRow( m_curEditingRow );
+                m_curEditingRow = -1;
             }
         }
     }
+    RefreshItems(0,m_hotkeys.size()-1);
+}
 
-    /* save the hotkeys */
-    m_parent->WriteHotkeyConfig( m_hotkeys );
 
-    EndModal( wxID_OK );
+void HOTKEY_LIST_CTRL::RestoreFrom( struct EDA_HOTKEY_CONFIG* aSection )
+{
+    int row = 0;
+
+    EDA_HOTKEY** info_ptr;
+
+    for( info_ptr = aSection->m_HK_InfoList; *info_ptr; info_ptr++ )
+    {
+        EDA_HOTKEY* info = *info_ptr;
+        m_hotkeys[row++]->m_KeyCode = info->m_KeyCode;
+    }
+
+    // Remove selection
+    DeselectRow( m_curEditingRow );
+    m_curEditingRow = -1;
+
+    RefreshItems( 0, m_hotkeys.size()-1 );
 }
 
 
-void HOTKEYS_EDITOR_DIALOG::CancelClicked( wxCommandEvent& event )
+HOTKEY_SECTION_PAGE::HOTKEY_SECTION_PAGE( HOTKEYS_EDITOR_DIALOG* aDialog,
+                                          wxNotebook*     aParent,
+                                          const wxString& aTitle,
+                                          EDA_HOTKEY_CONFIG* aSection ) :
+    wxPanel( aParent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxNO_BORDER ),
+    m_hotkeySection( aSection ),
+    m_dialog( aDialog )
 {
-    EndModal( wxID_CANCEL );
+    aParent->AddPage( this, aTitle );
+
+	wxBoxSizer* bMainSizer = new wxBoxSizer( wxVERTICAL );
+
+	SetSizer( bMainSizer );
+	Layout();
+	bMainSizer->Fit( this );
+
+	m_hotkeyList = new HOTKEY_LIST_CTRL( this, aSection );
+	bMainSizer->Add( m_hotkeyList, 1, wxALL|wxEXPAND, 5 );
 }
 
 
-/* Reinit the hotkeys to the initial state (remove all pending changes
- */
-void HOTKEYS_EDITOR_DIALOG::UndoClicked( wxCommandEvent& event )
+void HOTKEY_SECTION_PAGE::Restore()
 {
-    m_table->RestoreFrom( m_hotkeys );
-    m_curEditingRow = -1;
+    m_hotkeyList->RestoreFrom( m_hotkeySection );
 
-    for( int i = 0; i < m_hotkeyGrid->GetNumberRows(); ++i )
-        SetHotkeyCellState( i, false );
-
-    m_hotkeyGrid->Refresh();
     Update();
 }
 
 
-void HOTKEYS_EDITOR_DIALOG::SetHotkeyCellState( int aRow, bool aHightlight )
+void InstallHotkeyFrame( EDA_DRAW_FRAME* aParent, EDA_HOTKEY_CONFIG* aHotkeys )
 {
-    if( aHightlight )
-    {
-        m_hotkeyGrid->SetCellTextColour( aRow, 1, *wxRED );
-        wxFont bold_font(m_hotkeyGrid->GetDefaultCellFont() );
-        bold_font.SetWeight(wxFONTWEIGHT_BOLD);
-        m_hotkeyGrid->SetCellFont( aRow, 1, bold_font );
-    }
-    else
+    HOTKEYS_EDITOR_DIALOG dialog( aParent, aHotkeys );
+
+    int diag = dialog.ShowModal();
+    if( diag == wxID_OK )
     {
-        m_hotkeyGrid->SetCellTextColour( aRow, 1, m_hotkeyGrid->GetDefaultCellTextColour() );
-        m_hotkeyGrid->SetCellFont( aRow, 1, m_hotkeyGrid->GetDefaultCellFont() );
+        aParent->ReCreateMenuBar();
+        aParent->Refresh();
     }
 }
 
 
-void HOTKEYS_EDITOR_DIALOG::OnClickOnCell( wxGridEvent& event )
+HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME*    aParent,
+                                              EDA_HOTKEY_CONFIG* aHotkeys ) :
+    HOTKEYS_EDITOR_DIALOG_BASE( aParent ),
+    m_parent( aParent ),
+    m_hotkeys( aHotkeys )
 {
-    if( m_curEditingRow != -1 )
-        SetHotkeyCellState( m_curEditingRow, false );
-
-    int newRow = event.GetRow();
+    EDA_HOTKEY_CONFIG* section;
 
-    if( ( event.GetCol() != 1 ) || ( m_table->IsHeader( newRow ) ) )
-    {
-        m_curEditingRow = -1;
-    }
-    else
+    for( section = m_hotkeys; section->m_HK_InfoList; section++ )
     {
-        m_curEditingRow = newRow;
-        SetHotkeyCellState( m_curEditingRow, true );
+        m_hotkeySectionPages.push_back( new HOTKEY_SECTION_PAGE( this, m_hotkeySections,
+                                                                 _( *section->m_Title ),
+                                                                 section ) );
     }
-    m_hotkeyGrid->Refresh();
-    Update();
+
+    m_OKButton->SetDefault();
+    Center();
 }
 
 
-/** OnRightClickOnCell
- * If a cell is selected, display a list of keys for selection
- * The list is restricted to keys that cannot be entered:
- * tab, home, return ... because these keys have special functions in dialogs
- */
-void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event )
+void HOTKEYS_EDITOR_DIALOG::OnOKClicked( wxCommandEvent& event )
 {
-    // Select the new cell if needed
-    OnClickOnCell(event);
-
-    if( m_curEditingRow == -1 )
-        return;
+    std::vector<HOTKEY_SECTION_PAGE*>::iterator i;
 
-    // Do not translate these key names. They are internally used.
-    // See hotkeys_basic.cpp
-    #define C_COUNT 9
-    wxString choices[C_COUNT] =
+    for( i = m_hotkeySectionPages.begin(); i != m_hotkeySectionPages.end(); ++i )
     {
-        wxT("End")
-        wxT("Tab"),
-        wxT("Ctrl+Tab"),
-        wxT("Alt+Tab"),
-        wxT("Home"),
-        wxT("Space"),
-        wxT("Ctrl+Space"),
-        wxT("Alt+Space"),
-        wxT("Return")
-    };
-
-    wxString keyname = wxGetSingleChoice( _( "Special keys only. For others keys, use keyboard" ),
-                                          _( "Select a key" ), C_COUNT, choices, this );
-    int key = KeyCodeFromKeyName( keyname );
-
-    if( key == 0 )
-        return;
-
-    m_table->SetKeyCode( m_curEditingRow, key );
-    m_hotkeyGrid->Refresh();
-    Update();
+        std::vector<EDA_HOTKEY*>& hotkey_vec = (*i)->GetHotkeys();
+        EDA_HOTKEY_CONFIG* section = (*i)->GetHotkeySection();
+
+        EDA_HOTKEY** info_ptr;
+
+        for( info_ptr = section->m_HK_InfoList; *info_ptr; info_ptr++ )
+        {
+            EDA_HOTKEY* info = *info_ptr;
+
+            /* find the corresponding hotkey */
+            std::vector<EDA_HOTKEY*>::iterator j;
+
+            for( j = hotkey_vec.begin(); j != hotkey_vec.end(); ++j )
+            {
+                if( (*j) && (*j)->m_Idcommand == info->m_Idcommand )
+                {
+                    info->m_KeyCode = (*j)->m_KeyCode;
+                    break;
+                }
+            }
+        }
+    }
+
+    /* save the hotkeys */
+    m_parent->WriteHotkeyConfig( m_hotkeys );
+
+    EndModal( wxID_OK );
 }
 
 
-void HOTKEYS_EDITOR_DIALOG::OnKeyPressed( wxKeyEvent& event )
+void HOTKEYS_EDITOR_DIALOG::CancelClicked( wxCommandEvent& event )
 {
-    if( m_curEditingRow != -1 )
-    {
-        long key = event.GetKeyCode();
+    EndModal( wxID_CANCEL );
+}
 
-        switch( key )
-        {
-        case WXK_ESCAPE:
-            SetHotkeyCellState( m_curEditingRow, false );
-            m_curEditingRow = -1;
-            break;
 
-        default:
-            if( event.ControlDown() )
-                key |= GR_KB_CTRL;
+void HOTKEYS_EDITOR_DIALOG::UndoClicked( wxCommandEvent& aEvent )
+{
+    std::vector<HOTKEY_SECTION_PAGE*>::iterator i;
 
-            if( event.AltDown() )
-                key |= GR_KB_ALT;
+    for( i = m_hotkeySectionPages.begin(); i != m_hotkeySectionPages.end(); ++i )
+    {
+        (*i)->Restore();
+    }
+}
 
-            if( event.ShiftDown() && (key > 256) )
-                key |= GR_KB_SHIFT;
 
-            // Remap Ctrl A (=1+GR_KB_CTRL) to Ctrl Z(=26+GR_KB_CTRL)
-            // to GR_KB_CTRL+'A' .. GR_KB_CTRL+'Z'
-            if( (key > GR_KB_CTRL) && (key <= GR_KB_CTRL+26) )
-                key += ('A' - 1);
+bool HOTKEYS_EDITOR_DIALOG::CanSetKey( long aKey, const wxString* sectionTag )
+{
+    std::vector<HOTKEY_SECTION_PAGE*>::iterator i;
 
-            if( key >= 'a' && key <= 'z' ) // convert to uppercase
-                key = key + ('A' - 'a');
+    EDA_HOTKEY* conflictingKey = NULL;
+    HOTKEY_SECTION_PAGE* conflictingSection = NULL;
 
-#if 0       // For debug only
-            wxString msg;
-            msg.Printf(wxT("key %X, keycode %X"),event.GetKeyCode(), key);
-            wxMessageBox(msg);
-#endif
-            // See if this key code is handled in hotkeys names list
-            bool exists;
-            KeyNameFromKeyCode( key, &exists );
+    for( i = m_hotkeySectionPages.begin(); i != m_hotkeySectionPages.end(); ++i )
+    {
+        // Any non Common section can only conflict with itself and Common
+        if( *sectionTag != g_CommonSectionTag
+                 && *((*i)->GetHotkeySection()->m_SectionTag) != g_CommonSectionTag
+                 && *((*i)->GetHotkeySection()->m_SectionTag) != *sectionTag )
+            continue;
 
-            if( !exists )   // not handled, see hotkeys_basic.cpp
-            {
-                wxMessageBox( _( "Hotkey code not handled" ) );
-            }
-            else
+        std::vector<EDA_HOTKEY*>& hotkey_vec = (*i)->GetHotkeys();
+        /* find the corresponding hotkey */
+        std::vector<EDA_HOTKEY*>::iterator j;
+
+        for( j = hotkey_vec.begin(); j != hotkey_vec.end(); ++j )
+        {
+            if( aKey == (*j)->m_KeyCode )
             {
-                m_table->SetKeyCode( m_curEditingRow, key );
+                conflictingKey = (*j);
+                conflictingSection = (*i);
+
+                break;
             }
+        }
+    }
 
-            break;
+    if( conflictingKey != NULL )
+    {
+        wxString msg = wxString::Format(
+            _( "<%s> is already assigned to \"%s\" in section \"%s\". Are you sure you want "
+               "to change its assignment?" ),
+            KeyNameFromKeyCode( aKey ), conflictingKey->m_InfoMsg,
+            *(conflictingSection->GetHotkeySection()->m_Title) );
+
+        wxMessageDialog dlg( this, msg, _( "Confirm change" ), wxYES_NO | wxNO_DEFAULT );
+
+        if( dlg.ShowModal() == wxID_YES )
+        {
+            conflictingKey->m_KeyCode = 0;
+            return true;
+        }
+        else
+        {
+            return false;
         }
     }
 
-    m_hotkeyGrid->Refresh();
-    Update();
+    return true;
 }
diff --git a/common/dialogs/dialog_hotkeys_editor_base.cpp b/common/dialogs/dialog_hotkeys_editor_base.cpp
index 175ab779ee..65f821fedb 100644
--- a/common/dialogs/dialog_hotkeys_editor_base.cpp
+++ b/common/dialogs/dialog_hotkeys_editor_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -14,37 +14,18 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
 	wxBoxSizer* bMainSizer;
-	bMainSizer = new wxBoxSizer( wxHORIZONTAL );
+	bMainSizer = new wxBoxSizer( wxVERTICAL );
 	
-	m_hotkeyGrid = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxTAB_TRAVERSAL|wxWANTS_CHARS );
+	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select a row and press a new key combination to alter the binding."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1->Wrap( 400 );
+	bMainSizer->Add( m_staticText1, 0, wxALL|wxEXPAND, 5 );
 	
-	// Grid
-	m_hotkeyGrid->CreateGrid( 1, 2 );
-	m_hotkeyGrid->EnableEditing( false );
-	m_hotkeyGrid->EnableGridLines( true );
-	m_hotkeyGrid->EnableDragGridSize( false );
-	m_hotkeyGrid->SetMargins( 0, 0 );
+	m_hotkeySections = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	
-	// Columns
-	m_hotkeyGrid->AutoSizeColumns();
-	m_hotkeyGrid->EnableDragColMove( false );
-	m_hotkeyGrid->EnableDragColSize( true );
-	m_hotkeyGrid->SetColLabelSize( 30 );
-	m_hotkeyGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_hotkeyGrid->EnableDragRowSize( true );
-	m_hotkeyGrid->SetRowLabelSize( 0 );
-	m_hotkeyGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_hotkeyGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	bMainSizer->Add( m_hotkeyGrid, 1, wxALL|wxEXPAND, 5 );
+	bMainSizer->Add( m_hotkeySections, 1, wxEXPAND | wxALL, 5 );
 	
 	wxBoxSizer* b_buttonsSizer;
-	b_buttonsSizer = new wxBoxSizer( wxVERTICAL );
+	b_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
 	b_buttonsSizer->Add( m_OKButton, 0, wxALL|wxEXPAND, 5 );
@@ -56,16 +37,13 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
 	b_buttonsSizer->Add( m_undoButton, 0, wxALL|wxEXPAND, 5 );
 	
 	
-	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER|wxALIGN_RIGHT, 5 );
 	
 	
 	this->SetSizer( bMainSizer );
 	this->Layout();
 	
 	// Connect Events
-	m_hotkeyGrid->Connect( wxEVT_CHAR, wxKeyEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnKeyPressed ), NULL, this );
-	m_hotkeyGrid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnRightClickOnCell ), NULL, this );
-	m_hotkeyGrid->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnClickOnCell ), NULL, this );
 	m_OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
 	 m_cancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::CancelClicked ), NULL, this );
 	m_undoButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::UndoClicked ), NULL, this );
@@ -74,9 +52,6 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
 HOTKEYS_EDITOR_DIALOG_BASE::~HOTKEYS_EDITOR_DIALOG_BASE()
 {
 	// Disconnect Events
-	m_hotkeyGrid->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnKeyPressed ), NULL, this );
-	m_hotkeyGrid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnRightClickOnCell ), NULL, this );
-	m_hotkeyGrid->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnClickOnCell ), NULL, this );
 	m_OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
 	 m_cancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::CancelClicked ), NULL, this );
 	m_undoButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::UndoClicked ), NULL, this );
diff --git a/common/dialogs/dialog_hotkeys_editor_base.fbp b/common/dialogs/dialog_hotkeys_editor_base.fbp
index a4cb362dfa..e4661000d7 100644
--- a/common/dialogs/dialog_hotkeys_editor_base.fbp
+++ b/common/dialogs/dialog_hotkeys_editor_base.fbp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="11" />
+    <FileVersion major="1" minor="13" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -42,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">HOTKEYS_EDITOR_DIALOG_BASE</property>
             <property name="pos"></property>
-            <property name="size">304,235</property>
+            <property name="size">450,500</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Hotkeys Editor</property>
@@ -89,13 +91,96 @@
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
                 <property name="name">bMainSizer</property>
-                <property name="orient">wxHORIZONTAL</property>
+                <property name="orient">wxVERTICAL</property>
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStaticText" expanded="1">
+                        <property name="BottomDockable">1</property>
+                        <property name="LeftDockable">1</property>
+                        <property name="RightDockable">1</property>
+                        <property name="TopDockable">1</property>
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="close_button">1</property>
+                        <property name="context_help"></property>
+                        <property name="context_menu">1</property>
+                        <property name="default_pane">0</property>
+                        <property name="dock">Dock</property>
+                        <property name="dock_fixed">0</property>
+                        <property name="docking">Left</property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="floatable">1</property>
+                        <property name="font"></property>
+                        <property name="gripper">0</property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Select a row and press a new key combination to alter the binding.</property>
+                        <property name="max_size"></property>
+                        <property name="maximize_button">0</property>
+                        <property name="maximum_size"></property>
+                        <property name="min_size"></property>
+                        <property name="minimize_button">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="moveable">1</property>
+                        <property name="name">m_staticText1</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <property name="wrap">400</property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">1</property>
-                    <object class="wxGrid" expanded="1">
+                    <object class="wxNotebook" expanded="1">
                         <property name="BottomDockable">1</property>
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
@@ -104,50 +189,26 @@
                         <property name="aui_name"></property>
                         <property name="aui_position"></property>
                         <property name="aui_row"></property>
-                        <property name="autosize_cols">1</property>
-                        <property name="autosize_rows">0</property>
                         <property name="best_size"></property>
                         <property name="bg"></property>
+                        <property name="bitmapsize"></property>
                         <property name="caption"></property>
                         <property name="caption_visible">1</property>
-                        <property name="cell_bg"></property>
-                        <property name="cell_font"></property>
-                        <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
-                        <property name="cell_text"></property>
-                        <property name="cell_vert_alignment">wxALIGN_TOP</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
-                        <property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
-                        <property name="col_label_size">30</property>
-                        <property name="col_label_values"></property>
-                        <property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
-                        <property name="cols">2</property>
-                        <property name="column_sizes"></property>
                         <property name="context_help"></property>
                         <property name="context_menu">1</property>
                         <property name="default_pane">0</property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
-                        <property name="drag_col_move">0</property>
-                        <property name="drag_col_size">1</property>
-                        <property name="drag_grid_size">0</property>
-                        <property name="drag_row_size">1</property>
-                        <property name="editing">0</property>
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="floatable">1</property>
                         <property name="font"></property>
-                        <property name="grid_line_color"></property>
-                        <property name="grid_lines">1</property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
-                        <property name="label_bg"></property>
-                        <property name="label_font"></property>
-                        <property name="label_text"></property>
-                        <property name="margin_height">0</property>
-                        <property name="margin_width">0</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -155,7 +216,7 @@
                         <property name="minimize_button">0</property>
                         <property name="minimum_size"></property>
                         <property name="moveable">1</property>
-                        <property name="name">m_hotkeyGrid</property>
+                        <property name="name">m_hotkeySections</property>
                         <property name="pane_border">1</property>
                         <property name="pane_position"></property>
                         <property name="pane_size"></property>
@@ -163,55 +224,18 @@
                         <property name="pin_button">1</property>
                         <property name="pos"></property>
                         <property name="resize">Resizable</property>
-                        <property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
-                        <property name="row_label_size">0</property>
-                        <property name="row_label_values"></property>
-                        <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
-                        <property name="row_sizes"></property>
-                        <property name="rows">1</property>
                         <property name="show">1</property>
                         <property name="size"></property>
+                        <property name="style"></property>
                         <property name="subclass"></property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
-                        <property name="window_style">wxDOUBLE_BORDER|wxTAB_TRAVERSAL|wxWANTS_CHARS</property>
-                        <event name="OnChar">OnKeyPressed</event>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
                         <event name="OnEnterWindow"></event>
                         <event name="OnEraseBackground"></event>
-                        <event name="OnGridCellChange"></event>
-                        <event name="OnGridCellLeftClick"></event>
-                        <event name="OnGridCellLeftDClick"></event>
-                        <event name="OnGridCellRightClick">OnRightClickOnCell</event>
-                        <event name="OnGridCellRightDClick"></event>
-                        <event name="OnGridCmdCellChange"></event>
-                        <event name="OnGridCmdCellLeftClick"></event>
-                        <event name="OnGridCmdCellLeftDClick"></event>
-                        <event name="OnGridCmdCellRightClick"></event>
-                        <event name="OnGridCmdCellRightDClick"></event>
-                        <event name="OnGridCmdColSize"></event>
-                        <event name="OnGridCmdEditorCreated"></event>
-                        <event name="OnGridCmdEditorHidden"></event>
-                        <event name="OnGridCmdEditorShown"></event>
-                        <event name="OnGridCmdLabelLeftClick"></event>
-                        <event name="OnGridCmdLabelLeftDClick"></event>
-                        <event name="OnGridCmdLabelRightClick"></event>
-                        <event name="OnGridCmdLabelRightDClick"></event>
-                        <event name="OnGridCmdRangeSelect"></event>
-                        <event name="OnGridCmdRowSize"></event>
-                        <event name="OnGridCmdSelectCell"></event>
-                        <event name="OnGridColSize"></event>
-                        <event name="OnGridEditorCreated"></event>
-                        <event name="OnGridEditorHidden"></event>
-                        <event name="OnGridEditorShown"></event>
-                        <event name="OnGridLabelLeftClick"></event>
-                        <event name="OnGridLabelLeftDClick"></event>
-                        <event name="OnGridLabelRightClick"></event>
-                        <event name="OnGridLabelRightDClick"></event>
-                        <event name="OnGridRangeSelect"></event>
-                        <event name="OnGridRowSize"></event>
-                        <event name="OnGridSelectCell">OnClickOnCell</event>
                         <event name="OnKeyDown"></event>
                         <event name="OnKeyUp"></event>
                         <event name="OnKillFocus"></event>
@@ -225,6 +249,8 @@
                         <event name="OnMotion"></event>
                         <event name="OnMouseEvents"></event>
                         <event name="OnMouseWheel"></event>
+                        <event name="OnNotebookPageChanged"></event>
+                        <event name="OnNotebookPageChanging"></event>
                         <event name="OnPaint"></event>
                         <event name="OnRightDClick"></event>
                         <event name="OnRightDown"></event>
@@ -236,18 +262,18 @@
                 </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                    <property name="flag">wxALIGN_CENTER|wxALIGN_RIGHT</property>
                     <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
+                    <object class="wxBoxSizer" expanded="0">
                         <property name="minimum_size"></property>
                         <property name="name">b_buttonsSizer</property>
-                        <property name="orient">wxVERTICAL</property>
+                        <property name="orient">wxHORIZONTAL</property>
                         <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
+                        <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
+                            <object class="wxButton" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -331,11 +357,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="1">
+                        <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
+                            <object class="wxButton" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
@@ -419,11 +445,11 @@
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                        <object class="sizeritem" expanded="1">
+                        <object class="sizeritem" expanded="0">
                             <property name="border">5</property>
                             <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
-                            <object class="wxButton" expanded="1">
+                            <object class="wxButton" expanded="0">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
diff --git a/common/dialogs/dialog_hotkeys_editor_base.h b/common/dialogs/dialog_hotkeys_editor_base.h
index 5ce7605bae..58c3ce6c67 100644
--- a/common/dialogs/dialog_hotkeys_editor_base.h
+++ b/common/dialogs/dialog_hotkeys_editor_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -14,12 +14,13 @@
 class DIALOG_SHIM;
 
 #include "dialog_shim.h"
-#include <wx/colour.h>
-#include <wx/settings.h>
 #include <wx/string.h>
-#include <wx/font.h>
-#include <wx/grid.h>
+#include <wx/stattext.h>
 #include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/notebook.h>
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/dialog.h>
@@ -35,15 +36,13 @@ class HOTKEYS_EDITOR_DIALOG_BASE : public DIALOG_SHIM
 	private:
 	
 	protected:
-		wxGrid* m_hotkeyGrid;
+		wxStaticText* m_staticText1;
+		wxNotebook* m_hotkeySections;
 		wxButton* m_OKButton;
 		wxButton*  m_cancelButton;
 		wxButton* m_undoButton;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void OnKeyPressed( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnRightClickOnCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnClickOnCell( wxGridEvent& event ) { event.Skip(); }
 		virtual void OnOKClicked( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CancelClicked( wxCommandEvent& event ) { event.Skip(); }
 		virtual void UndoClicked( wxCommandEvent& event ) { event.Skip(); }
@@ -51,7 +50,7 @@ class HOTKEYS_EDITOR_DIALOG_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Hotkeys Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 304,235 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Hotkeys Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 450,500 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~HOTKEYS_EDITOR_DIALOG_BASE();
 	
 };
diff --git a/common/hotkey_grid_table.cpp b/common/hotkey_grid_table.cpp
deleted file mode 100644
index c1f82545f3..0000000000
--- a/common/hotkey_grid_table.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include <hotkey_grid_table.h>
-
-/*
- *  Reads the hotkey table from its stored format into a format suitable
- *  for a wxGrid.
- */
-HOTKEY_EDITOR_GRID_TABLE::HOTKEY_EDITOR_GRID_TABLE( struct EDA_HOTKEY_CONFIG* origin ) :
-    wxGridTableBase(), m_hotkeys()
-{
-    EDA_HOTKEY_CONFIG* section;
-
-    for( section = origin; section->m_HK_InfoList; section++ )
-    {
-        // Add a dummy hotkey_spec which is a header before each hotkey list
-        hotkey_spec spec( *section->m_SectionTag, NULL );
-        m_hotkeys.push_back( spec );
-
-        EDA_HOTKEY** hotkey_descr_list;
-
-        // Add hotkeys descr
-        for( hotkey_descr_list = section->m_HK_InfoList; *hotkey_descr_list;
-             hotkey_descr_list++ )
-        {
-            EDA_HOTKEY* hotkey_descr = *hotkey_descr_list;
-            hotkey_spec    spec( *section->m_SectionTag, new EDA_HOTKEY( hotkey_descr ) );
-            m_hotkeys.push_back( spec );
-        }
-    }
-}
-
-
-HOTKEY_EDITOR_GRID_TABLE::hotkey_spec_vector& HOTKEY_EDITOR_GRID_TABLE::getHotkeys()
-{
-    return m_hotkeys;
-}
-
-
-int HOTKEY_EDITOR_GRID_TABLE::GetNumberRows()
-{
-    return m_hotkeys.size();
-}
-
-
-int HOTKEY_EDITOR_GRID_TABLE::GetNumberCols()
-{
-    return 2;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::IsEmptyCell( int row, int col )
-{
-    return col == 1 && m_hotkeys[row].second == NULL;
-}
-
-
-wxString HOTKEY_EDITOR_GRID_TABLE::GetValue( int row, int col )
-{
-    EDA_HOTKEY* hotkey_descr = m_hotkeys[row].second;
-
-    if( col == 0 )
-    {
-        if( hotkey_descr == NULL )
-        {
-            // section header
-            return m_hotkeys[row].first;
-        }
-        else
-        {
-            return hotkey_descr->m_InfoMsg;
-        }
-    }
-    else
-    {
-        if( hotkey_descr == NULL )
-        {
-            // section header
-            return wxEmptyString;
-        }
-        else
-        {
-            return KeyNameFromKeyCode( hotkey_descr->m_KeyCode );
-        }
-    }
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValue( int row, int col, const wxString& value )
-{
-}
-
-
-wxString HOTKEY_EDITOR_GRID_TABLE::GetTypeName( int row, int col )
-{
-    return wxGRID_VALUE_STRING;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::CanGetValueAs( int row, int col, const wxString& typeName )
-{
-    return typeName == wxGRID_VALUE_STRING && col == 2;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::CanSetValueAs( int row, int col, const wxString& typeName )
-{
-    return false;
-}
-
-
-long HOTKEY_EDITOR_GRID_TABLE::GetValueAsLong( int row, int col )
-{
-    return -1L;
-}
-
-
-double HOTKEY_EDITOR_GRID_TABLE::GetValueAsDouble( int row, int col )
-{
-    return 0.0;
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::GetValueAsBool( int row, int col )
-{
-    return false;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsLong( int row, int col, long value )
-{
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsDouble( int row, int col, double value )
-{
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsBool( int row, int col, bool value )
-{
-}
-
-
-void* HOTKEY_EDITOR_GRID_TABLE::GetValueAsCustom( int row, int col )
-{
-    return 0;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetValueAsCustom( int row, int col, void* value )
-{
-}
-
-
-wxString HOTKEY_EDITOR_GRID_TABLE::GetColLabelValue( int col )
-{
-    return col == 0 ? _( "Command" ) : _( "Hotkey" );
-}
-
-
-bool HOTKEY_EDITOR_GRID_TABLE::IsHeader( int row )
-{
-    return m_hotkeys[row].second == NULL;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::SetKeyCode( int row, long key )
-{
-    m_hotkeys[row].second->m_KeyCode = key;
-}
-
-
-void HOTKEY_EDITOR_GRID_TABLE::RestoreFrom( struct EDA_HOTKEY_CONFIG* origin )
-{
-    int row = 0;
-    EDA_HOTKEY_CONFIG* section;
-
-    for( section = origin; section->m_HK_InfoList; section++ )
-    {
-        ++row;      // Skip header
-        EDA_HOTKEY** info_ptr;
-
-        for( info_ptr = section->m_HK_InfoList; *info_ptr; info_ptr++ )
-        {
-            EDA_HOTKEY* info = *info_ptr;
-            m_hotkeys[row++].second->m_KeyCode = info->m_KeyCode;
-        }
-    }
-}
-
-
-HOTKEY_EDITOR_GRID_TABLE::~HOTKEY_EDITOR_GRID_TABLE()
-{
-    hotkey_spec_vector::iterator i;
-
-    for( i = m_hotkeys.begin(); i != m_hotkeys.end(); ++i )
-        delete i->second;
-}
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index e8d0532ac5..d181be5dd6 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -52,6 +52,12 @@ wxString g_LibEditSectionTag( wxT( "[libedit]" ) );
 wxString g_BoardEditorSectionTag( wxT( "[pcbnew]" ) );
 wxString g_ModuleEditSectionTag( wxT( "[footprinteditor]" ) );
 
+wxString g_CommonSectionTitle( wxT( "Common" ) );
+wxString g_SchematicSectionTitle( wxT( "Schematic Editor" ) );
+wxString g_LibEditSectionTitle( wxT( "Library Editor" ) );
+wxString g_BoardEditorSectionTitle( wxT( "Board Editor" ) );
+wxString g_ModuleEditSectionTitle( wxT( "Footprint Editor" ) );
+
 
 /* Class to handle hotkey commnands. hotkeys have a default value
  * This class allows the real key code changed by user from a key code list
@@ -161,6 +167,10 @@ wxString KeyNameFromKeyCode( int aKeycode, bool* aIsFound )
     int      ii;
     bool     found = false;
 
+    // Assume keycode of 0 is "unassigned"
+    if( aKeycode == 0 )
+        return wxT( "<unassigned>");
+
     if( (aKeycode & GR_KB_CTRL) != 0 )
         modifier << MODIFIER_CTRL;
 
@@ -224,6 +234,7 @@ static void AddModifierToKey( wxString& aFullKey, const wxString & aKey )
         aFullKey << wxT( "\t" ) << MODIFIER_ALT << aKey;
 }
 
+
 /* AddHotkeyName
  * Add the key name from the Command id value ( m_Idcommand member value)
  *  aText = a wxString. returns aText + key name
@@ -247,17 +258,17 @@ wxString AddHotkeyName( const wxString& aText, EDA_HOTKEY** aList,
     {
         switch( aShortCutType )
         {
-            case IS_HOTKEY:
-                msg << wxT( "\t" ) << keyname;
-                break;
+        case IS_HOTKEY:
+            msg << wxT( "\t" ) << keyname;
+            break;
 
-            case IS_ACCELERATOR:
-                AddModifierToKey( msg, keyname );
-                break;
+        case IS_ACCELERATOR:
+            AddModifierToKey( msg, keyname );
+            break;
 
-            case IS_COMMENT:
-                msg << wxT( " (" ) << keyname << wxT( ")" );
-                break;
+        case IS_COMMENT:
+            msg << wxT( " (" ) << keyname << wxT( ")" );
+            break;
         }
     }
 
@@ -295,18 +306,19 @@ wxString AddHotkeyName( const wxString&           aText,
             {
                 switch( aShortCutType )
                 {
-                    case IS_HOTKEY:
-                        msg << wxT( "\t" ) << keyname;
-                        break;
+                case IS_HOTKEY:
+                    msg << wxT( "\t" ) << keyname;
+                    break;
 
-                    case IS_ACCELERATOR:
-                        AddModifierToKey( msg, keyname );
-                        break;
+                case IS_ACCELERATOR:
+                    AddModifierToKey( msg, keyname );
+                    break;
 
-                    case IS_COMMENT:
-                        msg << wxT( " (" ) << keyname << wxT( ")" );
-                        break;
+                case IS_COMMENT:
+                    msg << wxT( " (" ) << keyname << wxT( ")" );
+                    break;
                 }
+
                 break;
             }
         }
@@ -414,9 +426,9 @@ void DisplayHotkeyList( EDA_DRAW_FRAME* aFrame, struct EDA_HOTKEY_CONFIG* aDescL
 
     wxString     msg = wxT( "<html><body bgcolor=\"#E2E2E2\">" );
 
-    msg += wxT( "<H3>");
-    msg += _("Hotkeys List");
-    msg += wxT("</H3> <table cellpadding=\"0\">");
+    msg += wxT( "<H3>" );
+    msg += _( "Hotkeys List" );
+    msg += wxT( "</H3> <table cellpadding=\"0\">" );
 
     for( ; aDescList->m_HK_InfoList != NULL; aDescList++ )
     {
@@ -432,16 +444,16 @@ void DisplayHotkeyList( EDA_DRAW_FRAME* aFrame, struct EDA_HOTKEY_CONFIG* aDescL
 
                 // Some chars should be modified, using html encoding, to be
                 // displayed by DisplayHtmlInfoMessage()
-                keyname.Replace( wxT("<"), wxT("&lt;") );
-                keyname.Replace( wxT(">"), wxT("&gt;") );
-                msg    += wxT( "<tr><td>" ) + hk_decr->m_InfoMsg + wxT("</td>");
-                msg    += wxT("<td><b>&nbsp;&nbsp;") + keyname + wxT( "</b></td></tr>" );
+                keyname.Replace( wxT( "<" ), wxT( "&lt;" ) );
+                keyname.Replace( wxT( ">" ), wxT( "&gt;" ) );
+                msg    += wxT( "<tr><td>" ) + hk_decr->m_InfoMsg + wxT( "</td>" );
+                msg    += wxT( "<td><b>&nbsp;&nbsp;" ) + keyname + wxT( "</b></td></tr>" );
             }
         }
     }
 
-    msg += wxT("</table></html></body>");
-    DisplayHtmlInfoMessage( aFrame, _("Hotkeys List"), msg, wxSize(340, 750));
+    msg += wxT( "</table></html></body>" );
+    DisplayHtmlInfoMessage( aFrame, _( "Hotkeys List" ), msg, wxSize( 340, 750 ) );
 }
 
 
@@ -466,17 +478,6 @@ EDA_HOTKEY* GetDescriptorFromHotkey( int aKey, EDA_HOTKEY** aList )
 }
 
 
-/**
- * Function WriteHotkeyConfig
- * Store the current hotkey list
- * It is stored using the standard wxConfig mechanism or a file.
- *
- * @param aDescList = pointer to the current hotkey list.
- * @param aFullFileName = a wxString pointer to a full file name.
- *  if NULL, use the standard wxConfig mechanism (default)
- * the output format is: shortcut  "key"  "function"
- * lines starting with # are comments
- */
 int EDA_BASE_FRAME::WriteHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList,
                                        wxString*                 aFullFileName )
 {
@@ -490,10 +491,10 @@ int EDA_BASE_FRAME::WriteHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList,
 
     for( ; aDescList->m_HK_InfoList != NULL; aDescList++ )
     {
-        if( aDescList->m_Comment )
+        if( aDescList->m_Title )
         {
             msg += wxT( "# " );
-            msg += wxString( aDescList->m_Comment );
+            msg += *aDescList->m_Title;
             msg += wxT( "\n" );
         }
 
@@ -542,13 +543,6 @@ int EDA_BASE_FRAME::WriteHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList,
 }
 
 
-/**
- * Function ReadHotkeyConfigFile
- * Read an old configuration file (&ltfile&gt.key) and fill the current hotkey list
- * with hotkeys
- * @param aFilename = file name to read.
- * @param aDescList = current hotkey list descr. to initialise.
- */
 int EDA_BASE_FRAME::ReadHotkeyConfigFile( const wxString&           aFilename,
                                           struct EDA_HOTKEY_CONFIG* aDescList )
 {
@@ -574,6 +568,7 @@ int EDA_BASE_FRAME::ReadHotkeyConfigFile( const wxString&           aFilename,
     return 1;
 }
 
+
 void ReadHotkeyConfig( const wxString& Appname, struct EDA_HOTKEY_CONFIG* aDescList )
 {
     wxConfigBase* config = GetNewConfig( Appname );
@@ -591,6 +586,7 @@ void ReadHotkeyConfig( const wxString& Appname, struct EDA_HOTKEY_CONFIG* aDescL
     ParseHotkeyConfig( data, aDescList );
 }
 
+
 /* Function ReadHotkeyConfig
  * Read configuration data and fill the current hotkey list with hotkeys
  * aDescList is the current hotkey list descr. to initialize.
diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp
index d302150c8a..58458b954d 100644
--- a/eeschema/hotkeys.cpp
+++ b/eeschema/hotkeys.cpp
@@ -131,7 +131,7 @@ static EDA_HOTKEY HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_SHIFT + GR_KB_CTRL + 'Z'
 
 // mouse click command:
 static EDA_HOTKEY HkMouseLeftClick( wxT( "Mouse Left Click" ), HK_LEFT_CLICK, WXK_RETURN, 0 );
-static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left DClick" ), HK_LEFT_DCLICK, WXK_END, 0 );
+static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left Double Click" ), HK_LEFT_DCLICK, WXK_END, 0 );
 
 // Schematic editor
 static EDA_HOTKEY HkBeginWire( wxT( "Begin Wire" ), HK_BEGIN_WIRE, 'W', ID_WIRE_BUTT );
@@ -149,7 +149,7 @@ static EDA_HOTKEY HkAddComponent( wxT( "Add Component" ), HK_ADD_NEW_COMPONENT,
                                   ID_SCH_PLACE_COMPONENT );
 static EDA_HOTKEY HkAddPower( wxT( "Add Power" ), HK_ADD_NEW_POWER, 'P',
                               ID_PLACE_POWER_BUTT );
-static EDA_HOTKEY HkAddNoConn( wxT( "Add NoConnected Flag" ), HK_ADD_NOCONN_FLAG, 'Q',
+static EDA_HOTKEY HkAddNoConn( wxT( "Add No Connect Flag" ), HK_ADD_NOCONN_FLAG, 'Q',
                                ID_NOCONN_BUTT );
 static EDA_HOTKEY HkAddHierSheet( wxT( "Add Sheet" ), HK_ADD_HIER_SHEET, 'S',
                                   ID_SHEET_SYMBOL_BUTT );
@@ -207,7 +207,7 @@ static EDA_HOTKEY HkInsertPin( wxT( "Repeat Pin" ), HK_REPEAT_LAST, WXK_INSERT )
 static EDA_HOTKEY HkMoveLibItem( wxT( "Move Library Item" ), HK_LIBEDIT_MOVE_GRAPHIC_ITEM, 'M' );
 
 // Load/save files
-static EDA_HOTKEY HkSaveLib( wxT( "Save Lib" ), HK_SAVE_LIB, 'S' + GR_KB_CTRL );
+static EDA_HOTKEY HkSaveLib( wxT( "Save Library" ), HK_SAVE_LIB, 'S' + GR_KB_CTRL );
 static EDA_HOTKEY HkSaveSchematic( wxT( "Save Schematic" ), HK_SAVE_SCH, 'S' + GR_KB_CTRL );
 static EDA_HOTKEY HkLoadSchematic( wxT( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );
 
@@ -305,18 +305,18 @@ static EDA_HOTKEY* viewlib_Hotkey_List[] =
 // an hotkey config file)
 struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,    common_Hotkey_List,    L"Common keys"           },
-    { &g_SchematicSectionTag, schematic_Hotkey_List, L"Schematic editor keys" },
-    { &g_LibEditSectionTag,   libEdit_Hotkey_List,   L"library editor keys"   },
-    { NULL,                   NULL,                    NULL                     }
+    { &g_CommonSectionTag,    common_Hotkey_List,    &g_CommonSectionTitle    },
+    { &g_SchematicSectionTag, schematic_Hotkey_List, &g_SchematicSectionTitle },
+    { &g_LibEditSectionTag,   libEdit_Hotkey_List,   &g_LibEditSectionTitle   },
+    { NULL,                   NULL,                  NULL                     }
 };
 
 // list of sections and corresponding hotkey list for the schematic editor
 // (used to list current hotkeys)
 struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,    common_Hotkey_List,    NULL },
-    { &g_SchematicSectionTag, schematic_Hotkey_List, NULL },
+    { &g_CommonSectionTag,    common_Hotkey_List,    &g_CommonSectionTitle },
+    { &g_SchematicSectionTag, schematic_Hotkey_List, &g_SchematicSectionTitle },
     { NULL,                   NULL,                    NULL }
 };
 
@@ -324,17 +324,17 @@ struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] =
 // (used to list current hotkeys)
 struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,  common_Hotkey_List,  NULL },
-    { &g_LibEditSectionTag, libEdit_Hotkey_List, NULL },
-    { NULL,                 NULL,                  NULL }
+    { &g_CommonSectionTag,  common_Hotkey_List,  &g_CommonSectionTitle },
+    { &g_LibEditSectionTag, libEdit_Hotkey_List, &g_LibEditSectionTitle },
+    { NULL,                 NULL,                NULL }
 };
 
 // list of sections and corresponding hotkey list for the component browser
 // (used to list current hotkeys)
 struct EDA_HOTKEY_CONFIG g_Viewlib_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag, common_basic_Hotkey_List, NULL },
-    { NULL,                NULL,                     NULL }
+    { &g_CommonSectionTag, common_basic_Hotkey_List, &g_CommonSectionTitle },
+    { NULL,                NULL,                 NULL }
 };
 
 /*
diff --git a/include/dialog_hotkeys_editor.h b/include/dialog_hotkeys_editor.h
index 81c523f935..cc1ff04a5a 100644
--- a/include/dialog_hotkeys_editor.h
+++ b/include/dialog_hotkeys_editor.h
@@ -1,3 +1,29 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2004-2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * @file dialog_hotkeys_editor.h
+ */
 
 #ifndef __dialog_hotkeys_editor__
 #define __dialog_hotkeys_editor__
@@ -17,34 +43,222 @@
 #include <wx/grid.h>
 
 #include <hotkeys_basic.h>
-#include <hotkey_grid_table.h>
 #include <draw_frame.h>
 #include <../common/dialogs/dialog_hotkeys_editor_base.h>
 
+class HOTKEYS_EDITOR_DIALOG;
+
+/**
+ * Class HOTKEY_LIST_CTRL
+ * is a class to contain the contents of a hotkey editor tab page.
+ */
+class HOTKEY_LIST_CTRL : public wxListCtrl
+{
+public:
+    HOTKEY_LIST_CTRL( wxWindow* aParent, struct EDA_HOTKEY_CONFIG* aSection );
+    ~HOTKEY_LIST_CTRL() {};
+
+    /**
+     * Function DeselectRow
+     * Deselect the given row
+     *
+     * @param aRow is the row to deselect
+     */
+    void DeselectRow( int aRow );
+
+    /**
+     * Function GetHotkeys
+     * Access to return the vector used for the list control data. This will contain the
+     * "live" state of the user's configuration.
+     *
+     * @return Pointer to vector of hotkey settings
+     */
+    std::vector< EDA_HOTKEY* >& GetHotkeys() { return m_hotkeys; }
+
+    /**
+     * Function RestoreFrom
+     * Restores list control hotkey keycodes to the keycodes present in the
+     * given hotkey configuration array.
+     *
+     * @param aSection is a pointer to the hotkey configuration array
+     */
+    void RestoreFrom( struct EDA_HOTKEY_CONFIG* aSection );
+
+private:
+    int m_curEditingRow;
+    wxString* m_sectionTag;
+    std::vector< EDA_HOTKEY* > m_hotkeys;
+
+    /**
+     * Function recalculateColumns
+     * Adjusts the width of grid columns in proportion of the max text length of both
+     */
+    void recalculateColumns();
+
+protected:
+    /**
+     * Function OnGetItemText
+     * Returns the requested row, column data to the list control.
+     *
+     * @param aRow is the row of the data which matches our hotkeys vector as a index
+     * @param aColumn is the column of the data which is either Command(0) or KeyCode(1)
+     *
+     * @return String containing the text for the specified row, column combination
+     */
+    wxString OnGetItemText( long aRow, long aColumn ) const;
+
+    /**
+     * Function OnChar
+     * Decoded key press handler which is used to set key codes in the list control
+     *
+     * @param aEvent is the key press event, the keycode is retrieved from it
+     */
+    void OnChar( wxKeyEvent& aEvent );
+
+    /**
+     * Function OnListItemSelected
+     * Item selection handler which is used to record what index is selected to alter
+     * update with the key press
+     *
+     * @param aEvent is the button press event, unused
+     */
+    void OnListItemSelected( wxListEvent& aEvent );
+
+    /**
+     * Function OnSize
+     * Sizing update handler to recompute the column widths dynamically and maximize them.
+     * Due to wxWidget's broken autosizing support (it's completely inconsistent across
+     * platforms), we just do it based on a scale of
+     *
+     * @param aEvent is the button press event, unused
+     */
+    void OnSize( wxSizeEvent& aEvent );
+};
+
+/**
+ * Class HOTKEY_SECTION_PAGE
+ * is a class to contain the contents of a hotkey editor tab page.
+ */
+class HOTKEY_SECTION_PAGE : public wxPanel
+{
+public:
+private:
+    EDA_HOTKEY_CONFIG*  m_hotkeySection;
+    HOTKEY_LIST_CTRL *m_hotkeyList;
+    HOTKEYS_EDITOR_DIALOG* m_dialog;
+
+public:
+    /** Constructor to create a setup page for one netlist format.
+     * Used in Netlist format Dialog box creation
+     * @param parent = wxNotebook * parent
+     * @param title = title (name) of the notebook page
+     * @param id_NetType = netlist type id
+     */
+    HOTKEY_SECTION_PAGE( HOTKEYS_EDITOR_DIALOG* aDialog, wxNotebook* aParent,
+                         const wxString& aTitle,
+                         EDA_HOTKEY_CONFIG* aSection );
+    ~HOTKEY_SECTION_PAGE() {};
+
+    /**
+     * Function Restore
+     * Resets the hotkeys back to their original unedited state
+     */
+    void Restore();
+
+    /**
+     * Function GetHotkeys
+     * Accessor to retrieve hotkeys list from list control
+     *
+     * @return Pointer to vector used for list control data
+     */
+    std::vector< EDA_HOTKEY* >& GetHotkeys() { return m_hotkeyList->GetHotkeys(); }
+
+    /**
+     * Function GetHotkeySection
+     * Accessor to retrieve hotkey configuration array assigned to a tab control page
+     *
+     * @return Pointer to hotkey configuration array
+     */
+    EDA_HOTKEY_CONFIG* GetHotkeySection() { return m_hotkeySection; }
+
+    /**
+     * Function GetDialog
+     * Returns pointer to parent dialog window
+     *
+     * @return Pointer to parent dialog window
+     */
+    HOTKEYS_EDITOR_DIALOG* GetDialog() { return m_dialog; }
+};
+
+/**
+ * Class HOTKEYS_EDITOR_DIALOG
+ * is the child class of HOTKEYS_EDITOR_DIALOG_BASE. This is the class
+ * used to create a hotkey editor.
+ */
 class HOTKEYS_EDITOR_DIALOG : public HOTKEYS_EDITOR_DIALOG_BASE
 {
 protected:
     EDA_DRAW_FRAME* m_parent;
     struct EDA_HOTKEY_CONFIG* m_hotkeys;
-    HOTKEY_EDITOR_GRID_TABLE* m_table;
 
-    int m_curEditingRow;
+    std::vector<HOTKEY_SECTION_PAGE*> m_hotkeySectionPages;
 
 public:
-    HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* parent, EDA_HOTKEY_CONFIG* hotkeys );
+    HOTKEYS_EDITOR_DIALOG( EDA_DRAW_FRAME* aParent, EDA_HOTKEY_CONFIG* aHotkeys );
 
     ~HOTKEYS_EDITOR_DIALOG() {};
 
+    /**
+     * Function CanSetKey
+     * Check if we can set a hotkey, this will prompt the user if there
+     * is a conflict between keys. The key code should have already been
+     * checked that it's not for the same entry as its currently in or else
+     * it'll prompt the change on itself.
+     * The function will do conflict detection depending on aSectionTag.
+     * g_CommonSectionTag means the key code must be checked with all sections.
+     * While other tags means the key code only must be checked with the aSectionTag
+     * section and g_CommonSectionTag section.
+     *
+     * @param aKey is the key code that wants to be set
+     * @param aSectionTag is the section tag that the key code came from
+     *
+     * @return True if the user accepted the overwrite or no conflict existed
+     */
+    bool CanSetKey( long aKey, const wxString* aSectionTag );
+
 private:
-    void OnOKClicked( wxCommandEvent& event );
-    void CancelClicked( wxCommandEvent& event );
-    void UndoClicked( wxCommandEvent& event );
-    void OnClickOnCell( wxGridEvent& event );
-    void OnRightClickOnCell( wxGridEvent& event );
-    void OnKeyPressed( wxKeyEvent& event );
-    void SetHotkeyCellState( int aRow, bool aHightlight );
+    /**
+     * Function OnOKClicked
+     * Close the dialog and make save all changes to hotkeys
+     *
+     * @param aEvent is the button press event, unused
+     */
+    void OnOKClicked( wxCommandEvent& aEvent );
+
+    /**
+     * Function CancelClicked
+     * Close the dialog and make no changes to hotkeys
+     *
+     * @param aEvent is the button press event, unused
+     */
+    void CancelClicked( wxCommandEvent& aEvent );
+
+    /**
+     * Function UndoClicked
+     * Reinit the hotkeys to the initial state (removes all pending changes)
+     *
+     * @param aEvent is the button press event, unused
+     */
+    void UndoClicked( wxCommandEvent& aEvent );
 };
 
-void InstallHotkeyFrame( EDA_DRAW_FRAME* parent, EDA_HOTKEY_CONFIG* hotkeys );
+/**
+ * Function InstallHotkeyFrame
+ * Create a hotkey editor dialog window with the provided hotkey configuration array
+ *
+ * @param aParent is the parent window
+ * @param aHotkeys is the hotkey configuration array
+ */
+void InstallHotkeyFrame( EDA_DRAW_FRAME* aParent, EDA_HOTKEY_CONFIG* aHotkeys );
 
 #endif
diff --git a/include/hotkey_grid_table.h b/include/hotkey_grid_table.h
deleted file mode 100644
index 27fbbcfb9c..0000000000
--- a/include/hotkey_grid_table.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef __hotkeys_grid_table__
-#define __hotkeys_grid_table__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/grid.h>
-
-#include <vector>
-#include <utility>
-
-#include <fctsys.h>
-#include <pgm_base.h>
-#include <common.h>
-#include <hotkeys_basic.h>
-
-class HOTKEY_EDITOR_GRID_TABLE : public wxGridTableBase
-{
-
-public:
-    typedef std::pair< wxString, EDA_HOTKEY* > hotkey_spec;
-    typedef std::vector< hotkey_spec > hotkey_spec_vector;
-
-    HOTKEY_EDITOR_GRID_TABLE( struct EDA_HOTKEY_CONFIG* origin );
-    virtual ~HOTKEY_EDITOR_GRID_TABLE();
-    hotkey_spec_vector& getHotkeys();
-
-private:
-    virtual int GetNumberRows();
-    virtual int GetNumberCols();
-    virtual bool IsEmptyCell( int row, int col );
-    virtual wxString GetValue( int row, int col );
-    virtual void SetValue( int row, int col, const wxString& value );
-    virtual wxString  GetTypeName( int row, int col );
-    virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
-    virtual bool CanSetValueAs( int row, int col, const wxString& typeName );
-    virtual long GetValueAsLong( int row, int col );
-    virtual double GetValueAsDouble( int row, int col );
-    virtual bool GetValueAsBool( int row, int col );
-    virtual void SetValueAsLong( int row, int col, long value );
-    virtual void SetValueAsDouble( int row, int col, double value );
-    virtual void SetValueAsBool( int row, int col, bool value );
-    virtual void* GetValueAsCustom( int row, int col );
-    virtual void SetValueAsCustom( int row, int col, void* value );
-    virtual wxString GetColLabelValue( int col );
-
-public:
-    virtual bool IsHeader( int row );
-    virtual void SetKeyCode( int row, long key );
-    virtual void RestoreFrom( struct EDA_HOTKEY_CONFIG* origin );
-
-protected:
-   std::vector< hotkey_spec > m_hotkeys;
-
-};
-
-#endif
diff --git a/include/hotkeys_basic.h b/include/hotkeys_basic.h
index cbae182e39..b560fe964f 100644
--- a/include/hotkeys_basic.h
+++ b/include/hotkeys_basic.h
@@ -44,6 +44,12 @@ extern wxString g_LibEditSectionTag;
 extern wxString g_BoardEditorSectionTag;
 extern wxString g_ModuleEditSectionTag;
 
+extern wxString g_CommonSectionTitle;
+extern wxString g_SchematicSectionTitle;
+extern wxString g_LibEditSectionTitle;
+extern wxString g_BoardEditorSectionTitle;
+extern wxString g_ModuleEditSectionTitle;
+
 
 /**
  * class EDA_HOTKEY
@@ -81,7 +87,7 @@ struct EDA_HOTKEY_CONFIG
 public:
     wxString*       m_SectionTag;     // The configuration file section name.
     EDA_HOTKEY**    m_HK_InfoList;    // List of EDA_HOTKEY pointers
-    const wchar_t*  m_Comment;        // Will be printed in the config file only.
+    wxString*  m_Title;        // Title displayed in hotkey editor and used as comment in file
 };
 
 
diff --git a/pagelayout_editor/hotkeys.cpp b/pagelayout_editor/hotkeys.cpp
index 5313763bb5..b72633546c 100644
--- a/pagelayout_editor/hotkeys.cpp
+++ b/pagelayout_editor/hotkeys.cpp
@@ -59,7 +59,7 @@
 
 // mouse click command:
 static EDA_HOTKEY HkMouseLeftClick( wxT( "Mouse Left Click" ), HK_LEFT_CLICK, WXK_RETURN, 0 );
-static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left DClick" ), HK_LEFT_DCLICK, WXK_END, 0 );
+static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left Double Click" ), HK_LEFT_DCLICK, WXK_END, 0 );
 
 static EDA_HOTKEY    HkResetLocalCoord( wxT( "Reset Local Coordinates" ),
                                         HK_RESET_LOCAL_COORD, ' ' );
@@ -107,12 +107,13 @@ EDA_HOTKEY* s_PlEditor_Hotkey_List[] =
 // list of sections and corresponding hotkey list for Pl_Editor
 // (used to create an hotkey config file)
 wxString s_PlEditorSectionTag( wxT( "[pl_editor]" ) );
+wxString s_PlEditorSectionTitle( wxT( "Part Layout Editor" ) );
 
 struct EDA_HOTKEY_CONFIG s_PlEditor_Hokeys_Descr[] =
 {
-    { &g_CommonSectionTag,    s_Common_Hotkey_List,     L"Common keys"    },
-    { &s_PlEditorSectionTag,  s_PlEditor_Hotkey_List,   L"pl_editor keys" },
-    { NULL,                   NULL,                     NULL              }
+    { &g_CommonSectionTag,    s_Common_Hotkey_List,     &g_CommonSectionTitle    },
+    { &s_PlEditorSectionTag,  s_PlEditor_Hotkey_List,   &s_PlEditorSectionTitle  },
+    { NULL,                   NULL,                     NULL                     }
 };
 
 
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index e6ed7dee19..084ec62506 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -36,7 +36,7 @@
 // mouse click command:
 static EDA_HOTKEY HkMouseLeftClick( wxT( "Mouse Left Click" ),
                                     HK_LEFT_CLICK, WXK_RETURN, 0 );
-static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left DClick" ),
+static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left Double Click" ),
                                      HK_LEFT_DCLICK, WXK_END, 0 );
 
 static EDA_HOTKEY HkSwitch2CopperLayer( wxT( "Switch to Copper (B.Cu) layer" ),
@@ -64,21 +64,21 @@ static EDA_HOTKEY HkSwitch2PreviousCopperLayer( wxT( "Switch to Previous Layer"
                                                 HK_SWITCH_LAYER_TO_PREVIOUS, '-' );
 
 static EDA_HOTKEY HkSaveModule( wxT( "Save Module" ), HK_SAVE_MODULE, 'S' + GR_KB_CTRL );
-static EDA_HOTKEY HkSavefile( wxT( "Save board" ), HK_SAVE_BOARD, 'S' + GR_KB_CTRL );
-static EDA_HOTKEY HkSavefileAs( wxT( "Save board as" ), HK_SAVE_BOARD_AS, 'S' + GR_KB_CTRL + GR_KB_SHIFT );
-static EDA_HOTKEY HkLoadfile( wxT( "Load board" ), HK_LOAD_BOARD, 'L' + GR_KB_CTRL );
+static EDA_HOTKEY HkSavefile( wxT( "Save Board" ), HK_SAVE_BOARD, 'S' + GR_KB_CTRL );
+static EDA_HOTKEY HkSavefileAs( wxT( "Save Board As" ), HK_SAVE_BOARD_AS, 'S' + GR_KB_CTRL + GR_KB_SHIFT );
+static EDA_HOTKEY HkLoadfile( wxT( "Load Board" ), HK_LOAD_BOARD, 'L' + GR_KB_CTRL );
 static EDA_HOTKEY HkFindItem( wxT( "Find Item" ), HK_FIND_ITEM, 'F' + GR_KB_CTRL );
-static EDA_HOTKEY HkBackspace( wxT( "Delete track segment" ), HK_BACK_SPACE, WXK_BACK );
-static EDA_HOTKEY HkAddNewTrack( wxT( "Add new track" ), HK_ADD_NEW_TRACK, 'X' );
+static EDA_HOTKEY HkBackspace( wxT( "Delete Track Segment" ), HK_BACK_SPACE, WXK_BACK );
+static EDA_HOTKEY HkAddNewTrack( wxT( "Add New Track" ), HK_ADD_NEW_TRACK, 'X' );
 static EDA_HOTKEY HkAddThroughVia( wxT( "Add Through Via" ), HK_ADD_THROUGH_VIA, 'V' );
-static EDA_HOTKEY HkSelLayerAndAddThroughVia( wxT( "Sel Layer and Add Through Via" ),
+static EDA_HOTKEY HkSelLayerAndAddThroughVia( wxT( "Select Layer and Add Through Via" ),
                                               HK_SEL_LAYER_AND_ADD_THROUGH_VIA, '<' );
 static EDA_HOTKEY HkAddMicroVia( wxT( "Add MicroVia" ), HK_ADD_MICROVIA, 'V' + GR_KB_CTRL );
 static EDA_HOTKEY HkAddBlindBuriedVia( wxT( "Add Blind/Buried Via" ), HK_ADD_BLIND_BURIED_VIA, 'V' + GR_KB_ALT );
-static EDA_HOTKEY HkSelLayerAndAddBlindBuriedVia( wxT( "Sel Layer and Add Blind/Buried Via" ),
+static EDA_HOTKEY HkSelLayerAndAddBlindBuriedVia( wxT( "Select Layer and Add Blind/Buried Via" ),
                                                   HK_SEL_LAYER_AND_ADD_BLIND_BURIED_VIA, '<' + GR_KB_ALT );
 static EDA_HOTKEY HkSwitchTrackPosture( wxT( "Switch Track Posture" ),  HK_SWITCH_TRACK_POSTURE, '/' );
-static EDA_HOTKEY HkDragTrackKeepSlope( wxT( "Drag track keep slope" ), HK_DRAG_TRACK_KEEP_SLOPE, 'D' );
+static EDA_HOTKEY HkDragTrackKeepSlope( wxT( "Drag Track Keep Slope" ), HK_DRAG_TRACK_KEEP_SLOPE, 'D' );
 static EDA_HOTKEY HkPlaceItem( wxT( "Place Item" ), HK_PLACE_ITEM, 'P' );
 static EDA_HOTKEY HkEditBoardItem( wxT( "Edit Item" ), HK_EDIT_ITEM, 'E' );
 static EDA_HOTKEY HkFlipItem( wxT( "Flip Item" ), HK_FLIP_ITEM, 'F' );
@@ -90,16 +90,16 @@ static EDA_HOTKEY HkGetAndMoveFootprint( wxT( "Get and Move Footprint" ), HK_GET
 static EDA_HOTKEY HkLock_Unlock_Footprint( wxT( "Lock/Unlock Footprint" ), HK_LOCK_UNLOCK_FOOTPRINT, 'L' );
 static EDA_HOTKEY HkDelete( wxT( "Delete Track or Footprint" ), HK_DELETE, WXK_DELETE );
 static EDA_HOTKEY HkResetLocalCoord( wxT( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' );
-static EDA_HOTKEY HkSwitchHighContrastMode( wxT("Switch Highcontrast mode"), HK_SWITCH_HIGHCONTRAST_MODE,'H');
+static EDA_HOTKEY HkSwitchHighContrastMode( wxT( "Toggle High Contrast Mode" ), HK_SWITCH_HIGHCONTRAST_MODE,'H');
 
-static EDA_HOTKEY HkSetGridOrigin( wxT("Set Grid Origin"), HK_SET_GRID_ORIGIN, 'S' );
-static EDA_HOTKEY HkResetGridOrigin( wxT("Reset Grid Origin"), HK_RESET_GRID_ORIGIN, 'Z' );
+static EDA_HOTKEY HkSetGridOrigin( wxT( "Set Grid Origin" ), HK_SET_GRID_ORIGIN, 'S' );
+static EDA_HOTKEY HkResetGridOrigin( wxT( "Reset Grid Origin" ), HK_RESET_GRID_ORIGIN, 'Z' );
 
-static EDA_HOTKEY HkCanvasDefault( wxT( "Switch to default canvas" ),
+static EDA_HOTKEY HkCanvasDefault( wxT( "Switch to Default Canvas" ),
                                    HK_CANVAS_DEFAULT, WXK_F9 );
-static EDA_HOTKEY HkCanvasOpenGL( wxT( "Switch to OpenGL canvas" ),
+static EDA_HOTKEY HkCanvasOpenGL( wxT( "Switch to OpenGL Canvas" ),
                                   HK_CANVAS_OPENGL, WXK_F11 );
-static EDA_HOTKEY HkCanvasCairo( wxT( "Switch to Cairo canvas" ),
+static EDA_HOTKEY HkCanvasCairo( wxT( "Switch to Cairo Canvas" ),
                                  HK_CANVAS_CAIRO, WXK_F12 );
 
 /* Fit on Screen */
@@ -285,33 +285,33 @@ EDA_HOTKEY* module_viewer_Hotkey_List[] = {
 // list of sections and corresponding hotkey list for Pcbnew
  // (used to create an hotkey config file, and edit hotkeys )
 struct EDA_HOTKEY_CONFIG g_Pcbnew_Editor_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_Hotkey_List, L"Common keys" },
-    { &g_BoardEditorSectionTag, board_edit_Hotkey_List, L"Board editor keys" },
-    { &g_ModuleEditSectionTag, module_edit_Hotkey_List, L"Footprint editor keys" },
-    { NULL, NULL, NULL }
+    { &g_CommonSectionTag,      common_Hotkey_List,         &g_CommonSectionTitle      },
+    { &g_BoardEditorSectionTag, board_edit_Hotkey_List,     &g_BoardEditorSectionTitle },
+    { &g_ModuleEditSectionTag,  module_edit_Hotkey_List,    &g_ModuleEditSectionTitle  },
+    { NULL,                     NULL,                       NULL                       }
 };
 
 // list of sections and corresponding hotkey list for the board editor
 // (used to list current hotkeys in the board editor)
 struct EDA_HOTKEY_CONFIG g_Board_Editor_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_Hotkey_List, NULL },
-    { &g_BoardEditorSectionTag, board_edit_Hotkey_List, NULL },
+    { &g_CommonSectionTag,      common_Hotkey_List,      &g_CommonSectionTitle },
+    { &g_BoardEditorSectionTag, board_edit_Hotkey_List,  &g_BoardEditorSectionTitle },
     { NULL, NULL, NULL }
 };
 
 // list of sections and corresponding hotkey list for the footprint editor
 // (used to list current hotkeys in the module editor)
 struct EDA_HOTKEY_CONFIG g_Module_Editor_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_Hotkey_List, NULL },
-    { &g_ModuleEditSectionTag, module_edit_Hotkey_List, NULL },
-    { NULL, NULL, NULL }
+    { &g_CommonSectionTag,     common_Hotkey_List,      &g_CommonSectionTitle },
+    { &g_ModuleEditSectionTag, module_edit_Hotkey_List, &g_ModuleEditSectionTitle },
+    { NULL,                    NULL,                    NULL }
 };
 
 // list of sections and corresponding hotkey list for the footprint viewer
 // (used to list current hotkeys in the module viewer)
 struct EDA_HOTKEY_CONFIG g_Module_Viewer_Hokeys_Descr[] = {
-    { &g_CommonSectionTag, common_basic_Hotkey_List, NULL },
-    { NULL, NULL, NULL }
+    { &g_CommonSectionTag, common_basic_Hotkey_List, &g_CommonSectionTitle },
+    { NULL,                NULL,                     NULL }
 };