diff --git a/data/themes/default/selection.edc b/data/themes/default/selection.edc
index 278436ef..541fcd26 100644
--- a/data/themes/default/selection.edc
+++ b/data/themes/default/selection.edc
@@ -119,746 +119,6 @@ group { name: "terminology/selection";
             inherit: "default" 0.0;
          }
       }
-/*
-      // the outline around the selection...
-      #define TARGETS \
-      target: "top_clip"; target: "middle_clip"; target: "bottom_clip"; \
-      target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: "4.clip"
-
-      part { name: "0.clip"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "oneline" 0.0;    visible: 1; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "disjoint" 0.0;   visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "topfull" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "bottomfull" 0.0; visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-      }
-      part { name: "1.clip"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "oneline" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "disjoint" 0.0;   visible: 1; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "topfull" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "bottomfull" 0.0; visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-      }
-      part { name: "2.clip"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;    visible: 1; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "oneline" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "disjoint" 0.0;   visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "topfull" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "bottomfull" 0.0; visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-      }
-      part { name: "3.clip"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "oneline" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "disjoint" 0.0;   visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "topfull" 0.0;    visible: 1; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "bottomfull" 0.0; visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-      }
-      part { name: "4.clip"; type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "oneline" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "disjoint" 0.0;   visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "topfull" 0.0;    visible: 0; rel1.offset: -100 -100; rel2.offset: 101 101; }
-         description { state: "bottomfull" 0.0; visible: 1; rel1.offset: -100 -100; rel2.offset: 101 101; }
-      }
-
-      // oneline (also multiple lines but all fill the row):
-      // |  #########   |
-
-      part { name: "0.left";
-         mouse_events: 0;
-         clip_to: "0.clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to_x: "terminology.top_left";
-               relative: 1.0 0.0;
-               offset: -1 -1;
-            }
-            rel2 {
-               to_x: "terminology.top_left";
-               relative: 1.0 1.0;
-               offset: 2 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_left.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "0.right";
-         mouse_events: 0;
-         clip_to: "0.clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to_x: "terminology.bottom_right";
-               relative: 0.0 0.0;
-               offset: -3 -1;
-            }
-            rel2 {
-               to_x: "terminology.bottom_right";
-               relative: 0.0 1.0;
-               offset: 0 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_right.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "0.top";
-         mouse_events: 0;
-         clip_to: "0.clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to: "0.left";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "0.right";
-               relative: 0.0 0.0;
-               offset: -1 3;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "0.bottom";
-         mouse_events: 0;
-         clip_to: "0.clip";
-         description { state: "default" 0.0;
-            rel1 {
-               to: "0.left";
-               relative: 1.0 1.0;
-               offset: 0 -4;
-            }
-            rel2 {
-               to: "0.right";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      program { name: "oneline";
-         signal: "mode,oneline";
-         source: "terminology";
-         action: STATE_SET "oneline" 0.0;
-         TARGETS;
-      }
-
-      // disjoint:
-      // |       #######|
-      // |##            |
-      part { name: "1.left";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "terminology.top_left";
-               relative: 1.0 0.0;
-               offset: -1 -1;
-            }
-            rel2 {
-               to: "terminology.top_left";
-               relative: 1.0 1.0;
-               offset: 2 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_left.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.right";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to_y: "terminology.top_left";
-               relative: 1.0 0.0;
-               offset: -4 -1;
-            }
-            rel2 {
-               to_y: "terminology.top_left";
-               relative: 1.0 1.0;
-               offset: -1 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_right.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.top";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "1.left";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "1.right";
-               relative: 0.0 0.0;
-               offset: -1 3;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.bottom";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "1.left";
-               relative: 1.0 1.0;
-               offset: 0 -4;
-            }
-            rel2 {
-               to: "1.right";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.left2";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to_y: "terminology.bottom_right";
-               offset: -1 -1;
-            }
-            rel2 {
-               to_y: "terminology.bottom_right";
-               relative: 0.0 1.0;
-               offset: 2 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_left.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.right2";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "terminology.bottom_right";
-               relative: 0.0 0.0;
-               offset: -3 -1;
-            }
-            rel2 {
-               to: "terminology.bottom_right";
-               relative: 0.0 1.0;
-               offset: 0 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_right.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.top2";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "1.left2";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "1.right2";
-               relative: 0.0 0.0;
-               offset: -1 3;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "1.bottom2";
-         mouse_events: 0;
-         clip_to: "1.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "1.left2";
-               relative: 1.0 1.0;
-               offset: 0 -4;
-            }
-            rel2 {
-               to: "1.right2";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      program { name: "disjoint";
-         signal: "mode,disjoint";
-         source: "terminology";
-         action: STATE_SET "disjoint" 0.0;
-         TARGETS;
-      }
-
-      // default:
-      // |   ###########|
-      // |#########     |
-      part { name: "2.topkink";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "top_clip";
-               relative: 0.0 0.0;
-               offset: -4 -1;
-            }
-            rel2 {
-               to: "top_clip";
-               relative: 0.0 1.0;
-               offset: 2 2;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_top.png";
-            image.border: 0 0 4 7;
-         }
-      }
-      part { name: "2.bottomkink";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "bottom_clip";
-               relative: 1.0 0.0;
-               offset: -3 -3;
-            }
-            rel2 {
-               to: "bottom_clip";
-               relative: 1.0 1.0;
-               offset: 3 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_bottom.png";
-            image.border: 0 0 7 4;
-         }
-      }
-      part { name: "2.left";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "middle_clip";
-               offset: -1 -1;
-            }
-            rel2 {
-               to: "bottom_clip";
-               relative: 0.0 1.0;
-               offset: 2 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_left.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "2.right";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "top_clip";
-               relative: 1.0 0.0;
-               offset: -3 -1;
-            }
-            rel2 {
-               to: "middle_clip";
-               offset: 0 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_right.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "2.top";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "2.topkink";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "2.right";
-               relative: 0.0 0.0;
-               offset: -1 3;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "2.top2";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "2.left";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "2.topkink";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "2.bottom";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "2.left";
-               relative: 1.0 1.0;
-               offset: 0 -4;
-            }
-            rel2 {
-               to: "2.bottomkink";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "2.bottom2";
-         mouse_events: 0;
-         clip_to: "2.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "2.bottomkink";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "2.right";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      program { name: "multiline";
-         signal: "mode,multiline";
-         source: "terminology";
-         action: STATE_SET "default" 0.0;
-         TARGETS;
-      }
-
-      // topfull:
-      // |##############|
-      // |######        |
-      part { name: "3.bottomkink";
-         mouse_events: 0;
-         clip_to: "3.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "bottom_clip";
-               relative: 1.0 0.0;
-               offset: -3 -3;
-            }
-            rel2 {
-               to: "bottom_clip";
-               relative: 1.0 1.0;
-               offset: 3 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_bottom.png";
-            image.border: 0 0 7 4;
-         }
-      }
-      part { name: "3.left";
-         mouse_events: 0;
-         clip_to: "3.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "top_clip";
-               offset: -1 -1;
-            }
-            rel2 {
-               to: "bottom_clip";
-               relative: 0.0 1.0;
-               offset: 2 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_left.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "3.right";
-         mouse_events: 0;
-         clip_to: "3.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "top_clip";
-               relative: 1.0 0.0;
-               offset: -3 -1;
-            }
-            rel2 {
-               to: "middle_clip";
-               offset: 0 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_right.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "3.top";
-         mouse_events: 0;
-         clip_to: "3.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "3.left";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "3.right";
-               relative: 0.0 0.0;
-               offset: -1 3;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "3.bottom";
-         mouse_events: 0;
-         clip_to: "3.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "3.left";
-               relative: 1.0 1.0;
-               offset: 0 -4;
-            }
-            rel2 {
-               to: "3.bottomkink";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "3.bottom2";
-         mouse_events: 0;
-         clip_to: "3.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "3.bottomkink";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "3.right";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      program { name: "topfull";
-         signal: "mode,topfull";
-         source: "terminology";
-         action: STATE_SET "topfull" 0.0;
-         TARGETS;
-      }
-
-      // bottomfull:
-      // |        ######|
-      // |##############|
-      part { name: "4.topkink";
-         mouse_events: 0;
-         clip_to: "4.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "top_clip";
-               relative: 0.0 0.0;
-               offset: -4 -1;
-            }
-            rel2 {
-               to: "top_clip";
-               relative: 0.0 1.0;
-               offset: 2 2;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_top.png";
-            image.border: 0 0 4 7;
-         }
-      }
-      part { name: "4.left";
-         mouse_events: 0;
-         clip_to: "4.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "middle_clip";
-               offset: -1 -1;
-            }
-            rel2 {
-               to: "bottom_clip";
-               relative: 0.0 1.0;
-               offset: 2 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_left.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "4.right";
-         mouse_events: 0;
-         clip_to: "4.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "top_clip";
-               relative: 1.0 0.0;
-               offset: -3 -1;
-            }
-            rel2 {
-               offset: 0 0;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_right.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "4.top";
-         mouse_events: 0;
-         clip_to: "4.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "4.topkink";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "4.right";
-               relative: 0.0 0.0;
-               offset: -1 3;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "4.top2";
-         mouse_events: 0;
-         clip_to: "4.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "4.left";
-               relative: 1.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "4.topkink";
-               relative: 0.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_htop.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "4.bottom";
-         mouse_events: 0;
-         clip_to: "4.clip"; 
-         description { state: "default" 0.0;
-            rel1 {
-               to: "4.left";
-               relative: 1.0 1.0;
-               offset: 0 -4;
-            }
-            rel2 {
-               to: "4.right";
-               relative: 1.0 1.0;
-               offset: -1 -1;
-            }
-            color: 255 255 255 128;
-            color_class: "GLOW";
-            image.normal: "sl_hbottom.png";
-            fill.smooth: 0;
-         }
-      }
-      program {
-         signal: "mode,bottomfull"; source: "terminology";
-         action: STATE_SET "bottomfull" 0.0;
-         TARGETS;
-      }
-*/
 
       // the outline around the selection...
 #define TARGETS \