diff --git a/src/actions/abstract.c b/src/actions/abstract.c
index 6c5a25b..00cd113 100644
--- a/src/actions/abstract.c
+++ b/src/actions/abstract.c
@@ -198,7 +198,7 @@
 
  void pw3270_action_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
 
-	debug("%s(%d)",__FUNCTION__,prop_id);
+//	debug("%s(%d)",__FUNCTION__,prop_id);
 
 	GAction *action = G_ACTION(object);
 
@@ -234,7 +234,7 @@
 
  	pw3270Action * action = PW3270_ACTION(object);
 
- 	debug("%s %s -> %s", __FUNCTION__, action->name, name);
+// 	debug("%s %s -> %s", __FUNCTION__, action->name, name);
 
  	if(action->name)
 		g_free(action->name);
@@ -251,7 +251,7 @@
  }
 
  const GVariantType * pw3270_action_get_parameter_type(GAction *action) {
-	debug("%s",__FUNCTION__);
+//	debug("%s",__FUNCTION__);
  	return NULL;
  }
 
@@ -333,7 +333,7 @@
 
  	pw3270Action * action = PW3270_ACTION(object);
 
- 	debug("%s: terminal=%p",__FUNCTION__,action->terminal);
+// 	debug("%s: terminal=%p",__FUNCTION__,action->terminal);
 
  	if(action && action->terminal) {
 
diff --git a/src/actions/lib3270/toggle.c b/src/actions/lib3270/toggle.c
index a52ca59..1d99472 100644
--- a/src/actions/lib3270/toggle.c
+++ b/src/actions/lib3270/toggle.c
@@ -59,7 +59,7 @@
  G_DEFINE_TYPE(Lib3270ToggleAction, Lib3270ToggleAction, PW3270_TYPE_ACTION);
 
  static void change_state(H3270 *hSession, LIB3270_TOGGLE_ID id, char state, void * action) {
-	pw3270_action_change_state_boolean(PW3270_ACTION(action), state == 0 ? FALSE : TRUE);
+	pw3270_action_change_state_boolean((GAction *) action, state == 0 ? FALSE : TRUE);
  }
 
  static void change_widget(GAction *object, GtkWidget *from, GtkWidget *to) {
@@ -79,7 +79,16 @@
 
  }
 
+ static void activate(GAction *action, GVariant *parameter, GtkWidget *terminal) {
+	lib3270_toggle(v3270_get_session(terminal),PW3270_LIB3270_TOGGLE_ACTION(action)->definition->id);
+ }
+
  void Lib3270ToggleAction_class_init(Lib3270ToggleActionClass *klass) {
+
+	pw3270ActionClass * action = PW3270_ACTION_CLASS(klass);
+	action->activate = activate;
+	action->change_widget = change_widget;
+
  }
 
  void Lib3270ToggleAction_init(Lib3270ToggleAction *action) {
diff --git a/src/actions/window.c b/src/actions/window.c
index 16e2184..7cf9ce1 100644
--- a/src/actions/window.c
+++ b/src/actions/window.c
@@ -34,14 +34,15 @@
 
  #include "private.h"
  #include <lib3270/actions.h>
+ #include <pw3270/window.h>
 
  void pw3270_window_add_actions(GtkWidget * appwindow) {
 
 	GActionMap 	* map = G_ACTION_MAP(appwindow);
 	GtkWidget	* terminal = pw3270_window_get_terminal_widget(appwindow);
+	size_t ix;
 
-	// g_action_map_add_action(map,pw3270_action_new_from_lib3270(lib3270_action_get_by_name("testpattern"), appwindow));
-
+	/*
 	GAction *action = pw3270_action_new_from_lib3270(lib3270_action_get_by_name("testpattern"));
 	pw3270_action_set_terminal_widget(action,terminal);
 
@@ -50,22 +51,21 @@
 	g_action_map_add_action(map,action);
 
 	debug("--> \"%s\"",pw3270_action_get_name(action));
+	*/
 
-	/*
-	size_t ix;
 
 	// Map lib3270 actions
 	const LIB3270_ACTION * actions = lib3270_get_actions();
 
 	for(ix = 0; actions[ix].name; ix++) {
 
-		// g_autofree gchar * name = g_strconcat("win.", actions[ix].name, NULL);
-        debug("Creating action %s", actions[ix].name);
-		g_action_map_add_action(map,pw3270_action_new_from_lib3270(&actions[ix],appwindow));
+		GAction *action = pw3270_action_new_from_lib3270(&actions[ix]);
+		pw3270_action_set_terminal_widget(action,terminal);
+		g_action_map_add_action(map,action);
 
 	}
-	*/
 
+	// Map toggles
 
 	debug("%s ends",__FUNCTION__);
  }
--
libgit2 0.21.2