diff --git a/data/config/appearance/default/selections/text.bits.db b/data/config/appearance/default/selections/text.bits.db
new file mode 100644
index 000000000..eb0dfd712
Binary files /dev/null and b/data/config/appearance/default/selections/text.bits.db differ
diff --git a/data/icons/image/tiff.db b/data/icons/image/tiff.db
new file mode 100644
index 000000000..d0d6eafee
Binary files /dev/null and b/data/icons/image/tiff.db differ
diff --git a/data/images/win_shadow_icon.png b/data/images/win_shadow_icon.png
new file mode 100644
index 000000000..a26fbcebf
Binary files /dev/null and b/data/images/win_shadow_icon.png differ
diff --git a/data/orig/cursor.png b/data/orig/cursor.png
new file mode 100644
index 000000000..00d4cfcb2
Binary files /dev/null and b/data/orig/cursor.png differ
diff --git a/data/orig/cursor_close.png b/data/orig/cursor_close.png
new file mode 100644
index 000000000..9b84ec0b8
Binary files /dev/null and b/data/orig/cursor_close.png differ
diff --git a/data/orig/cursor_icon.png b/data/orig/cursor_icon.png
new file mode 100644
index 000000000..5155bdc92
Binary files /dev/null and b/data/orig/cursor_icon.png differ
diff --git a/data/orig/cursor_iconify.png b/data/orig/cursor_iconify.png
new file mode 100644
index 000000000..35c7f5f2d
Binary files /dev/null and b/data/orig/cursor_iconify.png differ
diff --git a/data/orig/cursor_max_size.png b/data/orig/cursor_max_size.png
new file mode 100644
index 000000000..042de9a11
Binary files /dev/null and b/data/orig/cursor_max_size.png differ
diff --git a/data/orig/cursor_menu.png b/data/orig/cursor_menu.png
new file mode 100644
index 000000000..3837cb0e9
Binary files /dev/null and b/data/orig/cursor_menu.png differ
diff --git a/data/orig/cursor_move.png b/data/orig/cursor_move.png
new file mode 100644
index 000000000..60f660c68
Binary files /dev/null and b/data/orig/cursor_move.png differ
diff --git a/data/orig/cursor_resize.png b/data/orig/cursor_resize.png
new file mode 100644
index 000000000..200e151f1
Binary files /dev/null and b/data/orig/cursor_resize.png differ
diff --git a/data/orig/cursor_resize_h.png b/data/orig/cursor_resize_h.png
new file mode 100644
index 000000000..73d589761
Binary files /dev/null and b/data/orig/cursor_resize_h.png differ
diff --git a/data/orig/cursor_resize_v.png b/data/orig/cursor_resize_v.png
new file mode 100644
index 000000000..f35750c46
Binary files /dev/null and b/data/orig/cursor_resize_v.png differ
diff --git a/data/orig/hi.png b/data/orig/hi.png
new file mode 100644
index 000000000..2b201b520
Binary files /dev/null and b/data/orig/hi.png differ
diff --git a/data/orig/sel_border.png b/data/orig/sel_border.png
new file mode 100644
index 000000000..164b2b612
Binary files /dev/null and b/data/orig/sel_border.png differ
diff --git a/data/orig/sel_dark.png b/data/orig/sel_dark.png
new file mode 100644
index 000000000..b60658024
Binary files /dev/null and b/data/orig/sel_dark.png differ
diff --git a/data/orig/sel_hi.png b/data/orig/sel_hi.png
new file mode 100644
index 000000000..5b4529d8b
Binary files /dev/null and b/data/orig/sel_hi.png differ
diff --git a/data/orig/sel_stripes.png b/data/orig/sel_stripes.png
new file mode 100644
index 000000000..0f6f1bc8c
Binary files /dev/null and b/data/orig/sel_stripes.png differ
diff --git a/data/orig/selection.xcf b/data/orig/selection.xcf
new file mode 100644
index 000000000..4912158fe
Binary files /dev/null and b/data/orig/selection.xcf differ
diff --git a/data/orig/tile_half.png b/data/orig/tile_half.png
new file mode 100644
index 000000000..65cc0f653
Binary files /dev/null and b/data/orig/tile_half.png differ
diff --git a/data/orig/tile_hi.png b/data/orig/tile_hi.png
new file mode 100644
index 000000000..7a3c14968
Binary files /dev/null and b/data/orig/tile_hi.png differ
diff --git a/data/test/test.db b/data/test/test.db
new file mode 100644
index 000000000..54fe34d15
Binary files /dev/null and b/data/test/test.db differ
diff --git a/src/place.c b/src/place.c
new file mode 100644
index 000000000..05d2bb677
--- /dev/null
+++ b/src/place.c
@@ -0,0 +1,480 @@
+#include "place.h"
+#include "actions.h"
+#include "guides.h"
+
+static void e_mouse_down(Eevent * ev);
+static void e_mouse_up(Eevent * ev);
+static void e_mouse_move(Eevent * ev);
+
+static int prx, pry;
+static Window win_place = 0;
+
+static void
+e_mouse_down(Eevent * ev)
+{
+   Ev_Mouse_Down          *e;
+
+   e = ev->event;
+   if (!win_place) return;
+}
+
+static void
+e_mouse_up(Eevent * ev)
+{
+   Ev_Mouse_Up          *e;
+
+   e = ev->event;
+   if (!win_place) return;
+   e_action_stop("Window_Place", ACT_MOUSE_UP, 1,  NULL, 
+		 EV_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry);
+   e_window_destroy(win_place);
+   win_place = 0;
+   return;
+}
+
+static void
+e_mouse_move(Eevent * ev)
+{
+   Ev_Mouse_Move          *e;
+
+   e = ev->event;
+   if (!win_place) return;
+   e_action_go("Window_Place", ACT_MOUSE_MOVE, 1,  NULL, 
+	       EV_KEY_MODIFIER_NONE, NULL, NULL, e->x, e->y, e->rx, e->ry,
+	       e->rx - prx, e->ry - pry);
+   prx = e->rx;
+   pry = e->ry;
+}
+
+static int
+e_place_manual(E_Border *b, E_Desktop *desk, int *x, int *y)
+{
+   int w, h;
+   int mx, my, rx, ry;
+   int move_mode = E_GUIDES_BOX;
+   E_CFG_INT(cfg_window_move_mode, "settings", "/window/move/mode", E_GUIDES_BOX);   
+   
+   E_CONFIG_INT_GET(cfg_window_move_mode, move_mode);
+   w = b->current.requested.w;
+   h = b->current.requested.h;
+   
+   if (!win_place)
+     {
+	win_place = e_window_input_new(0, 0, 0, desk->real.w, desk->real.h);
+	e_window_set_events(win_place, XEV_MOUSE_MOVE | XEV_BUTTON);
+	e_window_raise(win_place);
+	e_window_show(win_place);
+     }
+   else
+     {
+	e_action_stop_by_type("Window_Place");
+     }
+   
+   /* get mouse coords */
+   e_pointer_xy(desk->win.main, &mx, &my);
+   rx = mx;
+   ry = my;
+   prx = rx;
+   pry = ry;
+   /* grab mouse to desktop */
+   e_pointer_ungrab(CurrentTime);
+   e_pointer_grab(win_place, CurrentTime);
+   
+   *x = mx - (w / 2);
+   *y = my - (h / 2);
+
+   /* start a move mode */
+   e_action_stop_by_type("Window_Place");
+   e_action_start("Window_Place", ACT_MOUSE_CLICK, 1,  NULL, 
+		  EV_KEY_MODIFIER_NONE, b, NULL, mx, my, rx, ry);
+   
+   if (move_mode != E_GUIDES_OPAQUE) return 0;
+   return 1;
+}
+
+static int
+e_place_smart(E_Border *b, E_Desktop *desk, int *x, int *y)
+{
+   int w, h;
+   int a_w = 0, a_h = 0;
+   int *a_x = NULL, *a_y = NULL;
+   Evas_List l;
+   
+   w = b->current.requested.w;
+   h = b->current.requested.h;
+   a_w = 2;
+   a_h = 2;
+   a_x = NEW(int, 2);
+   a_y = NEW(int, 2);
+   
+   a_x[0] = 0;
+   a_x[1] = desk->real.w;
+   a_y[0] = 0;
+   a_y[1] = desk->real.h;
+   
+   for (l = desk->windows; l; l = l->next)
+     {
+	E_Border *bd;
+	
+	bd = l->data;
+	if ((bd != b) && (bd->current.visible))
+	  {
+	     if (INTERSECTS(bd->current.x, bd->current.y,
+			    bd->current.w, bd->current.h,
+			    0, 0, desk->real.w, desk->real.h))
+	       {
+		  int i, j;
+		  
+		  for (i = 0; i < a_w; i++)
+		    {
+		       int ok = 1;
+		       
+		       if (bd->current.x > 0)
+			 {
+			    if (a_x[i] == bd->current.x) ok = 0;
+			    else if (a_x[i] > bd->current.x)
+			      {
+				 a_w++;
+				 REALLOC(a_x, int, a_w);
+				 for (j = a_w - 1; j > i; j--)
+				   a_x[j] = a_x[j - 1];
+				 a_x[i] = bd->current.x;
+				 ok = 0;
+			      }
+			 }
+		       if (!ok) break;
+		    }
+		  for (i = 0; i < a_w; i++)
+		    {
+		       int ok = 1;
+		       
+		       if (bd->current.x + bd->current.w < desk->real.w)
+			 {
+			    if (a_x[i] == bd->current.x + bd->current.w) ok = 0;
+			    else if (a_x[i] > bd->current.x + bd->current.w)
+			      {
+				 a_w++;
+				 REALLOC(a_x, int, a_w);
+				 for (j = a_w - 1; j > i; j--)
+				   a_x[j] = a_x[j - 1];
+				 a_x[i] = bd->current.x + bd->current.w;
+				 ok = 0;
+			      }
+			 }
+		       if (!ok) break;
+		    }
+		  for (i = 0; i < a_h; i++)
+		    {
+		       int ok = 1;
+		       
+		       if (bd->current.y > 0)
+			 {
+			    if (a_y[i] == bd->current.y) ok = 0;
+			    else if (a_y[i] > bd->current.y)
+			      {
+				 a_h++;
+				 REALLOC(a_y, int, a_h);
+				 for (j = a_h - 1; j > i; j--)
+				   a_y[j] = a_y[j - 1];
+				 a_y[i] = bd->current.y;
+				 ok = 0;
+			      }
+			 }
+		       if (!ok) break;
+		    }
+		  for (i = 0; i < a_h; i++)
+		    {
+		       int ok = 1;
+		       
+		       if (bd->current.y + bd->current.h < desk->real.h)
+			 {
+			    if (a_y[i] == bd->current.y + bd->current.h) ok = 0;
+			    else if (a_y[i] > bd->current.y + bd->current.h)
+			      {
+				 a_h++;
+				 REALLOC(a_y, int, a_h);
+				 for (j = a_h - 1; j > i; j--)
+				   a_y[j] = a_y[j - 1];
+				 a_y[i] = bd->current.y + bd->current.h;
+				 ok = 0;
+			      }
+			 }
+		       if (!ok) break;
+		    }
+	       }
+	  }
+     }
+     {
+	int i, j;
+	int area = 0x7fffffff;
+	
+	for (j = 0; j < a_h - 1; j++)
+	  {
+	     for (i = 0; i < a_w - 1; i++)
+	       {
+		  if ((a_x[i] < (desk->real.w - w)) &&
+		      (a_y[j] < (desk->real.h - h)))
+		    {
+		       int ar = 0;
+		  
+		       for (l = desk->windows; l; l = l->next)
+			 {
+			    E_Border *bd;
+			    int x1, y1, w1, h1, x2, y2, w2, h2;
+			    
+			    bd = l->data;
+			    x1 = a_x[i];
+			    y1 = a_y[j];
+			    w1 = w;
+			    h1 = h;
+			    x2 = bd->current.x;
+			    y2 = bd->current.y;
+			    w2 = bd->current.w;
+			    h2 = bd->current.h;
+			    if ((bd != b) && (bd->current.visible) &&
+				INTERSECTS(x1, y1, w1, h1, x2, y2, w2, h2))
+			      {
+				 int iw, ih;
+				 int x0, x00, y0, y00;
+				 
+				 x0 = x1;
+				 if (x1 < x2) x0 = x2;
+				 x00 = (x1 + w1);
+				 if ((x2 + w2) < (x1 + w1)) x00 = (x2 + w2);
+				 
+				 y0 = y1;
+				 if (y1 < y2) y0 = y2;
+				 y00 = (y1 + h1);
+				 if ((y2 + h2) < (y1 + h1)) y00 = (y2 + h2);
+				 
+				 iw = x00 - x0;
+				 ih = y00 - y0;
+				 ar += (iw * ih);
+			      }
+			 }
+		       if (ar < area)
+			 {
+			    area = ar;
+			    *x = a_x[i];
+			    *y = a_y[j];
+			    if (ar == 0) goto done;
+			 }
+		    }
+		  if ((a_x[i + 1] - w > 0) &&
+		      (a_y[j] < (desk->real.h - h)))
+		    {
+		       int ar = 0;
+		  
+		       for (l = desk->windows; l; l = l->next)
+			 {
+			    E_Border *bd;
+			    int x1, y1, w1, h1, x2, y2, w2, h2;
+			    
+			    bd = l->data;
+			    x1 = a_x[i + 1] - w;
+			    y1 = a_y[j];
+			    w1 = w;
+			    h1 = h;
+			    x2 = bd->current.x;
+			    y2 = bd->current.y;
+			    w2 = bd->current.w;
+			    h2 = bd->current.h;
+			    if ((bd != b) && (bd->current.visible) &&
+				INTERSECTS(x1, y1, w1, h1, x2, y2, w2, h2))
+			      {
+				 int iw, ih;
+				 int x0, x00, y0, y00;
+				 
+				 x0 = x1;
+				 if (x1 < x2) x0 = x2;
+				 x00 = (x1 + w1);
+				 if ((x2 + w2) < (x1 + w1)) x00 = (x2 + w2);
+				 
+				 y0 = y1;
+				 if (y1 < y2) y0 = y2;
+				 y00 = (y1 + h1);
+				 if ((y2 + h2) < (y1 + h1)) y00 = (y2 + h2);
+				 
+				 iw = x00 - x0;
+				 ih = y00 - y0;
+				 ar += (iw * ih);
+			      }
+			 }
+		       if (ar < area)
+			 {
+			    area = ar;
+			    *x = a_x[i + 1] - w;
+			    *y = a_y[j];
+			    if (ar == 0) goto done;
+			 }
+		    }	       
+		  if ((a_x[i + 1] - w > 0) &&
+		      (a_y[j + 1] - h > 0))
+		    {
+		       int ar = 0;
+		  
+		       for (l = desk->windows; l; l = l->next)
+			 {
+			    E_Border *bd;
+			    int x1, y1, w1, h1, x2, y2, w2, h2;
+			    
+			    bd = l->data;
+			    x1 = a_x[i + 1] - w;
+			    y1 = a_y[j + 1] - h;
+			    w1 = w;
+			    h1 = h;
+			    x2 = bd->current.x;
+			    y2 = bd->current.y;
+			    w2 = bd->current.w;
+			    h2 = bd->current.h;
+			    if ((bd != b) && (bd->current.visible) &&
+				INTERSECTS(x1, y1, w1, h1, x2, y2, w2, h2))
+			      {
+				 int iw, ih;
+				 int x0, x00, y0, y00;
+				 
+				 x0 = x1;
+				 if (x1 < x2) x0 = x2;
+				 x00 = (x1 + w1);
+				 if ((x2 + w2) < (x1 + w1)) x00 = (x2 + w2);
+				 
+				 y0 = y1;
+				 if (y1 < y2) y0 = y2;
+				 y00 = (y1 + h1);
+				 if ((y2 + h2) < (y1 + h1)) y00 = (y2 + h2);
+				 
+				 iw = x00 - x0;
+				 ih = y00 - y0;
+				 ar += (iw * ih);
+			      }
+			 }
+		       if (ar < area)
+			 {
+			    area = ar;
+			    *x = a_x[i + 1] - w;
+			    *y = a_y[j + 1] - h;
+			    if (ar == 0) goto done;
+			 }
+		    }	       
+		  if ((a_x[i] < (desk->real.w - w)) &&
+		      (a_y[j + 1] - h > 0))
+		    {
+		       int ar = 0;
+		  
+		       for (l = desk->windows; l; l = l->next)
+			 {
+			    E_Border *bd;
+			    int x1, y1, w1, h1, x2, y2, w2, h2;
+			    
+			    bd = l->data;
+			    x1 = a_x[i];
+			    y1 = a_y[j + 1] - h;
+			    w1 = w;
+			    h1 = h;
+			    x2 = bd->current.x;
+			    y2 = bd->current.y;
+			    w2 = bd->current.w;
+			    h2 = bd->current.h;
+			    if ((bd != b) && (bd->current.visible) &&
+				INTERSECTS(x1, y1, w1, h1, x2, y2, w2, h2))
+			      {
+				 int iw, ih;
+				 int x0, x00, y0, y00;
+				 
+				 x0 = x1;
+				 if (x1 < x2) x0 = x2;
+				 x00 = (x1 + w1);
+				 if ((x2 + w2) < (x1 + w1)) x00 = (x2 + w2);
+				 
+				 y0 = y1;
+				 if (y1 < y2) y0 = y2;
+				 y00 = (y1 + h1);
+				 if ((y2 + h2) < (y1 + h1)) y00 = (y2 + h2);
+				 
+				 iw = x00 - x0;
+				 ih = y00 - y0;
+				 ar += (iw * ih);
+			      }
+			 }
+		       if (ar < area)
+			 {
+			    area = ar;
+			    *x = a_x[i];
+			    *y = a_y[j + 1] - h;
+			    if (ar == 0) goto done;
+			 }
+		    }
+	       }
+	  }
+     }
+   done:
+   FREE(a_x);
+   FREE(a_y);
+   return 1;
+}
+
+static int
+e_place_middle(E_Border *b, E_Desktop *desk, int *x, int *y)
+{
+   int w, h;
+   
+   w = b->current.requested.w;
+   h = b->current.requested.h;
+   *x = (desk->real.w - w) / 2;
+   *y = (desk->real.h - h) / 2;
+   return 1;
+}
+
+static int
+e_place_cascade(E_Border *b, E_Desktop *desk, int *x, int *y)
+{
+   int w, h;
+   static int count_x = 0;
+   static int count_y = 0;
+   int pl, pr, pt, pb;
+   
+   pl = pr = pt = pb = 0;
+   if (b->bits.l) ebits_get_insets(b->bits.l, &pl, &pr, &pt, &pb);   
+   w = b->current.requested.w;
+   h = b->current.requested.h;
+   if ((count_x + w) > desk->real.w) count_x = 0;
+   if ((count_y + h) > desk->real.h) count_y = 0;
+   *x = count_x;
+   *y = count_y;
+   count_x += pl;
+   count_y += pt;
+   return 1;
+}
+
+static int
+e_place_random(E_Border *b, E_Desktop *desk, int *x, int *y)
+{
+   int w, h;
+   
+   w = b->current.requested.w;
+   h = b->current.requested.h;
+   if (w < desk->real.w) *x = (rand() % (desk->real.w - w));
+   else *x = 0;
+   if (h < desk->real.h) *y = (rand() % (desk->real.h - h));
+   else *y = 0;
+   return 1;
+}
+
+int
+e_place_border(E_Border *b, E_Desktop *desk, int *x, int *y, int method)
+{
+   if (method == E_PLACE_MANUAL)  return e_place_manual (b, desk, x, y);
+   if (method == E_PLACE_SMART)   return e_place_smart  (b, desk, x, y);
+   if (method == E_PLACE_MIDDLE)  return e_place_middle (b, desk, x, y);
+   if (method == E_PLACE_CASCADE) return e_place_cascade(b, desk, x, y);
+   if (method == E_PLACE_RANDOM)  return e_place_random (b, desk, x, y);
+   return 1;
+}
+
+void
+e_place_init(void)
+{
+   e_event_filter_handler_add(EV_MOUSE_DOWN,               e_mouse_down);
+   e_event_filter_handler_add(EV_MOUSE_UP,                 e_mouse_up);
+   e_event_filter_handler_add(EV_MOUSE_MOVE,               e_mouse_move);
+}
diff --git a/src/place.h b/src/place.h
new file mode 100644
index 000000000..e659243c8
--- /dev/null
+++ b/src/place.h
@@ -0,0 +1,18 @@
+#ifndef E_PLACE_H
+#define E_PLACE_H
+
+#include "e.h"
+#include "border.h"
+#include "desktops.h"
+
+#define E_PLACE_MANUAL  0
+#define E_PLACE_SMART   1
+#define E_PLACE_MIDDLE  2
+#define E_PLACE_CASCADE 3
+#define E_PLACE_RANDOM  4
+
+int  e_place_border(E_Border *b, E_Desktop *desk, int *x, int *y, int method);
+void e_place_init(void);
+    
+#endif
+