diff --git a/src/defs.h b/src/defs.h
index 4f05fb0..7ba012b 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -74,17 +74,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MAP_TILE_OUTSIDE			255
 #define MAP_TILE_MAX				256
 
-#define MAX_SPRITE_FRAMES			8
-
 #define JUMP_POWER					-12
 #define MAX_OXYGEN					(FPS * 10)
-#define MAX_KEY_TYPES				12
+#define MAX_KEY_TYPES				8
 #define MAX_ITEMS					14
 
 #define MAX_CHECKPOINTS				15
 
-#define MAX_WIDGET_OPTIONS			8
-
 #define MAX_ENTS_TO_OBSERVE			12
 
 enum
diff --git a/src/entities/blobs/bob.c b/src/entities/blobs/bob.c
index 8aae508..952cbfb 100644
--- a/src/entities/blobs/bob.c
+++ b/src/entities/blobs/bob.c
@@ -594,7 +594,6 @@ void resetAtCheckpoint(void)
 	}
 }
 
-
 void die(void)
 {
 	world.bob->flags &= ~EF_WEIGHTLESS;
diff --git a/src/system/widgets.c b/src/system/widgets.c
index c61bdf6..0c3e3e9 100644
--- a/src/system/widgets.c
+++ b/src/system/widgets.c
@@ -62,7 +62,7 @@ void handleWidgetClick(int x, int y)
 		{
 			w->value++;
 			
-			w->value %= MAX_WIDGET_OPTIONS;
+			w->value %= w->numOptions;
 		}
 
 		w->clicked = 1;
@@ -75,7 +75,7 @@ void activeSelected(void)
 	{
 		selectedWidget->value++;
 		
-		selectedWidget->value %= MAX_WIDGET_OPTIONS;
+		selectedWidget->value %= selectedWidget->numOptions;
 	}
 
 	selectedWidget->clicked = 1;