diff --git a/data/themes/default_pointer.edc b/data/themes/default_pointer.edc
index efab115e2..25d605e58 100644
--- a/data/themes/default_pointer.edc
+++ b/data/themes/default_pointer.edc
@@ -12,14 +12,6 @@ group {
 	 mouse_events:  0;
 	 description {
 	    state: "default" 0.0;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset:   0   0;
-	    }
-	    rel2 {
-	       relative: 0.6875 1.0;
-	       offset:   -1     -1;
-	    }
 	    image {
 	       normal: "e17_pointer.png";
 	    }
@@ -29,31 +21,16 @@ group {
 	    state: "faded" 0.0;
 	    inherit: "default" 0.0;
             rel1 {
-	       relative: 0.0 0.0;
+	       relative: 0.2 0.2;
 	       offset:   0   0;
 	    }
 	    rel2 {
-	       relative: 0.34375 0.5;
-	       offset:   -1      -1;
+	       relative: 0.8 0.8;
+	       offset:   -1  -1;
 	    }
 	    color: 255 255 255 128;
 	 }
 */
-	 description {
-	    state: "test" 0.0;
-	    aspect: 0.75 1.0;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset:   8  8;
-	    }
-	    rel2 {
-	       relative: 0.0 0.0;
-	       offset:   24  32;
-	    }
-	    image {
-	       normal: "e17_pointer_mono.png";
-	    }
-	 }
       }
       part {
 	 name:          "hotspot";
@@ -71,35 +48,9 @@ group {
 	       offset:   1   2;
 	    }
 	 }
-	 description {
-	    state:    "test" 0.0;
-	    visible:  0;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset:   8   8;
-	    }
-	    rel2 {
-	       relative: 0.0 0.0;
-	       offset:   8   8;
-	    }
-	 }
       }
    }
    programs {
-      program {
-	 name:    "test_hot";
-	 signal:  "test";
-	 source:  "";
-	 action:  STATE_SET "test" 0.0;
-	 target:  "hotspot";
-      }
-      program {
-	 name:    "test_pointer";
-	 signal:  "test";
-	 source:  "";
-	 action:  STATE_SET "test" 0.0;
-	 target:  "pointer";
-      }
 /*      
       program {
 	 name:    "anim1";
@@ -130,14 +81,6 @@ group {
 	 mouse_events:  0;
 	 description {
 	    state:  "default" 0.0;
-	    rel1 {
-	       relative: 0.0 0.0;
-	       offset:   0   0;
-	    }
-	    rel2 {
-	       relative: 0.6666 1.0;
-	       offset:   -1     -1;
-	    }
 	    image {
 	       normal: "e17_pointer_mono.png";
 	    }
@@ -152,11 +95,11 @@ group {
 	    visible:  0;
 	    rel1 {
 	       relative: 0.0 0.0;
-	       offset:   0   0;
+	       offset:   1   1;
 	    }
 	    rel2 {
 	       relative: 0.0 0.0;
-	       offset:   0   0;
+	       offset:   1   1;
 	    }
 	 }
       }
diff --git a/data/themes/images/e17_pointer.png b/data/themes/images/e17_pointer.png
index 634323053..81472ba65 100644
Binary files a/data/themes/images/e17_pointer.png and b/data/themes/images/e17_pointer.png differ
diff --git a/data/themes/images/e17_pointer_mono.png b/data/themes/images/e17_pointer_mono.png
index 207685601..1c25f5fa8 100644
Binary files a/data/themes/images/e17_pointer_mono.png and b/data/themes/images/e17_pointer_mono.png differ
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index ec0b57860..88e9e4aea 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -3,8 +3,8 @@
  */
 #include "e.h"
 
-//#define INOUTDEBUG_MOUSE 1
-//#define INOUTDEBUG_FOCUS 1
+#define INOUTDEBUG_MOUSE 1
+#define INOUTDEBUG_FOCUS 1
 
 /* These are compatible with netwm */
 #define RESIZE_TL   0
@@ -863,6 +863,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 {
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
+   printf("e_border_focus_set(%p, %i %i);\n", bd, focus, set);
    if ((bd->visible) && (bd->changes.visible))
      {  
 	if ((bd->want_focus) && (set) && (!focus))
@@ -964,8 +965,16 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	e_hints_active_window_set(bd->zone->container->manager, NULL);
      }
 #endif
-   if (bd->focused) focused = bd;
-   else if ((!bd->focused) && (focused == bd)) focused = NULL;
+   if (bd->focused)
+     {
+	focused = bd;
+	printf("set focused to %p\n", focused);
+     }
+   else if ((!bd->focused) && (focused == bd))
+     {
+	focused = NULL;
+	printf("set focused to %p\n", focused);
+     }
 }
 
 void
@@ -2848,7 +2857,8 @@ _e_border_cb_window_focus_out(void *data, int ev_type, void *ev)
    else if (e->mode == ECORE_X_EVENT_MODE_UNGRAB)
      {
 	/* for firefox/thunderbird (xul) menu walking */
-//	if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
+	/* NB: why did i disable this before? */
+	if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_WHILE_GRABBED)
      {