diff --git a/ChangeLog b/ChangeLog
index 06f63a4e..b48a4dae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-20  Markus Gans  <guru.mail@muenster.de>
+	* Add the possibility to switch off the cursor optimization 
+	  for bad ANSI-terminal implementations like HyperTerminal 
+	  (e.g. horizontal absolute position (ch) has there no function)
+	* Now you can activate the menu with ctrl+space, too. 
+	  (For terminals with no meta key support)
+
 2015-12-20  Markus Gans  <guru.mail@muenster.de>
 	* Bug fix in FTerm updateVTerm() for updates from vdesktop
 	* Add raiseWindow() to FMenuBar::leaveMenuBar()
diff --git a/src/fbuttongroup.cpp b/src/fbuttongroup.cpp
index 1284b40b..d5a11bb0 100644
--- a/src/fbuttongroup.cpp
+++ b/src/fbuttongroup.cpp
@@ -296,7 +296,7 @@ void FButtonGroup::hide()
 }
 
 //----------------------------------------------------------------------
-void FButtonGroup::insert(FToggleButton* button)
+void FButtonGroup::insert (FToggleButton* button)
 {
   if ( button->group() )
     button->group()->remove(button);
@@ -316,7 +316,7 @@ void FButtonGroup::insert(FToggleButton* button)
 }
 
 //----------------------------------------------------------------------
-void FButtonGroup::remove(FToggleButton* button)
+void FButtonGroup::remove (FToggleButton* button)
 {
   FButtonGroup::FButtonList::iterator iter;
 
diff --git a/src/fenum.h b/src/fenum.h
index 28b97c02..217407bb 100644
--- a/src/fenum.h
+++ b/src/fenum.h
@@ -174,7 +174,6 @@ class fc
    // keyboard - single keys
    enum keys
    {
-     Fckey_at                   = 0x0000000,  // control-@
      Fckey_a                    = 0x0000001,  // control-a
      Fckey_b                    = 0x0000002,  // control-b
      Fckey_c                    = 0x0000003,  // control-c
@@ -207,6 +206,7 @@ class fc
      Fckey_caret                = 0x000001e,  // control-^
      Fckey_underscore           = 0x000001f,  // control-_
      Fkey_space                 = 0x0000020,
+     Fckey_space                = 0x1000020,  // control-space
      Fkey_backspace             = 0x1000100,
      Fkey_catab                 = 0x1000101,
      Fkey_clear                 = 0x1000102,
diff --git a/src/fkey_map.h b/src/fkey_map.h
index c65de461..e86d4750 100644
--- a/src/fkey_map.h
+++ b/src/fkey_map.h
@@ -415,7 +415,6 @@ keyname;
 
 static keyname FkeyName[] =
 {
-  { fc::Fckey_at                  , "Ctrl+@" },
   { fc::Fckey_a                   , "Ctrl+A" },
   { fc::Fckey_b                   , "Ctrl+B" },
   { fc::Fckey_c                   , "Ctrl+C" },
@@ -447,6 +446,7 @@ static keyname FkeyName[] =
   { fc::Fckey_caret               , "Ctrl+^" },
   { fc::Fckey_underscore          , "Ctrl+_" },
   { fc::Fkey_space                , "Space" },
+  { fc::Fckey_space               , "Ctrl+Space" }, // Ctrl+(Space or @)
   { fc::Fkey_backspace            , "Backspace" },
   { fc::Fkey_catab                , "Clear-All-Tabs" },
   { fc::Fkey_clear                , "Clear-Screen" },
diff --git a/src/fmenubar.cpp b/src/fmenubar.cpp
index 5a4f7c08..e0d17133 100644
--- a/src/fmenubar.cpp
+++ b/src/fmenubar.cpp
@@ -48,6 +48,7 @@ void FMenuBar::init()
   getRootWidget()->setTopPadding(1, true);
   setMenuBar(this);
   addAccelerator (fc::Fkey_f10);
+  addAccelerator (fc::Fckey_space);
   foregroundColor = wc.menu_active_fg;
   backgroundColor = wc.menu_active_bg;
   window_object  = true;
diff --git a/src/ftogglebutton.cpp b/src/ftogglebutton.cpp
index a1c38db0..6bf91899 100644
--- a/src/ftogglebutton.cpp
+++ b/src/ftogglebutton.cpp
@@ -33,7 +33,7 @@ FToggleButton::FToggleButton(FWidget* parent)
 }
 
 //----------------------------------------------------------------------
-FToggleButton::FToggleButton ( const FString& txt, FWidget* parent )
+FToggleButton::FToggleButton (const FString& txt, FWidget* parent)
   : FWidget(parent)
   , focus_inside_group(true)
   , text()
@@ -374,7 +374,7 @@ void FToggleButton::setGeometry (int x, int y, int w, int h, bool adjust)
 }
 
 //----------------------------------------------------------------------
-bool FToggleButton::setNoUnderline(bool on)
+bool FToggleButton::setNoUnderline (bool on)
 {
   if ( on )
     flags |= NO_UNDERLINE;
@@ -384,7 +384,7 @@ bool FToggleButton::setNoUnderline(bool on)
 }
 
 //----------------------------------------------------------------------
-bool FToggleButton::setEnable(bool on)
+bool FToggleButton::setEnable (bool on)
 {
   FWidget::setEnable(on);
 
@@ -414,7 +414,7 @@ bool FToggleButton::setEnable(bool on)
 }
 
 //----------------------------------------------------------------------
-bool FToggleButton::setFocus(bool on)
+bool FToggleButton::setFocus (bool on)
 {
   FWidget::setFocus(on);
 
@@ -608,7 +608,7 @@ void FToggleButton::onFocusOut (FFocusEvent* out_ev)
 }
 
 //----------------------------------------------------------------------
-bool FToggleButton::setChecked(bool on)
+bool FToggleButton::setChecked (bool on)
 {
   if ( checked != on )
   {
diff --git a/src/ftogglebutton.h b/src/ftogglebutton.h
index f4aa9af8..55f9ec14 100644
--- a/src/ftogglebutton.h
+++ b/src/ftogglebutton.h
@@ -84,18 +84,18 @@ class FToggleButton : public FWidget
    void onFocusIn (FFocusEvent*);
    void onFocusOut (FFocusEvent*);
 
-   bool setNoUnderline(bool);
+   bool setNoUnderline (bool);
    bool setNoUnderline();
    bool unsetNoUnderline();
 
-   bool setEnable(bool);
+   bool setEnable (bool);
    bool setEnable();
    bool unsetEnable();
    bool setDisable();
-   bool setFocus(bool);
+   bool setFocus (bool);
    bool setFocus();
    bool unsetFocus();
-   bool setChecked(bool);
+   bool setChecked (bool);
    bool setChecked();
    bool unsetChecked();
    bool isChecked();