diff --git a/cpiface/cpiface.c b/cpiface/cpiface.c
index e82f8098..161047f4 100644
--- a/cpiface/cpiface.c
+++ b/cpiface/cpiface.c
@@ -2029,7 +2029,7 @@ void cpiDrawGStrings (struct cpifaceSessionAPI_t *cpifaceSession)
 void cpiResetScreen(void)
 {
 	if (curmode)
-		curmode->SetMode();
+		curmode->SetMode(&cpifaceSessionAPI.Public);
 }
 
 static void cpiChangeMode(struct cpimoderegstruct *m)
@@ -2050,7 +2050,7 @@ static void cpiChangeMode(struct cpimoderegstruct *m)
 		}
 	}
 
-	curmode->SetMode();
+	curmode->SetMode(&cpifaceSessionAPI.Public);
 }
 
 void cpiGetMode(char *hand)
@@ -2409,7 +2409,7 @@ static void plmpOpenScreen (void)
 		curmode=&cpiModeText;
 	if (!curmode->Event (&cpifaceSessionAPI.Public, cpievOpen))
 		curmode=&cpiModeText;
-	curmode->SetMode();
+	curmode->SetMode(&cpifaceSessionAPI.Public);
 }
 
 
@@ -2562,7 +2562,7 @@ static interfaceReturnEnum plmpDrawScreen(void)
 		plInKeyboardHelp = cpiKeyHelpDisplay();
 		if (!plInKeyboardHelp)
 		{
-			curmode->SetMode(); /* force complete redraw */
+			curmode->SetMode(&cpifaceSessionAPI.Public); /* force complete redraw */
 		} else {
 			framelock();
 		}
@@ -2627,7 +2627,7 @@ static interfaceReturnEnum plmpDrawScreen(void)
 				fsSetup();
 				plSetTextMode(fsScrType);
 				fsScrType=plScrType;
-				curmode->SetMode();
+				curmode->SetMode(&cpifaceSessionAPI.Public);
 				break;
 			#if 0
 			TODO plLoopPatterns
diff --git a/cpiface/cpiface.h b/cpiface/cpiface.h
index 4d130882..ef95dacf 100644
--- a/cpiface/cpiface.h
+++ b/cpiface/cpiface.h
@@ -68,7 +68,7 @@ extern int cpiKeyHelpDisplay(void); /* recall until it returns zero. This functi
 struct cpimoderegstruct
 {
   char handle[9];
-  void (*SetMode)();
+  void (*SetMode)(struct cpifaceSessionAPI_t *cpifaceSession);
   void (*Draw)(struct cpifaceSessionAPI_t *cpifaceSession);
   int (*IProcessKey)(struct cpifaceSessionAPI_t *cpifaceSession, uint16_t);
   int (*AProcessKey)(struct cpifaceSessionAPI_t *cpifaceSession, uint16_t);
diff --git a/cpiface/cpifontdebug.c b/cpiface/cpifontdebug.c
index 0201657c..4278a43f 100644
--- a/cpiface/cpifontdebug.c
+++ b/cpiface/cpifontdebug.c
@@ -101,7 +101,7 @@ static int fontdebugIProcessKey (struct cpifaceSessionAPI_t *cpifaceSession, uin
 	return 1;
 }
 
-static void fontdebugSetMode(void)
+static void fontdebugSetMode(struct cpifaceSessionAPI_t *cpifaceSession)
 {
 	plSetTextMode(fsScrType);
 	fsScrType=plScrType;
diff --git a/cpiface/cpikube.c b/cpiface/cpikube.c
index fb412dd8..becc5c8c 100644
--- a/cpiface/cpikube.c
+++ b/cpiface/cpikube.c
@@ -519,7 +519,7 @@ static int wuerfelKey (struct cpifaceSessionAPI_t *cpifaceSession, uint16_t key)
 	return 0;
 }
 
-static void wuerfelSetMode(void)
+static void wuerfelSetMode(struct cpifaceSessionAPI_t *cpifaceSession)
 {
 	plLoadWuerfel();
 	plPrepareWuerfel();
diff --git a/cpiface/cpilinks.c b/cpiface/cpilinks.c
index 91905904..074cc851 100644
--- a/cpiface/cpilinks.c
+++ b/cpiface/cpilinks.c
@@ -163,7 +163,7 @@ static void hlpDraw (struct cpifaceSessionAPI_t *cpifaceSession)
 	plDisplayHelp (cpifaceSession);
 }
 
-static void hlpSetMode()
+static void hlpSetMode(struct cpifaceSessionAPI_t *cpifaceSession)
 {
 	cpiSetTextMode(fsScrType);
 	plWinHeight=plScrHeight-6;
diff --git a/cpiface/cpimsg.c b/cpiface/cpimsg.c
index 538a0035..8da868a6 100644
--- a/cpiface/cpimsg.c
+++ b/cpiface/cpimsg.c
@@ -111,7 +111,7 @@ static void msgDraw (struct cpifaceSessionAPI_t *cpifaceSession)
 	plDisplayMessage (cpifaceSession);
 }
 
-static void msgSetMode(void)
+static void msgSetMode(struct cpifaceSessionAPI_t *cpifaceSession)
 {
 	cpiSetTextMode(0);
 	plWinFirstLine=6;