diff --git a/server/menus.c b/server/menus.c
index 10a5873..1041109 100644
--- a/server/menus.c
+++ b/server/menus.c
@@ -195,14 +195,14 @@ int
 Heartbeat_func (int input)
 {
 	if (input == MENU_READ)
-		return (heartbeat != HEART_OFF);
+		return (heartbeat != HEARTBEAT_OFF);
 	if (input == MENU_CHECK) {
 		if (heartbeat)
-			heartbeat = HEART_OFF;
+			heartbeat = HEARTBEAT_OFF;
 		else
-			heartbeat = HEART_OPEN;
+			heartbeat = HEARTBEAT_OPEN;
 	}
-	return ((heartbeat != HEART_OFF) | MENU_OK);
+	return ((heartbeat != HEARTBEAT_OFF) | MENU_OK);
 }
 
 int
diff --git a/server/screen.h b/server/screen.h
index 96be961..981857c 100644
--- a/server/screen.h
+++ b/server/screen.h
@@ -24,6 +24,9 @@ typedef struct screen {
 	int heartbeat;
 	int timeout;
 	int backlight_state;
+	int cursor;
+	int cursor_x;
+	int cursor_y;
 	char *keys;
 	LinkedList *widgets;
 	client *parent;