diff --git a/pw3270.cbp b/pw3270.cbp
index 6ada1e9..c4255de 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -80,9 +80,6 @@
 		<Unit filename="src/objects/actions/lib3270/pfkey.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/objects/actions/lib3270/toggle.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="src/objects/actions/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/include/pw3270/actions.h b/src/include/pw3270/actions.h
index 0ed2556..2742ef4 100644
--- a/src/include/pw3270/actions.h
+++ b/src/include/pw3270/actions.h
@@ -130,9 +130,6 @@
 	/// @brief Get lib3270 session handle.
 	H3270				* pw3270_action_get_session(GAction *action);
 
-	/// @brief Add lib3270 actions to an application window.
-	void				  pw3270_window_add_actions(GtkWidget * appwindow);
-
 	//
 	// "Simple" action
 	//
diff --git a/src/objects/actions/lib3270/pfkey.c b/src/objects/actions/lib3270/pfkey.c
index a609747..34fff3b 100644
--- a/src/objects/actions/lib3270/pfkey.c
+++ b/src/objects/actions/lib3270/pfkey.c
@@ -28,7 +28,7 @@
  */
 
  /**
-  * @brief Implement GAction "wrapper" for lib3270's PAs.
+  * @brief Implement GAction "wrapper" for lib3270's PFs.
   *
   */
 
diff --git a/src/objects/actions/window.c b/src/objects/actions/window.c
index 48e865f..1b1f020 100644
--- a/src/objects/actions/window.c
+++ b/src/objects/actions/window.c
@@ -37,12 +37,12 @@
  #include <v3270/actions.h>
  #include <pw3270/window.h>
 
+/*
  void pw3270_window_add_actions(GtkWidget * appwindow) {
 
 	GActionMap * map = G_ACTION_MAP(appwindow);
 	size_t ix;
 
-	/*
 	// Map lib3270 actions
 	{
 		const LIB3270_ACTION * actions = lib3270_get_actions();
@@ -53,9 +53,7 @@
 
 		}
 	}
-	*/
 
-	/*
 	// Map toggles
 	{
 		const LIB3270_TOGGLE * toggles = lib3270_get_toggles();
@@ -66,9 +64,7 @@
 
 		}
 	}
-	*/
 
-	/*
 	// Map V3270 actions
 	{
 		const V3270_ACTION * actions = v3270_get_actions();
@@ -79,7 +75,6 @@
 		}
 
 	}
-	*/
 
 	// Map special actions
 	{
@@ -110,3 +105,4 @@
 	debug("%s ends",__FUNCTION__);
 
  }
+*/
diff --git a/src/objects/window/window.c b/src/objects/window/window.c
index 194fcf7..183f380 100644
--- a/src/objects/window/window.c
+++ b/src/objects/window/window.c
@@ -140,12 +140,13 @@
 	//
 	// Setup tn3270 actions.
 	//
-	pw3270_window_add_actions(GTK_WIDGET(widget));
-
 	g_action_map_add_v3270_actions(G_ACTION_MAP(widget));
 	g_action_map_add_lib3270_actions(G_ACTION_MAP(widget));
 	g_action_map_add_lib3270_toggles(G_ACTION_MAP(widget));
 
+	g_action_map_add_action(G_ACTION_MAP(widget),v3270_pfkey_action_new());
+	g_action_map_add_action(G_ACTION_MAP(widget),v3270_pakey_action_new());
+
 	// Map special actions
 	{
 		size_t ix;
--
libgit2 0.21.2