Merge lp:~ricotz/plank/consolidate-api into lp:plank

[Rico Tzschichholz]

[lp:~ricotz/plank/consolidate-api]

1327. By Rico Tzschichholz on 2015-06-17

po: Update translations

1328. By Rico Tzschichholz on 2015-06-27

animatedrenderer: Always initialize frame if a redraw is scheduled

1329. By Rico Tzschichholz on 2015-06-27

po: Update translations

1330. By Rico Tzschichholz on 2015-07-03

dockrenderer: Guard duration-calculations which are used for animations

1331. By Rico Tzschichholz on 2015-07-06

Update symbols

1332. By Rico Tzschichholz on 2015-07-09

color: Avoid double setting of out-vars in hsv_to_rgb

1333. By Rico Tzschichholz on 2015-07-09

color: Clarify documention of set_min/max_* methods

1334. By Rico Tzschichholz on 2015-07-09

hidemanager: Add dodge-active hide-mode

1335. By Rico Tzschichholz on 2015-07-12

prefswindow: Use Gtk.Stack if available

1337. By Rico Tzschichholz on 2015-07-12

prefswindow: Allow closing the window using "Escape"

1338. By Rico Tzschichholz on 2015-07-12

po: Update translations

1339. By Rico Tzschichholz on 2015-07-12

ui: Tweak minimum gtk+ version for conditional 3.4 support

1340. By Rico Tzschichholz on 2015-07-15

build: Make sure to enable maintainer-mode by default

1341. By Rico Tzschichholz on 2015-06-27

Add icon-zoom preferences and expose gui-settings

1342. By Rico Tzschichholz on 2015-07-02

Add optional zoom animation when hovering dock-items

1343. By Rico Tzschichholz on 2015-07-16

Add ability to cache multiple sizes of drawn items

1344. By Rico Tzschichholz on 2015-07-16

Update symbols

1345. By Rico Tzschichholz on 2015-07-16

po: Update translation template

1346. By Rico Tzschichholz on 2015-07-16

surfacecache: Add missing mutex-unlock

1347. By Rico Tzschichholz on 2015-07-20

po: Update translations

1348. By Rico Tzschichholz on 2015-07-20

lib: Make sure to bind "plank" textdomain for library users

1349. By Rico Tzschichholz on 2015-07-20

lib: Replace non-constant string-concatenation with string.printf()

1350. By Rico Tzschichholz on 2015-07-25

appdockitem: Always indicate running application despite its window-count

1351. By Rico Tzschichholz on 2015-07-25

tests: Add google-mock support

1352. By kay van der Zander on 2015-07-25

gmock: Add tests for Color

1353. By Rico Tzschichholz on 2015-07-28

hidemanager: Rework enter/leave-event handling to determine "Hovered"

This removes handling of send_event and use "Disabled" for visible menu.

1354. By Rico Tzschichholz on 2015-07-28

po: Update translations

1355. By Rico Tzschichholz on 2015-07-28

ui: Fix "Icon Zoom" label spanning

1356. By Rico Tzschichholz on 2015-07-28

dockwindow: Reinstate "handling of send_event" to fix broken internal DnD

Regression of r1353

1357. By Rico Tzschichholz on 2015-07-28

surfacecache: Fix build with gee-1.0

1358. By Rico Tzschichholz on 2015-07-29

dockcontainer: Update element's RemoveTime on add/replace accordingly

1359. By Rico Tzschichholz on 2015-07-30

lib: Commonize naming of fields which are holding handler/timer-ids

Adjust some explictly typed assignments too.

1360. By Rico Tzschichholz on 2015-07-30

dockrenderer: Use animated_draw() and don't listen to HoveredItem changes

1361. By Rico Tzschichholz on 2015-07-30

dockrenderer: Do not forcefully unhide the dock if it already is

If we do it will cause the dock to hide and unhide again on startup.

1362. By Rico Tzschichholz on 2015-07-30

Revert "dockrenderer: Use animated_draw() and don't listen to HoveredItem changes"

1363. By Rico Tzschichholz on 2015-07-30

positionmanager: Make item's background-region always cover dock's background from bottom up

1364. By Rico Tzschichholz on 2015-08-12

po: Update translations

1365. By Rico Tzschichholz on 2015-08-13

hidemanager: Don't use actual cursor coords of leave-notify-event

If we received a leave-notify-event then don't be silly and make sure
update_hovered_with_coords() will set Hovered to false by passing
(-1, -1).

1366. By Rico Tzschichholz on 2015-08-13

hidemanager: Reinstate "handling of send_event" to avoid confusion with menu

Regression of r1353

1367. By Rico Tzschichholz on 2015-08-14

dockrenderer: Output the Cairo.SurfaceType used by Gtk+

1368. By Rico Tzschichholz on 2015-08-17

positionmanager: Fix background-size calculation with enabled icon-zoom

We need to take the zoomed icon-size into account to properly adjust the
horizontal padding for the background-sizing while differentiating
between first and last item.

1369. By xapantu on 2015-08-19

hidemanager: Ignore pressure-reveal for 'absolute' input-devices

1370. By Rico Tzschichholz on 2015-08-20

dockelement: Make using -Werror=pointer-to-int-cast pass

1371. By Rico Tzschichholz on 2015-08-20

dockwindow: Make using -Werror=unused-result pass

1372. By Rico Tzschichholz on 2015-08-21

dockrenderer: Adjust shadow-size if window-scale-factor > 1 aka HiDPI

1373. By Rico Tzschichholz on 2015-08-22

po: Update translations

1374. By Rico Tzschichholz on 2015-08-23

lib: Cast some callbacks to avoid the creation of wrappers

1375. By Rico Tzschichholz on 2015-08-23

build: Require cairo >= 1.10

1376. By Rico Tzschichholz on 2015-08-23

lib: Cast some callbacks to avoid the creation of wrappers

1377. By Rico Tzschichholz on 2015-08-23

dbusmanager: Fix naming of fields which are holding handler/timer-ids

1378. By Rico Tzschichholz on 2015-08-23

dockrenderer: Avoid usage of Cairo.SurfaceType.COGL

1379. By Rico Tzschichholz on 2015-08-23

build: Clean bamf/gtk+ version check

1380. By Rico Tzschichholz on 2015-08-24

itemfactory: Make get_launcher_from_dockitem() a bit more safer/verbose

1381. By Rico Tzschichholz on 2015-09-03

dockcontainer: Add remove_all()

1382. By Rico Tzschichholz on 2015-09-03

dockrenderer: Guard against empty dock (which ideally won't happen)

1383. By Rico Tzschichholz on 2015-09-03

dockcontroller: Clean out old default-provider after replacing it

1384. By Rico Tzschichholz on 2015-09-03

dockcontainer: Optimize prepend()

1385. By Rico Tzschichholz on 2015-09-07

po: Update translations

1386. By Rico Tzschichholz on 2015-09-07

itemfactory: Avoid a string-copying

1387. By Rico Tzschichholz on 2015-09-07

positionmanager: Demote criticals of get_draw_value_for_item() to debug/warning

1388. By Rico Tzschichholz on 2015-09-07

Prepare 0.10.0 release

1389. By Rico Tzschichholz on 2015-09-07

Back to development

1390. By Mike Gabriel on 2015-09-09

animatedrenderer: Fix typo in error message

1391. By Rico Tzschichholz on 2015-09-10

build: Require valac >= 0.24.0 and obsolete conditionals

1392. By Rico Tzschichholz on 2015-09-16

po: Update translations

1393. By Rico Tzschichholz on 2015-09-28

po: Update translations

1394. By Rico Tzschichholz on 2015-10-01

filedockitem: Correctly display filenames with underscores in folder-menu

1395. By Rico Tzschichholz on 2015-10-01

positionmanager: Just return primary_monitor if empty plug_name was given

1396. By Rico Tzschichholz on 2015-10-01

positionmanager: Add verbose output for monitor_geo_changed

1397. By Rico Tzschichholz on 2015-10-06

dockitemprovider: Insert items where the data was dropped

If there is currently no HoveredItem try to determine the nearest one as
drop-point.

1398. By Rico Tzschichholz on 2015-10-07

lib: Tweak method signature of file-monitor callbacks

1399. By Rico Tzschichholz on 2015-10-07

lib: FileMonitorEvent is a simple enum not a flag

1400. By Rico Tzschichholz on 2015-10-07

lib: Avoid some superfluous reference-taking

1401. By Rico Tzschichholz on 2015-10-07

plankdockitem: Open "preferences" on left-click instead of "about"

1402. By Rico Tzschichholz on 2015-10-08

defaultappprovider: Don't ignore opened applications if Wnck doesn't know

Better don't rely on Wnck if Bamf reported an opened application. If an
application is for whatever reason replacing or renaming its window on
startup we might drop it while Wnck reports a window-count of 0.

1403. By Rico Tzschichholz on 2015-10-08

transientdockitem: Delayed reloading of the window-icon if needed

If the window-icon was null on the first try then schedule a 2nd one.

1404. By Rico Tzschichholz on 2015-10-09

lib: Actually pass e.g. -lm to the linker by adding it to *_LIBADD

1405. By Rico Tzschichholz on 2015-10-09

po: Update translations

1406. By Rico Tzschichholz on 2015-10-09

Prepare 0.10.1 release

1407. By Rico Tzschichholz on 2015-10-19

Back to development

1408. By Rico Tzschichholz on 2015-10-19

build: Be more rebust for parallel building

1409. By Rico Tzschichholz on 2015-10-19

dockrenderer: Don't request a redraw if "transient_items" is empty

1410. By Rico Tzschichholz on 2015-10-31

dockrenderer: Use non-linear transition in/out the "zoom" state

Increase transition-time to 200ms and use cubic-easing.

1411. By Rico Tzschichholz on 2015-10-31

easing: Some optimization, avoid vala's struct-copying by using pointers

1412. By Rico Tzschichholz on 2015-10-31

build: Be more rebust for parallel building

1413. By Rico Tzschichholz on 2015-11-01

easing: Use proper codestyle for ANIMATION_MODES while it is a const

1414. By Rico Tzschichholz on 2015-11-01

dockrenderer: Factor out jump-calculation into easing_bounce

1415. By Rico Tzschichholz on 2015-11-01

dockrenderer: Define and use some internal constants

1416. By Rico Tzschichholz on 2015-11-02

po: Update translations

1417. By Rico Tzschichholz on 2015-11-02

Add docklets support (internal/private)

Based on initially proposed docky 3.0 branch

1418. By Rico Tzschichholz on 2015-11-02

Add GSettings support and transition DockPreferences to it

1419. By Rico Tzschichholz on 2015-11-02

Update symbols

1420. By Rico Tzschichholz on 2015-11-02

po: Don't translate gschema for now

1421. By Rico Tzschichholz on 2015-11-03

Drop nested namespaces

1422. By Rico Tzschichholz on 2015-11-03

Rename DockSurface to Surface

1423. By Rico Tzschichholz on 2015-11-03

Rename AnimatedRenderer to Renderer

1424. By Rico Tzschichholz on 2015-11-03

build: Bump api and library version

1425. By Rico Tzschichholz on 2015-11-03

Keep existing theme and dockitem-files working and update them

=== modified file 'configure.ac'
--- configure.ac	2015-11-02 13:42:37 +0000
+++ configure.ac	2015-11-03 12:02:25 +0000
@@ -3,7 +3,7 @@
 
 m4_define([plank_major_version], [0])
 m4_define([plank_minor_version], [10])
-m4_define([plank_micro_version], [1])
+m4_define([plank_micro_version], [9])
 m4_define([plank_nano_version], [0])
 
 # If library source has changed since last release, increment revision
@@ -11,7 +11,7 @@
 #  increment current and set revision to 0
 # If interfaces have been added since last release, increment age
 # If interfaces have been removed since last release, set age to 0
-m4_define([plank_lt_current], [0])
+m4_define([plank_lt_current], [1])
 m4_define([plank_lt_revision], [0])
 m4_define([plank_lt_age], [0])
 
@@ -87,7 +87,7 @@
 PLANK_NANO_VERSION=plank_nano_version
 AC_SUBST([PLANK_NANO_VERSION])
 
-API_VERSION=0.3
+API_VERSION=0.11
 AC_SUBST([API_VERSION])
 
 

=== modified file 'data/themes/Default/dock.theme'
--- data/themes/Default/dock.theme	2015-05-13 07:34:46 +0000
+++ data/themes/Default/dock.theme	2015-11-03 12:02:25 +0000
@@ -1,7 +1,7 @@
 #This file auto-generated by Plank.
 #2015-04-10T15:17:04+0000
 
-[PlankDrawingTheme]
+[PlankTheme]
 #The roundness of the top corners.
 TopRoundness=4
 #The roundness of the bottom corners.
@@ -17,7 +17,7 @@
 #The color (RGBA) of the inner stroke.
 InnerStrokeColor=255;;255;;255;;255
 
-[PlankDrawingDockTheme]
+[PlankDockTheme]
 #The padding on the left/right dock edges, in tenths of a percent of IconSize.
 HorizPadding=0
 #The padding on the top dock edge, in tenths of a percent of IconSize.

=== modified file 'data/themes/Matte/dock.theme'
--- data/themes/Matte/dock.theme	2012-11-16 16:05:23 +0000
+++ data/themes/Matte/dock.theme	2015-11-03 12:02:25 +0000
@@ -1,7 +1,7 @@
 
-[PlankDrawingTheme]
+[PlankTheme]
 
-[PlankDrawingDockTheme]
+[PlankDockTheme]
 HorizPadding=1
 TopPadding=1
 BottomPadding=2

=== modified file 'data/themes/Transparent/dock.theme'
--- data/themes/Transparent/dock.theme	2014-03-27 12:53:16 +0000
+++ data/themes/Transparent/dock.theme	2015-11-03 12:02:25 +0000
@@ -1,9 +1,9 @@
 
-[PlankDrawingTheme]
+[PlankTheme]
 TopRoundness=0
 BottomRoundness=0
 LineWidth=0
 
-[PlankDrawingDockTheme]
+[PlankDockTheme]
 TopPadding=-12
 BottomPadding=2

=== modified file 'docklets/Clippy/ClippyDockItem.vala'
--- docklets/Clippy/ClippyDockItem.vala	2015-11-02 08:40:11 +0000
+++ docklets/Clippy/ClippyDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
+using Plank;
 
 namespace Docky
 {
@@ -126,7 +126,7 @@
 			updated ();
 		}
 		
-		protected override Animation on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (direction == Gdk.ScrollDirection.UP)
 				cur_position++;
@@ -140,17 +140,17 @@
 			
 			updated ();
 			
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (button == PopupButton.LEFT && clips.size > 0) {
 				copy_entry ();
-				return Animation.BOUNCE;
+				return AnimationType.BOUNCE;
 			}
 			
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		public override Gee.ArrayList<Gtk.MenuItem> get_menu_items ()

=== modified file 'docklets/Clippy/ClippyDocklet.vala'
--- docklets/Clippy/ClippyDocklet.vala	2015-11-02 08:40:11 +0000
+++ docklets/Clippy/ClippyDocklet.vala	2015-11-03 12:02:25 +0000
@@ -26,7 +26,7 @@
 {
 	public class ClippyDocklet : Docklet
 	{
-		public override Plank.Items.DockElement make_element (string launcher, GLib.File file)
+		public override Plank.DockElement make_element (string launcher, GLib.File file)
 		{
 			return new ClippyDockItem.with_dockitem_file (file);
 		}

=== modified file 'docklets/Clippy/ClippyPreferences.vala'
--- docklets/Clippy/ClippyPreferences.vala	2015-11-02 08:40:11 +0000
+++ docklets/Clippy/ClippyPreferences.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
-using Plank.Services;
-using Plank.Widgets;
+using Plank;
 
 namespace Docky
 {

=== modified file 'docklets/Clock/ClockDockItem.vala'
--- docklets/Clock/ClockDockItem.vala	2015-11-02 08:40:11 +0000
+++ docklets/Clock/ClockDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,8 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Items;
+using Plank;
 
 namespace Docky
 {
@@ -90,7 +89,7 @@
 			reset_icon_buffer ();
 		}
 		
-		protected override void draw_icon (DockSurface surface)
+		protected override void draw_icon (Surface surface)
 		{
 			unowned ClockPreferences prefs = (ClockPreferences) Prefs;
 			
@@ -114,7 +113,7 @@
 			cr.paint ();
 		}
 		
-		void render_digital_clock (DockSurface surface, DateTime now, int size)
+		void render_digital_clock (Surface surface, DateTime now, int size)
 		{
 			unowned ClockPreferences prefs = (ClockPreferences) Prefs;
 			unowned Cairo.Context cr = surface.Context;

=== modified file 'docklets/Clock/ClockDocklet.vala'
--- docklets/Clock/ClockDocklet.vala	2015-11-02 08:40:11 +0000
+++ docklets/Clock/ClockDocklet.vala	2015-11-03 12:02:25 +0000
@@ -28,7 +28,7 @@
 	
 	public class ClockDocklet : Docklet
 	{
-		public override Plank.Items.DockElement make_element (string launcher, GLib.File file)
+		public override Plank.DockElement make_element (string launcher, GLib.File file)
 		{
 			return new ClockDockItem.with_dockitem_file (file);
 		}

=== modified file 'docklets/Clock/ClockPreferences.vala'
--- docklets/Clock/ClockPreferences.vala	2015-11-02 08:40:11 +0000
+++ docklets/Clock/ClockPreferences.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
-using Plank.Services;
-using Plank.Widgets;
+using Plank;
 
 namespace Docky
 {

=== modified file 'docklets/Desktop/DesktopDockItem.vala'
--- docklets/Desktop/DesktopDockItem.vala	2015-11-02 08:40:11 +0000
+++ docklets/Desktop/DesktopDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
+using Plank;
 
 namespace Docky
 {
@@ -41,15 +41,15 @@
 		{
 		}
 		
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (button == PopupButton.LEFT) {
 				unowned Wnck.Screen screen = Wnck.Screen.get_default ();
 				screen.toggle_showing_desktop (!screen.get_showing_desktop ());
-				return Animation.BOUNCE;
+				return AnimationType.BOUNCE;
 			}
 			
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 	}
 }

=== modified file 'docklets/Desktop/DesktopDocklet.vala'
--- docklets/Desktop/DesktopDocklet.vala	2015-11-02 08:40:11 +0000
+++ docklets/Desktop/DesktopDocklet.vala	2015-11-03 12:02:25 +0000
@@ -28,7 +28,7 @@
 	
 	public class DesktopDocklet : Docklet
 	{
-		public override Plank.Items.DockElement make_element (string launcher, GLib.File file)
+		public override Plank.DockElement make_element (string launcher, GLib.File file)
 		{
 			return new DesktopDockItem.with_dockitem_file (file);
 		}

=== modified file 'docklets/Trash/TrashDockItem.vala'
--- docklets/Trash/TrashDockItem.vala	2015-11-02 08:40:11 +0000
+++ docklets/Trash/TrashDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,10 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Items;
-using Plank.Services;
-using Plank.Widgets;
+using Plank;
 
 namespace Docky
 {
@@ -110,14 +107,14 @@
 			return 0U;
 		}
 		
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (button == PopupButton.LEFT) {
 				open_trash ();
-				return Animation.BOUNCE;
+				return AnimationType.BOUNCE;
 			}
 			
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		protected override bool can_accept_drop (Gee.ArrayList<string> uris)

=== modified file 'docklets/Trash/TrashDocklet.vala'
--- docklets/Trash/TrashDocklet.vala	2015-11-02 08:40:11 +0000
+++ docklets/Trash/TrashDocklet.vala	2015-11-03 12:02:25 +0000
@@ -26,7 +26,7 @@
 {
 	public class TrashDocklet : Docklet
 	{
-		public override Plank.Items.DockElement make_element (string launcher, GLib.File file)
+		public override Plank.DockElement make_element (string launcher, GLib.File file)
 		{
 			return new TrashDockItem.with_dockitem_file (file);
 		}

=== modified file 'docs/Makefile.am'
--- docs/Makefile.am	2015-11-02 13:42:37 +0000
+++ docs/Makefile.am	2015-11-03 12:02:25 +0000
@@ -27,12 +27,12 @@
 	$(top_builddir)/lib/Version.vala \
 	$(top_srcdir)/lib/DBus/Client.vala \
 	$(top_srcdir)/lib/DBus/Interfaces.vala \
-	$(top_srcdir)/lib/Drawing/AnimatedRenderer.vala \
 	$(top_srcdir)/lib/Drawing/Color.vala \
 	$(top_srcdir)/lib/Drawing/DrawingService.vala \
-	$(top_srcdir)/lib/Drawing/DockSurface.vala \
 	$(top_srcdir)/lib/Drawing/DockTheme.vala \
 	$(top_srcdir)/lib/Drawing/Easing.vala \
+	$(top_srcdir)/lib/Drawing/Renderer.vala \
+	$(top_srcdir)/lib/Drawing/Surface.vala \
 	$(top_srcdir)/lib/Drawing/SurfaceCache.vala \
 	$(top_srcdir)/lib/Drawing/Theme.vala \
 	$(top_srcdir)/lib/Factories/AbstractMain.vala \

=== modified file 'examples/RemoteClient.vala'
--- examples/RemoteClient.vala	2015-04-27 13:39:02 +0000
+++ examples/RemoteClient.vala	2015-11-03 12:02:25 +0000
@@ -17,10 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.DBus;
-using Plank.Services;
+using Plank;
 
-namespace Plank.Examples
+namespace PlankExamples
 {
 	public class RemoteClient : GLib.Application
 	{
@@ -37,11 +36,11 @@
 		{
 			hold ();
 			
-			var client = Client.get_instance ();
+			var client = Plank.DBusClient.get_instance ();
 			client.proxy_changed.connect (handle_proxy_changed);
 		}
 		
-		void handle_proxy_changed (Client client)
+		void handle_proxy_changed (DBusClient client)
 		{
 			if (!client.is_connected)
 				return;

=== modified file 'lib/DBus/Client.vala'
--- lib/DBus/Client.vala	2015-08-23 16:02:36 +0000
+++ lib/DBus/Client.vala	2015-11-03 12:02:25 +0000
@@ -17,23 +17,23 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.DBus
+namespace Plank
 {
 	/**
 	 * Connects to a running instance of plank via DBus and
 	 * provides remote interface to a currently runnning dock.
 	 */
-	public class Client : GLib.Object
+	public class DBusClient : GLib.Object
 	{
-		static Client? instance;
+		static DBusClient? instance;
 		
 		/**
-		 * Get the singleton instance of {@link Plank.DBus.Client}
+		 * Get the singleton instance of {@link Plank.DBusClient}
 		 */
-		public static unowned Client get_instance ()
+		public static unowned DBusClient get_instance ()
 		{
 			if (instance == null)
-				instance = new Client ();
+				instance = new DBusClient ();
 			
 			return instance;
 		}
@@ -64,12 +64,12 @@
 		uint dbus_dock_ping_id = 0;
 		uint dbus_name_owner_changed_signal_id = 0;
 		
-		ItemsIface? items_proxy = null;
+		DBusItemsIface? items_proxy = null;
 		int items_count = int.MIN;
 		string[]? persistent_apps_list = null;
 		string[]? transient_apps_list = null;
 		
-		Client ()
+		DBusClient ()
 		{
 			Object ();
 		}
@@ -100,8 +100,8 @@
 			
 			try {
 				// Listen for "Ping" signals coming from docks
-				dbus_dock_ping_id = connection.signal_subscribe (null, Plank.DBus.DOCK_INTERFACE_NAME,
-					Plank.DBus.PING_NAME, null, null, DBusSignalFlags.NONE, (DBusSignalCallback) handle_dock_ping);
+				dbus_dock_ping_id = connection.signal_subscribe (null, Plank.DBUS_DOCK_INTERFACE_NAME,
+					Plank.DBUS_PING_NAME, null, null, DBusSignalFlags.NONE, (DBusSignalCallback) handle_dock_ping);
 			} catch (IOError e) {
 				warning ("Could not subscribe for dock signal (%s)", e.message);
 			}
@@ -113,13 +113,13 @@
 			
 			try {
 				// Broadcast to inform running docks
-				connection.emit_signal (null, client_object_path, Plank.DBus.CLIENT_INTERFACE_NAME, Plank.DBus.PING_NAME, null);
+				connection.emit_signal (null, client_object_path, Plank.DBUS_CLIENT_INTERFACE_NAME, Plank.DBUS_PING_NAME, null);
 			} catch (Error e) {
 				warning ("Could not ping running docks (%s)", e.message);
 			}
 		}
 		
-		~Client ()
+		~DBusClient ()
 		{
 			if (connection != null) {
 				if (dbus_dock_ping_id > 0)
@@ -163,7 +163,7 @@
 			debug ("Connecting and create proxies for '%s' (%s)", sender_name, object_path);
 			
 			try {
-				items_proxy = connection.get_proxy_sync<Plank.DBus.ItemsIface> (sender_name, object_path, DBusProxyFlags.NONE);
+				items_proxy = connection.get_proxy_sync<Plank.DBusItemsIface> (sender_name, object_path, DBusProxyFlags.NONE);
 				items_proxy.changed.connect (invalidate_items_cache);
 				dock_bus_owner = ((DBusProxy) items_proxy).get_name_owner ();
 				dock_bus_name = sender_name;

=== modified file 'lib/DBus/Interfaces.vala'
--- lib/DBus/Interfaces.vala	2015-04-27 13:39:02 +0000
+++ lib/DBus/Interfaces.vala	2015-11-03 12:02:25 +0000
@@ -17,18 +17,18 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.DBus
+namespace Plank
 {
-	const string PING_NAME = "Ping";
+	const string DBUS_PING_NAME = "Ping";
 	
-	const string DOCK_INTERFACE_NAME = "net.launchpad.plank";
-	const string CLIENT_INTERFACE_NAME = "net.launchpad.plank.Client";
+	const string DBUS_DOCK_INTERFACE_NAME = "net.launchpad.plank";
+	const string DBUS_CLIENT_INTERFACE_NAME = "net.launchpad.plank.Client";
 
 	/**
 	 * Provide an interface to manage items of the dock
 	 */
 	[DBus (name = "net.launchpad.plank.Items")]
-	interface ItemsIface : GLib.Object
+	interface DBusItemsIface : GLib.Object
 	{
 		/**
 		 * Emmited when items are changed

=== modified file 'lib/DBusManager.vala'
--- lib/DBusManager.vala	2015-08-23 16:08:17 +0000
+++ lib/DBusManager.vala	2015-11-03 12:02:25 +0000
@@ -17,16 +17,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
-using Plank.Items;
-using Plank.Services;
-
 namespace Plank
 {
 	/**
 	 * Provide an interface to manage items of the dock
 	 */
-	class DBusItems : GLib.Object, Plank.DBus.ItemsIface
+	class DBusItems : GLib.Object, Plank.DBusItemsIface
 	{
 		DockController controller;
 		uint changed_timer_id = 0U;
@@ -184,15 +180,15 @@
 			
 			// Listen for "Ping" signals coming from clients
 			try {
-				dbus_client_ping_signal_id = connection.signal_subscribe (null, Plank.DBus.CLIENT_INTERFACE_NAME,
-					Plank.DBus.PING_NAME, null, null, DBusSignalFlags.NONE, (DBusSignalCallback) handle_client_ping);
+				dbus_client_ping_signal_id = connection.signal_subscribe (null, Plank.DBUS_CLIENT_INTERFACE_NAME,
+					Plank.DBUS_PING_NAME, null, null, DBusSignalFlags.NONE, (DBusSignalCallback) handle_client_ping);
 			} catch (IOError e) {
 				warning ("Could not subscribe for client signal (%s)", e.message);
 			}
 			
 			try {
 				var dbus_items = new DBusItems (controller);
-				dbus_items_signal_id = connection.register_object<Plank.DBus.ItemsIface> (object_path, dbus_items);
+				dbus_items_signal_id = connection.register_object<Plank.DBusItemsIface> (object_path, dbus_items);
 			} catch (IOError e) {
 				warning ("Could not register service (%s)", e.message);
 			}
@@ -201,7 +197,7 @@
 			
 			try {
 				// Broadcast to inform running clients
-				connection.emit_signal (null, dock_object_path, Plank.DBus.DOCK_INTERFACE_NAME, Plank.DBus.PING_NAME, null);
+				connection.emit_signal (null, dock_object_path, Plank.DBUS_DOCK_INTERFACE_NAME, Plank.DBUS_PING_NAME, null);
 			} catch (Error e) {
 				warning ("Could not ping running clients (%s)", e.message);
 			}
@@ -223,7 +219,7 @@
 		{
 			try {
 				// Broadcast to inform running clients
-				connection.emit_signal (null, dock_object_path, Plank.DBus.DOCK_INTERFACE_NAME, Plank.DBus.PING_NAME, null);
+				connection.emit_signal (null, dock_object_path, Plank.DBUS_DOCK_INTERFACE_NAME, Plank.DBUS_PING_NAME, null);
 			} catch (Error e) {
 				warning ("Could not ping running clients (%s)", e.message);
 			}

=== modified file 'lib/DockController.vala'
--- lib/DockController.vala	2015-11-02 13:42:37 +0000
+++ lib/DockController.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
-using Plank.Items;
-using Plank.Widgets;
-using Plank.Services;
-
 namespace Plank
 {
 	public const string G_RESOURCE_PATH = "/net/launchpad/plank";
@@ -122,7 +117,7 @@
 		/**
 		 * Initialize this controller.
 		 * Call this when added at least one DockItemProvider otherwise the
-		 * {@link Plank.Items.DefaultApplicationDockItemProvider} will be added by default.
+		 * {@link Plank.DefaultApplicationDockItemProvider} will be added by default.
 		 */
 		public void initialize ()
 		{
@@ -148,7 +143,7 @@
 		
 		/**
 		 * Add the default provider which is an instance of
-		 * {@link Plank.Items.DefaultApplicationDockItemProvider} 
+		 * {@link Plank.DefaultApplicationDockItemProvider}
 		 */
 		public void add_default_provider ()
 		{

=== modified file 'lib/DockPreferences.vala'
--- lib/DockPreferences.vala	2015-11-02 13:42:37 +0000
+++ lib/DockPreferences.vala	2015-11-03 12:02:25 +0000
@@ -17,14 +17,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
 namespace Plank
 {
 	/**
 	 * Contains all preferences for docks.
 	 */
-	public class DockPreferences : Plank.Services.Settings
+	public class DockPreferences : Plank.Settings
 	{
 		static GLib.Settings create_settings (string schema_id, string? path = null)
 		{
@@ -158,7 +156,7 @@
 			
 			case "Theme":
 				if (Theme == "")
-					Theme = Plank.Drawing.Theme.DEFAULT_NAME;
+					Theme = Plank.Theme.DEFAULT_NAME;
 				else if (Theme.contains ("/"))
 					Theme = Theme.replace ("/", "");
 				break;

=== modified file 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2015-11-01 20:41:45 +0000
+++ lib/DockRenderer.vala	2015-11-03 12:02:25 +0000
@@ -17,17 +17,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
-using Plank.Drawing;
-using Plank.Services;
-using Plank.Widgets;
-
 namespace Plank
 {
 	/**
 	 * Handles all of the drawing for a dock.
 	 */
-	public class DockRenderer : AnimatedRenderer
+	public class DockRenderer : Renderer
 	{
 		public DockController controller { private get; construct; }
 		
@@ -57,16 +52,16 @@
 		[CCode (notify = false)]
 		public Gdk.Point local_cursor { get; private set; }
 
-		DockSurface? main_buffer = null;
-		DockSurface? fade_buffer = null;
-		DockSurface? item_buffer = null;
-		DockSurface? shadow_buffer = null;
+		Surface? main_buffer = null;
+		Surface? fade_buffer = null;
+		Surface? item_buffer = null;
+		Surface? shadow_buffer = null;
 		
-		DockSurface? background_buffer = null;
+		Surface? background_buffer = null;
 		Gdk.Rectangle background_rect;
-		DockSurface? indicator_buffer = null;
-		DockSurface? urgent_indicator_buffer = null;
-		DockSurface? urgent_glow_buffer = null;
+		Surface? indicator_buffer = null;
+		Surface? urgent_indicator_buffer = null;
+		Surface? urgent_glow_buffer = null;
 		
 		int64 last_hide = 0LL;
 		int64 last_hovered_changed = 0LL;
@@ -184,7 +179,7 @@
 				theme.notify.disconnect (theme_changed);
 			
 			unowned string name = controller.prefs.Theme;
-			if (name == Drawing.Theme.GTK_THEME_NAME) {
+			if (name == Theme.GTK_THEME_NAME) {
 				if (gtk_theme_name_changed_handler_id == 0UL)
 					gtk_theme_name_changed_handler_id = Gtk.Settings.get_default ().notify["gtk-theme-name"].connect (load_theme);
 			} else if (gtk_theme_name_changed_handler_id > 0UL) {
@@ -259,9 +254,9 @@
 				var hide_time = int64.max (0LL, frame_time - last_hide);
 				if (hide_time < hide_duration) {
 					if (controller.hide_manager.Hidden)
-						hide_progress = Drawing.easing_for_mode (AnimationMode.EASE_IN_CUBIC, hide_time, hide_duration);
+						hide_progress = easing_for_mode (AnimationMode.EASE_IN_CUBIC, hide_time, hide_duration);
 					else
-						hide_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_CUBIC, hide_time, hide_duration);
+						hide_progress = 1.0 - easing_for_mode (AnimationMode.EASE_OUT_CUBIC, hide_time, hide_duration);
 				} else {
 					hide_progress = (controller.hide_manager.Hidden ? 1.0 : 0.0);
 				}
@@ -271,9 +266,9 @@
 				double zoom_progress;
 				if (zoom_time < zoom_duration) {
 					if (controller.hide_manager.Hovered)
-						zoom_progress = Drawing.easing_for_mode (AnimationMode.EASE_OUT_CUBIC, zoom_time, zoom_duration);
+						zoom_progress = easing_for_mode (AnimationMode.EASE_OUT_CUBIC, zoom_time, zoom_duration);
 					else
-						zoom_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_IN_CUBIC, zoom_time, zoom_duration);
+						zoom_progress = 1.0 - easing_for_mode (AnimationMode.EASE_IN_CUBIC, zoom_time, zoom_duration);
 				} else {
 					zoom_progress = (controller.hide_manager.Hovered ? 1.0 : 0.0);
 				}
@@ -363,21 +358,21 @@
 			var win_rect = position_manager.get_dock_window_region ();
 			
 			if (main_buffer == null) {
-				main_buffer = new DockSurface.with_surface (win_rect.width, win_rect.height, cr.get_target ());
+				main_buffer = new Surface.with_cairo_surface (win_rect.width, win_rect.height, cr.get_target ());
 #if HAVE_HIDPI
 				cairo_surface_set_device_scale (main_buffer.Internal, window_scale_factor, window_scale_factor);
 #endif
 			}
 			
 			if (item_buffer == null) {
-				item_buffer = new DockSurface.with_surface (win_rect.width, win_rect.height, cr.get_target ());
+				item_buffer = new Surface.with_cairo_surface (win_rect.width, win_rect.height, cr.get_target ());
 #if HAVE_HIDPI
 				cairo_surface_set_device_scale (item_buffer.Internal, window_scale_factor, window_scale_factor);
 #endif
 			}
 			
 			if (shadow_buffer == null) {
-				shadow_buffer = new DockSurface.with_surface (win_rect.width, win_rect.height, cr.get_target ());
+				shadow_buffer = new Surface.with_cairo_surface (win_rect.width, win_rect.height, cr.get_target ());
 #if HAVE_HIDPI
 				cairo_surface_set_device_scale (shadow_buffer.Internal, window_scale_factor, window_scale_factor);
 #endif
@@ -400,7 +395,7 @@
 			}
 
 			if (opacity < 1.0 && fade_buffer == null) {
-				fade_buffer = new DockSurface.with_surface (win_rect.width, win_rect.height, cr.get_target ());
+				fade_buffer = new Surface.with_cairo_surface (win_rect.width, win_rect.height, cr.get_target ());
 #if HAVE_HIDPI
 				cairo_surface_set_device_scale (fade_buffer.Internal, window_scale_factor, window_scale_factor);
 #endif
@@ -551,7 +546,7 @@
 			var x_offset = 0.0, y_offset = 0.0;
 			
 			// check for and calculate click-animation
-			var max_click_time = item.ClickedAnimation == Animation.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime;
+			var max_click_time = item.ClickedAnimation == AnimationType.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime;
 			max_click_time *= 1000;
 			var click_time = int64.max (0LL, frame_time - item.LastClicked);
 			if (click_time < max_click_time) {
@@ -559,16 +554,16 @@
 				
 				switch (item.ClickedAnimation) {
 				default:
-				case Animation.NONE:
+				case AnimationType.NONE:
 					break;
-				case Animation.BOUNCE:
+				case AnimationType.BOUNCE:
 					if (screen_is_composited)
 						y_offset += position_manager.LaunchBounceHeight * easing_bounce (click_time, max_click_time, 2);
 					break;
-				case Animation.DARKEN:
+				case AnimationType.DARKEN:
 					draw_value.darken = double.max (0, Math.sin (Math.PI * click_animation_progress)) * 0.5;
 					break;
-				case Animation.LIGHTEN:
+				case AnimationType.LIGHTEN:
 					draw_value.lighten = double.max (0, Math.sin (Math.PI * click_animation_progress)) * 0.5;
 					break;
 				}
@@ -582,12 +577,12 @@
 				
 				switch (item.ScrolledAnimation) {
 				default:
-				case Animation.NONE:
+				case AnimationType.NONE:
 					break;
-				case Animation.DARKEN:
+				case AnimationType.DARKEN:
 					draw_value.darken = double.max (0, Math.sin (Math.PI * scroll_animation_progress)) * 0.5;
 					break;
-				case Animation.LIGHTEN:
+				case AnimationType.LIGHTEN:
 					draw_value.lighten = double.max (0, Math.sin (Math.PI * scroll_animation_progress)) * 0.5;
 					break;
 				}
@@ -599,16 +594,16 @@
 			if (hover_time < max_hover_time) {
 				var hover_animation_progress = 0.0;
 				if (hovered_item == item) {
-					hover_animation_progress = Drawing.easing_for_mode (AnimationMode.LINEAR, hover_time, max_hover_time);
+					hover_animation_progress = easing_for_mode (AnimationMode.LINEAR, hover_time, max_hover_time);
 				} else {
-					hover_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.LINEAR, hover_time, max_hover_time);
+					hover_animation_progress = 1.0 - easing_for_mode (AnimationMode.LINEAR, hover_time, max_hover_time);
 				}
 				
 				switch (item.HoveredAnimation) {
 				default:
-				case Animation.NONE:
+				case AnimationType.NONE:
 					break;
-				case Animation.LIGHTEN:
+				case AnimationType.LIGHTEN:
 					draw_value.lighten = hover_animation_progress * 0.2;
 					break;
 				}
@@ -638,13 +633,13 @@
 				var move_duration = theme.ItemMoveTime * 1000;
 				var move_time = int64.max (0LL, frame_time - item.AddTime);
 				if (move_time < move_duration) {
-					var move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.LINEAR, move_time, move_duration);
-					draw_value.opacity = Drawing.easing_for_mode (AnimationMode.EASE_IN_EXPO, move_time, move_duration);
+					var move_animation_progress = 1.0 - easing_for_mode (AnimationMode.LINEAR, move_time, move_duration);
+					draw_value.opacity = easing_for_mode (AnimationMode.EASE_IN_EXPO, move_time, move_duration);
 					y_offset -= move_animation_progress * (icon_size + position_manager.BottomPadding);
 					draw_value.show_indicator = false;
 					
 					// calculate the resulting incremental dynamic-animation-offset used to animate the background-resize and icon-offset
-					move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_QUINT, move_time, move_duration);
+					move_animation_progress = 1.0 - easing_for_mode (AnimationMode.EASE_OUT_QUINT, move_time, move_duration);
 					dynamic_animation_offset -= move_animation_progress * (icon_size + position_manager.ItemPadding);
 					x_offset += dynamic_animation_offset;
 				}
@@ -652,13 +647,13 @@
 				var move_duration = theme.ItemMoveTime * 1000;
 				var move_time = int64.max (0LL, frame_time - item.RemoveTime);
 				if (move_time < move_duration) {
-					var move_animation_progress = Drawing.easing_for_mode (AnimationMode.LINEAR, move_time, move_duration);
-					draw_value.opacity = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_EXPO, move_time, move_duration);
+					var move_animation_progress = easing_for_mode (AnimationMode.LINEAR, move_time, move_duration);
+					draw_value.opacity = 1.0 - easing_for_mode (AnimationMode.EASE_OUT_EXPO, move_time, move_duration);
 					y_offset -= move_animation_progress * (icon_size + position_manager.BottomPadding);
 					draw_value.show_indicator = false;
 					
 					// calculate the resulting incremental dynamic-animation-offset used to animate the background-resize and icon-offset
-					move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_IN_QUINT, move_time, move_duration);
+					move_animation_progress = 1.0 - easing_for_mode (AnimationMode.EASE_IN_QUINT, move_time, move_duration);
 					dynamic_animation_offset += move_animation_progress * (icon_size + position_manager.ItemPadding);
 					x_offset += dynamic_animation_offset - (icon_size + position_manager.ItemPadding);
 				}
@@ -672,11 +667,11 @@
 					var move_animation_progress = 0.0;
 					if (transient_items.size > 0) {
 						if (dynamic_animation_offset > 0)
-							move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_IN_QUINT, move_time, move_duration);
+							move_animation_progress = 1.0 - easing_for_mode (AnimationMode.EASE_IN_QUINT, move_time, move_duration);
 						else
-							move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_QUINT, move_time, move_duration);
+							move_animation_progress = 1.0 - easing_for_mode (AnimationMode.EASE_OUT_QUINT, move_time, move_duration);
 					} else {
-						move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_CIRC, move_time, move_duration);
+						move_animation_progress = 1.0 - easing_for_mode (AnimationMode.EASE_OUT_CIRC, move_time, move_duration);
 					}
 					var change = move_animation_progress * (icon_size + position_manager.ItemPadding);
 					x_offset += (item.Position < item.LastPosition ? change : -change);
@@ -770,7 +765,7 @@
 			var icon_surface = item.get_surface_copy (icon_size * window_scale_factor, icon_size * window_scale_factor, item_buffer);
 			unowned Cairo.Context icon_cr = icon_surface.Context;
 			
-			DockSurface? icon_overlay_surface = null;
+			Surface? icon_overlay_surface = null;
 			if (item.CountVisible || item.ProgressVisible)
 				icon_overlay_surface = item.get_foreground_surface (icon_size * window_scale_factor, icon_size * window_scale_factor, item_buffer, (DrawDataFunc<DockItem>) draw_item_foreground);
 			
@@ -836,7 +831,7 @@
 			var icon_size = (int) (draw_value.icon_size + 2 * shadow_size) * window_scale_factor;
 			
 			// load and draw the icon shadow
-			DockSurface? icon_shadow_surface = null;
+			Surface? icon_shadow_surface = null;
 			if (shadow_size > 0)
 				icon_shadow_surface = item.get_background_surface (icon_size, icon_size, item_buffer, (DrawDataFunc<DockItem>) draw_item_background);
 			
@@ -858,10 +853,10 @@
 		}
 		
 		[CCode (instance_pos = -1)]
-		DockSurface draw_item_foreground (int width, int height, DockSurface model, DockItem item)
+		Surface draw_item_foreground (int width, int height, Surface model, DockItem item)
 		{
 			Logger.verbose ("DockItem.draw_item_overlay (width = %i, height = %i)", width, height);
-			var surface = new DockSurface.with_dock_surface (width, height, model);
+			var surface = new Surface.with_surface (width, height, model);
 			
 			var icon_size = int.min (width, height) * window_scale_factor;
 			var urgent_color = get_styled_color ();
@@ -879,7 +874,7 @@
 		}
 		
 		[CCode (instance_pos = -1)]
-		DockSurface draw_item_background (int width, int height, DockSurface model, DockItem item)
+		Surface draw_item_background (int width, int height, Surface model, DockItem item)
 		{
 			unowned PositionManager position_manager = controller.position_manager;
 			var shadow_size = position_manager.IconShadowSize * window_scale_factor;
@@ -889,7 +884,7 @@
 			var icon_surface = item.get_surface (icon_size, icon_size, model);
 			
 			Logger.verbose ("DockItem.draw_icon_with_shadow (width = %i, height = %i, shadow_size = %i)", width, height, shadow_size);
-			var surface = new DockSurface.with_dock_surface (width, height, model);
+			var surface = new Surface.with_surface (width, height, model);
 			unowned Cairo.Context cr = surface.Context;
 			var shadow_surface = icon_surface.create_mask (0.4, null);
 			
@@ -933,7 +928,7 @@
 				urgent_indicator_buffer = theme.create_indicator (position_manager.IndicatorSize, urgent_indicator_color, item_buffer);
 			}
 			
-			unowned DockSurface indicator_surface = (item_state & ItemState.URGENT) != 0 ? urgent_indicator_buffer : indicator_buffer;
+			unowned Surface indicator_surface = (item_state & ItemState.URGENT) != 0 ? urgent_indicator_buffer : indicator_buffer;
 			
 			var x = 0.0, y = 0.0;
 			switch (position_manager.Position) {
@@ -999,10 +994,10 @@
 			cr.paint_with_alpha (opacity);
 		}
 		
-		Drawing.Color get_styled_color ()
+		Color get_styled_color ()
 		{
 			var background_selected_color = controller.window.get_style_context ().get_background_color (Gtk.StateFlags.SELECTED | Gtk.StateFlags.FOCUSED);
-			var selected_color = (Drawing.Color) background_selected_color;
+			var selected_color = (Color) background_selected_color;
 			selected_color.set_min_val (90 / (double) uint16.MAX);
 			return selected_color;
 		}
@@ -1108,13 +1103,13 @@
 
 		inline bool item_animation_needed (DockItem item, int64 render_time)
 		{
-			if (item.ClickedAnimation != Animation.NONE
-				&& render_time - item.LastClicked <= (item.ClickedAnimation == Animation.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime) * 1000)
+			if (item.ClickedAnimation != AnimationType.NONE
+				&& render_time - item.LastClicked <= (item.ClickedAnimation == AnimationType.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime) * 1000)
 				return true;
-			if (item.HoveredAnimation != Animation.NONE
+			if (item.HoveredAnimation != AnimationType.NONE
 				&& render_time - item.LastHovered <= ITEM_HOVER_DURATION * 1000)
 				return true;
-			if (item.ScrolledAnimation != Animation.NONE
+			if (item.ScrolledAnimation != AnimationType.NONE
 				&& render_time - item.LastScrolled <= ITEM_SCROLL_DURATION * 1000)
 				return true;
 			if (render_time - item.LastActive <= theme.ActiveTime * 1000)

=== modified file 'lib/Docklets/Docklet.vala'
--- lib/Docklets/Docklet.vala	2015-11-02 08:40:11 +0000
+++ lib/Docklets/Docklet.vala	2015-11-03 12:02:25 +0000
@@ -31,6 +31,6 @@
 			return (launcher == "docklet://%s".printf (name));
 		}
 		
-		public abstract Plank.Items.DockElement make_element (string launcher, GLib.File file);
+		public abstract Plank.DockElement make_element (string launcher, GLib.File file);
 	}
 }

=== modified file 'lib/Docklets/DockletItem.vala'
--- lib/Docklets/DockletItem.vala	2015-11-02 08:40:11 +0000
+++ lib/Docklets/DockletItem.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
+using Plank;
 
 namespace Docky
 {

=== modified file 'lib/Docklets/DockletManager.vala'
--- lib/Docklets/DockletManager.vala	2015-11-02 08:40:11 +0000
+++ lib/Docklets/DockletManager.vala	2015-11-03 12:02:25 +0000
@@ -40,7 +40,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-using Plank.Services;
+using Plank;
 
 namespace Docky
 {

=== modified file 'lib/DragManager.vala'
--- lib/DragManager.vala	2015-07-30 09:23:44 +0000
+++ lib/DragManager.vala	2015-11-03 12:02:25 +0000
@@ -17,10 +17,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Items;
-using Plank.Widgets;
-
 namespace Plank
 {
 	/**
@@ -184,7 +180,7 @@
 #if HAVE_HIDPI
 			drag_icon_size *= window_scale_factor;
 #endif
-			var drag_surface = new DockSurface (drag_icon_size, drag_icon_size);
+			var drag_surface = new Surface (drag_icon_size, drag_icon_size);
 #if HAVE_HIDPI
 			cairo_surface_set_device_scale (drag_surface.Internal, window_scale_factor, window_scale_factor);
 #endif

=== modified file 'lib/Drawing/Color.vala'
--- lib/Drawing/Color.vala	2015-07-09 05:43:43 +0000
+++ lib/Drawing/Color.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * Represents a RGBA color and has methods for manipulating the color.

=== modified file 'lib/Drawing/DockTheme.vala'
--- lib/Drawing/DockTheme.vala	2015-06-11 05:36:16 +0000
+++ lib/Drawing/DockTheme.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * A themed renderer for dock windows.
@@ -145,13 +143,13 @@
 		 * @param height the height of the background
 		 * @param position the position of the dock
 		 * @param model existing surface to use as basis of new surface
-		 * @return a new dock surface with the background drawn on it
+		 * @return a new surface with the background drawn on it
 		 */
-		public DockSurface create_background (int width, int height, Gtk.PositionType position, DockSurface model)
+		public Surface create_background (int width, int height, Gtk.PositionType position, Surface model)
 		{
 			Logger.verbose ("DockTheme.create_background (width = %i, height = %i)", width, height);
 			
-			var surface = new DockSurface.with_dock_surface (width, height, model);
+			var surface = new Surface.with_surface (width, height, model);
 			surface.clear ();
 			
 			if (width <= 0 || height <= 0)
@@ -162,11 +160,11 @@
 				return surface;
 			}
 			
-			DockSurface temp;
+			Surface temp;
 			if (position == Gtk.PositionType.TOP)
-				temp = new DockSurface.with_dock_surface (width, height, surface);
+				temp = new Surface.with_surface (width, height, surface);
 			else
-				temp = new DockSurface.with_dock_surface (height, width, surface);
+				temp = new Surface.with_surface (height, width, surface);
 			
 			draw_background (temp);
 			
@@ -209,13 +207,13 @@
 		 * @param size the size of the indicator
 		 * @param color the color of the indicator
 		 * @param model existing surface to use as basis of new surface
-		 * @return a new dock surface with the indicator drawn on it
+		 * @return a new surface with the indicator drawn on it
 		 */
-		public DockSurface create_indicator (int size, Color color, DockSurface model)
+		public Surface create_indicator (int size, Color color, Surface model)
 		{
 			Logger.verbose ("DockTheme.create_indicator (size = %i)", size);
 			
-			var surface = new DockSurface.with_dock_surface (size, size, model);
+			var surface = new Surface.with_surface (size, size, model);
 			surface.clear ();
 			
 			if (size <= 0)
@@ -250,13 +248,13 @@
 		 * @param size the size of the urgent glow
 		 * @param color the color of the urgent glow
 		 * @param model existing surface to use as basis of new surface
-		 * @return a new dock surface with the urgent glow drawn on it
+		 * @return a new surface with the urgent glow drawn on it
 		 */
-		public DockSurface create_urgent_glow (int size, Color color, DockSurface model)
+		public Surface create_urgent_glow (int size, Color color, Surface model)
 		{
 			Logger.verbose ("DockTheme.create_urgent_glow (size = %i)", size);
 			
-			var surface = new DockSurface.with_dock_surface (size, size, model);
+			var surface = new Surface.with_surface (size, size, model);
 			surface.clear ();
 			
 			if (size <= 0)
@@ -292,7 +290,7 @@
 		 * @param opacity the opacity of the glow
 		 * @param pos the dock's position
 		 */
-		public void draw_active_glow (DockSurface surface, Gdk.Rectangle clip_rect, Gdk.Rectangle rect, Color color, double opacity, Gtk.PositionType pos)
+		public void draw_active_glow (Surface surface, Gdk.Rectangle clip_rect, Gdk.Rectangle rect, Color color, double opacity, Gtk.PositionType pos)
 		{
 			if (opacity <= 0.0 || rect.width <= 0 || rect.height <= 0)
 				return;
@@ -365,7 +363,7 @@
 		 * @param color the color of the badge
 		 * @param count the number for the badge to show
 		 */
-		public void draw_item_count (DockSurface surface, int icon_size, Color color, int64 count)
+		public void draw_item_count (Surface surface, int icon_size, Color color, int64 count)
 		{
 			unowned Cairo.Context cr = surface.Context;
 			
@@ -478,7 +476,7 @@
 		 * @param color the color of the progress
 		 * @param progress the value between 0.0 and 1.0
 		 */
-		public void draw_item_progress (DockSurface surface, int icon_size, Color color, double progress)
+		public void draw_item_progress (Surface surface, int icon_size, Color color, double progress)
 		{
 			if (progress < 0)
 				return;

=== modified file 'lib/Drawing/DrawingService.vala'
--- lib/Drawing/DrawingService.vala	2015-06-10 11:51:45 +0000
+++ lib/Drawing/DrawingService.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * Utility service for loading icons and working with pixbufs.
@@ -368,7 +368,7 @@
 		 * @param source the pixbuf to use
 		 * @return the average color of the pixbuf
 		 */
-		public static Drawing.Color average_color (Gdk.Pixbuf source)
+		public static Color average_color (Gdk.Pixbuf source)
 		{
 			uint8 r, g, b, a, min, max;
 			double delta;

=== modified file 'lib/Drawing/Easing.vala'
--- lib/Drawing/Easing.vala	2015-11-01 08:56:05 +0000
+++ lib/Drawing/Easing.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * Utility functions to calculate progress of transitions.

=== renamed file 'lib/Drawing/AnimatedRenderer.vala' => 'lib/Drawing/Renderer.vala'
--- lib/Drawing/AnimatedRenderer.vala	2015-09-09 13:22:27 +0000
+++ lib/Drawing/Renderer.vala	2015-11-03 12:02:25 +0000
@@ -17,13 +17,13 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * Handles animated rendering.  Uses a timer and continues requesting
 	 * redraws for a widget until no more animation is needed.
 	 */
-	public abstract class AnimatedRenderer : GLib.Object
+	public abstract class Renderer : GLib.Object
 	{
 		public Gtk.Widget widget { get; construct; }
 		
@@ -40,7 +40,7 @@
 		/**
 		 * Creates a new animation renderer.
 		 */
-		public AnimatedRenderer (Gtk.Widget widget)
+		public Renderer (Gtk.Widget widget)
 		{
 			Object (widget : widget);
 		}
@@ -54,7 +54,7 @@
 			widget_draw_handler_id = widget.draw.connect (on_widget_draw);
 		}
 		
-		~AnimatedRenderer ()
+		~Renderer ()
 		{
 			if (timer_id > 0U) {
 #if HAVE_GTK_3_8

=== renamed file 'lib/Drawing/DockSurface.vala' => 'lib/Drawing/Surface.vala'
--- lib/Drawing/DockSurface.vala	2015-07-16 08:24:10 +0000
+++ lib/Drawing/Surface.vala	2015-11-03 12:02:25 +0000
@@ -17,16 +17,16 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
-	 * A dock surface is a wrapper class for a {@link Cairo.Surface}.
+	 * A surface is a wrapper class for a {@link Cairo.Surface}.
 	 * It encapsulates a surface/context and provides utility methods.
 	 */
-	public class DockSurface : GLib.Object
+	public class Surface : GLib.Object
 	{
 		/**
-		 * The internal {@link Cairo.Surface} backing the dock surface.
+		 * The internal {@link Cairo.Surface} backing the surface.
 		 */
 		public Cairo.Surface Internal { get; construct; }
 		
@@ -41,51 +41,51 @@
 		public int Height { get; construct; }
 		
 		/**
-		 * A {@link Cairo.Context} for the dock surface.
+		 * A {@link Cairo.Context} for the surface.
 		 */
 		public Cairo.Context Context { get; construct; }
 		
 		/**
-		 * Creates a new dock surface.
+		 * Creates a new surface.
 		 *
 		 * @param width width of the new surface
 		 * @param height height of the new surface
 		 */
-		public DockSurface (int width, int height)
+		public Surface (int width, int height)
 		{
 			Object (Width: width, Height: height, Internal: new Cairo.ImageSurface (Cairo.Format.ARGB32, width, height));
 		}
 		
 		/**
-		 * Creates a new dock surface compatible with an existing {@link Cairo.Surface}.
+		 * Creates a new surface compatible with an existing {@link Cairo.Surface}.
 		 *
 		 * @param width width of the new surface
 		 * @param height height of the new surface
 		 * @param model existing {@link Cairo.Surface} to be similar to
 		 */
-		public DockSurface.with_surface (int width, int height, Cairo.Surface model)
+		public Surface.with_cairo_surface (int width, int height, Cairo.Surface model)
 		{
 			Object (Width: width, Height: height, Internal: new Cairo.Surface.similar (model, Cairo.Content.COLOR_ALPHA, width, height));
 		}
 
 		/**
-		 * Creates a new dock surface compatible with an existing {@link Drawing.DockSurface}.
+		 * Creates a new surface compatible with an existing {@link Surface}.
 		 *
 		 * @param width width of the new surface
 		 * @param height height of the new surface
-		 * @param model existing {@link Drawing.DockSurface} to be similar to
+		 * @param model existing {@link Surface} to be similar to
 		 */
-		public DockSurface.with_dock_surface (int width, int height, DockSurface model)
+		public Surface.with_surface (int width, int height, Surface model)
 		{
 			Object (Width: width, Height: height, Internal: new Cairo.Surface.similar (model.Internal, Cairo.Content.COLOR_ALPHA, width, height));
 		}
 		
 		/**
-		 * Creates a new dock surface with the given {@link Cairo.ImageSurface} as Internal.
+		 * Creates a new surface with the given {@link Cairo.ImageSurface} as Internal.
 		 *
 		 * @param image existing {@link Cairo.ImageSurface} as Internal
 		 */
-		public DockSurface.with_internal (Cairo.ImageSurface image)
+		public Surface.with_internal (Cairo.ImageSurface image)
 		{
 			Object (Width: image.get_width (), Height: image.get_height (), Internal: image);
 		}
@@ -113,9 +113,9 @@
 		 *
 		 * @return copy of this surface
 		 */
-		public DockSurface copy ()
+		public Surface copy ()
 		{
-			var copy = new DockSurface.with_dock_surface (Width, Height, this);
+			var copy = new Surface.with_surface (Width, Height, this);
 			unowned Cairo.Context cr = copy.Context;
 			
 			cr.set_source_surface (Internal, 0, 0);
@@ -131,9 +131,9 @@
 		 * @param height the resulting height
 		 * @return scaled copy of this surface
 		 */
-		public DockSurface scaled_copy (int width, int height)
+		public Surface scaled_copy (int width, int height)
 		{
-			var result = new DockSurface.with_dock_surface (width, height, this);
+			var result = new Surface.with_surface (width, height, this);
 			unowned Cairo.Context cr = result.Context;
 			
 			cr.save ();
@@ -146,7 +146,7 @@
 		}
 		
 		/**
-		 * Saves the current dock surface to a {@link Gdk.Pixbuf}.
+		 * Saves the current surface to a {@link Gdk.Pixbuf}.
 		 *
 		 * @return the {@link Gdk.Pixbuf}
 		 */
@@ -162,7 +162,7 @@
 		 * @param extent bounding box of the found mask
 		 * @return a new surface containing the mask
 		 */
-		public DockSurface create_mask (double threshold, out Gdk.Rectangle extent)
+		public Surface create_mask (double threshold, out Gdk.Rectangle extent)
 			requires (threshold >= 0.0 && threshold <= 1.0)
 		{
 			var surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, Width, Height);
@@ -211,7 +211,7 @@
 			
 			extent = {left, top, right - left, bottom - top};
 			
-			return new DockSurface.with_internal (surface);
+			return new Surface.with_internal (surface);
 		}
 		
 		/**
@@ -219,7 +219,7 @@
 		 *
 		 * @return the average color of the surface
 		 */
-		public Drawing.Color average_color ()
+		public Color average_color ()
 		{
 			return DrawingService.average_color (Gdk.pixbuf_get_from_surface (Internal, 0, 0, Width, Height));
 		}

=== modified file 'lib/Drawing/SurfaceCache.vala'
--- lib/Drawing/SurfaceCache.vala	2015-07-30 09:23:44 +0000
+++ lib/Drawing/SurfaceCache.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * Creates a new surface based on the given information
@@ -30,7 +28,7 @@
 	 * @param draw_data_func function which changes the surface
 	 * @return the newly created surface or NULL
 	 */
-	public delegate DockSurface? DrawFunc<G> (int width, int height, DockSurface model, DrawDataFunc<G>? draw_data_func);
+	public delegate Surface? DrawFunc<G> (int width, int height, Surface model, DrawDataFunc<G>? draw_data_func);
 	
 	/**
 	 * Creates a new surface using the given element and information
@@ -41,10 +39,10 @@
 	 * @param data the data object used for drawing
 	 * @return the newly created surface or NULL
 	 */
-	public delegate DockSurface? DrawDataFunc<G> (int width, int height, DockSurface model, G? data);
+	public delegate Surface? DrawDataFunc<G> (int width, int height, Surface model, G? data);
 	
 	/**
-	 * Controls some internal behaviors of a {@link Plank.Drawing.SurfaceCache}
+	 * Controls some internal behaviors of a {@link Plank.SurfaceCache}
 	 */
 	[Flags]
 	public enum SurfaceCacheFlags
@@ -120,7 +118,7 @@
 		public SurfaceCacheFlags flags { get; construct; }
 		
 		Gee.TreeSet<unowned SurfaceInfo> infos;
-		Gee.HashMap<SurfaceInfo, DockSurface> cache_map;
+		Gee.HashMap<SurfaceInfo, Surface> cache_map;
 		unowned SurfaceInfo? last_info;
 		Mutex cache_mutex;
 		
@@ -135,10 +133,10 @@
 		{
 #if HAVE_GEE_0_8
 			infos = new Gee.TreeSet<unowned SurfaceInfo> ((CompareDataFunc) SurfaceInfo.compare);
-			cache_map = new Gee.HashMap<SurfaceInfo, DockSurface> ((Gee.HashDataFunc<SurfaceInfo>) SurfaceInfo.hash);
+			cache_map = new Gee.HashMap<SurfaceInfo, Surface> ((Gee.HashDataFunc<SurfaceInfo>) SurfaceInfo.hash);
 #else
 			infos = new Gee.TreeSet<unowned SurfaceInfo> ((CompareFunc) SurfaceInfo.compare);
-			cache_map = new Gee.HashMap<SurfaceInfo, DockSurface> ((HashFunc<SurfaceInfo>) SurfaceInfo.hash);
+			cache_map = new Gee.HashMap<SurfaceInfo, Surface> ((HashFunc<SurfaceInfo>) SurfaceInfo.hash);
 #endif
 			last_info = null;
 			
@@ -161,14 +159,14 @@
 			last_info = null;
 		}
 		
-		public DockSurface? get_surface<G> (int width, int height, DockSurface model, DrawFunc<G> draw_func, DrawDataFunc<G>? draw_data_func)
+		public Surface? get_surface<G> (int width, int height, Surface model, DrawFunc<G> draw_func, DrawDataFunc<G>? draw_data_func)
 			requires (width >= 0 && height >= 0)
 		{
 			cache_mutex.lock ();
 			
 			unowned SurfaceInfo? info;
 			SurfaceInfo? current_info = null;
-			DockSurface? surface = null;
+			Surface? surface = null;
 			bool needs_scaling = false;
 			
 			info = find_match ((uint16) width, (uint16) height, out needs_scaling);

=== modified file 'lib/Drawing/Theme.vala'
--- lib/Drawing/Theme.vala	2015-07-20 09:03:45 +0000
+++ lib/Drawing/Theme.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Drawing
+namespace Plank
 {
 	/**
 	 * A themed renderer for windows.
@@ -117,9 +115,9 @@
 		/**
 		 * Draws a background onto the surface.
 		 *
-		 * @param surface the dock surface to draw on
+		 * @param surface the surface to draw on
 		 */
-		public void draw_background (DockSurface surface)
+		public void draw_background (Surface surface)
 		{
 			unowned Cairo.Context cr = surface.Context;
 			Cairo.Pattern gradient;

=== modified file 'lib/Factories/AbstractMain.vala'
--- lib/Factories/AbstractMain.vala	2015-11-02 13:42:37 +0000
+++ lib/Factories/AbstractMain.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Widgets;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Factories
+namespace Plank
 {
 	/**
 	 * The main class for all dock applications.  All docks should extend this class.
@@ -314,13 +310,13 @@
 			
 			action = new SimpleAction ("help", null);
 			action.activate.connect (() => {
-				Services.System.open_uri (help_url);
+				System.open_uri (help_url);
 			});
 			add_action (action);
 			
 			action = new SimpleAction ("translate", null);
 			action.activate.connect (() => {
-				Services.System.open_uri (translate_url);
+				System.open_uri (translate_url);
 			});
 			add_action (action);
 			

=== modified file 'lib/Factories/Factory.vala'
--- lib/Factories/Factory.vala	2015-04-27 13:39:02 +0000
+++ lib/Factories/Factory.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Factories
+namespace Plank
 {
 	/**
 	 * The main factory class for the dock.

=== modified file 'lib/Factories/ItemFactory.vala'
--- lib/Factories/ItemFactory.vala	2015-11-02 13:42:37 +0000
+++ lib/Factories/ItemFactory.vala	2015-11-03 12:02:25 +0000
@@ -17,13 +17,10 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
-using Plank.Services;
-
-namespace Plank.Factories
+namespace Plank
 {
 	/**
-	 * An item factory.  Creates {@link Items.DockItem}s based on .dockitem files.
+	 * An item factory.  Creates {@link DockItem}s based on .dockitem files.
 	 */
 	public class ItemFactory : GLib.Object
 	{
@@ -94,10 +91,10 @@
 		public File launchers_dir;
 		
 		/**
-		 * Creates a new {@link Items.DockElement} from a .dockitem.
+		 * Creates a new {@link DockElement} from a .dockitem.
 		 *
 		 * @param file the {@link GLib.File} of .dockitem file to parse
-		 * @return the new {@link Items.DockElement} created
+		 * @return the new {@link DockElement} created
 		 */
 		public virtual DockElement make_element (GLib.File file)
 		{
@@ -105,9 +102,9 @@
 		}
 		
 		/**
-		 * Creates a new {@link Items.PlankDockItem} for the dock itself.
+		 * Creates a new {@link PlankDockItem} for the dock itself.
 		 *
-		 * @return the new {@link Items.PlankDockItem} created
+		 * @return the new {@link PlankDockItem} created
 		 */
 		public virtual DockItem get_item_for_dock ()
 		{
@@ -115,11 +112,11 @@
 		}
 		
 		/**
-		 * Creates a new {@link Items.DockElement} for a launcher parsed from a .dockitem.
+		 * Creates a new {@link DockElement} for a launcher parsed from a .dockitem.
 		 *
 		 * @param file the {@link GLib.File} of .dockitem file that was parsed
 		 * @param launcher the launcher name from the .dockitem
-		 * @return the new {@link Items.DockElement} created
+		 * @return the new {@link DockElement} created
 		 */
 		protected DockElement default_make_element (GLib.File file, string launcher)
 		{
@@ -143,6 +140,10 @@
 				unowned string group_name = typeof (DockItemPreferences).name ();
 				if (keyfile.has_group (group_name))
 					return keyfile.get_string (group_name, "Launcher");
+				
+				// 0.10.1 > 0.10.9/0.11.x
+				if (keyfile.has_group ("PlankItemsDockItemPreferences"))
+					return keyfile.get_string ("PlankItemsDockItemPreferences", "Launcher");
 			} catch (Error e) {
 				warning ("%s (%s)", e.message, file.get_basename ());
 			}
@@ -356,7 +357,7 @@
 			if (launcher_file.query_exists ()) {
 				var file = new KeyFile ();
 				
-				file.set_string (typeof (Items.DockItemPreferences).name (), "Launcher", uri);
+				file.set_string (typeof (DockItemPreferences).name (), "Launcher", uri);
 				
 				try {
 					// find a unique file name, based on the name of the launcher

=== modified file 'lib/HideManager.vala'
--- lib/HideManager.vala	2015-08-19 21:16:03 +0000
+++ lib/HideManager.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-using Plank.Widgets;
-
 namespace Plank
 {
 	/**

=== modified file 'lib/Items/ApplicationDockItem.vala'
--- lib/Items/ApplicationDockItem.vala	2015-11-01 20:41:45 +0000
+++ lib/Items/ApplicationDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A dock item for applications (with .desktop launchers).
@@ -316,40 +312,40 @@
 		
 		void launch ()
 		{
-			Services.System.launch (File.new_for_uri (Prefs.Launcher));
+			System.launch (File.new_for_uri (Prefs.Launcher));
 		}
 		
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (!is_window ())
 				if (button == PopupButton.MIDDLE
 					|| (button == PopupButton.LEFT && (App == null || WindowControl.get_num_windows (App) == 0
 					|| (mod & Gdk.ModifierType.CONTROL_MASK) == Gdk.ModifierType.CONTROL_MASK))) {
 					launch ();
-					return Animation.BOUNCE;
+					return AnimationType.BOUNCE;
 				}
 			
 			if (button == PopupButton.LEFT && App != null && WindowControl.get_num_windows (App) > 0) {
 				WindowControl.smart_focus (App, event_time);
-				return Animation.DARKEN;
+				return AnimationType.DARKEN;
 			}
 			
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override Animation on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (App == null || WindowControl.get_num_windows (App) == 0)
-				return Animation.NONE;
+				return AnimationType.NONE;
 			
 			if (GLib.get_monotonic_time () - LastScrolled < ITEM_SCROLL_DURATION * 1000)
-				return Animation.DARKEN;
+				return AnimationType.DARKEN;
 			
 			LastScrolled = GLib.get_monotonic_time ();
 			
@@ -358,7 +354,7 @@
 			else
 				WindowControl.focus_next (App, event_time);
 			
-			return Animation.DARKEN;
+			return AnimationType.DARKEN;
 		}
 		
 		static void combine_strings (ref string[] result, string delimiter, int n, int i)
@@ -561,7 +557,7 @@
 			foreach (var uri in uris)
 				files.add (File.new_for_uri (uri));
 			
-			Services.System.launch_with_files (File.new_for_uri (Prefs.Launcher), files.to_array ());
+			System.launch_with_files (File.new_for_uri (Prefs.Launcher), files.to_array ());
 			
 			return true;
 		}

=== modified file 'lib/Items/ApplicationDockItemProvider.vala'
--- lib/Items/ApplicationDockItemProvider.vala	2015-11-02 13:42:37 +0000
+++ lib/Items/ApplicationDockItemProvider.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A container and controller class for managing application dock items on a dock.

=== modified file 'lib/Items/DefaultApplicationDockItemProvider.vala'
--- lib/Items/DefaultApplicationDockItemProvider.vala	2015-10-08 17:36:33 +0000
+++ lib/Items/DefaultApplicationDockItemProvider.vala	2015-11-03 12:02:25 +0000
@@ -17,12 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-
-using Plank.Factories;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * The default container and controller class for managing application dock items on a dock.

=== modified file 'lib/Items/DockContainer.vala'
--- lib/Items/DockContainer.vala	2015-09-03 21:03:22 +0000
+++ lib/Items/DockContainer.vala	2015-11-03 12:02:25 +0000
@@ -18,9 +18,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A container and controller class for managing dock elements on a dock.

=== modified file 'lib/Items/DockElement.vala'
--- lib/Items/DockElement.vala	2015-08-20 09:30:32 +0000
+++ lib/Items/DockElement.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * The base class for all dock elements.
@@ -63,17 +61,17 @@
 		/**
 		 * The animation to show for the item's last click event.
 		 */
-		public Animation ClickedAnimation { get; protected set; default = Animation.NONE; }
+		public AnimationType ClickedAnimation { get; protected set; default = AnimationType.NONE; }
 		
 		/**
 		 * The animation to show for the item's last hover event.
 		 */
-		public Animation HoveredAnimation { get; protected set; default = Animation.NONE; }
+		public AnimationType HoveredAnimation { get; protected set; default = AnimationType.NONE; }
 		
 		/**
 		 * The animation to show for the item's last scroll event.
 		 */
-		public Animation ScrolledAnimation { get; protected set; default = Animation.NONE; }
+		public AnimationType ScrolledAnimation { get; protected set; default = AnimationType.NONE; }
 		
 		/**
 		 * The time the item was added to the dock.
@@ -141,9 +139,9 @@
 		 * @param event_time the timestamp of the event triggering this action
 		 * @return which type of animation to trigger
 		 */
-		protected virtual Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected virtual AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		/**
@@ -160,9 +158,9 @@
 		 *
 		 * @return which type of animation to trigger
 		 */
-		protected virtual Animation on_hovered ()
+		protected virtual AnimationType on_hovered ()
 		{
-			return Animation.LIGHTEN;
+			return AnimationType.LIGHTEN;
  		}
 		
 		/**
@@ -185,10 +183,10 @@
 		 * @param event_time the timestamp of the event triggering this action
 		 * @return which type of animation to trigger
 		 */
-		protected virtual Animation on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
+		protected virtual AnimationType on_scrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod, uint32 event_time)
 		{
 			LastScrolled = GLib.get_monotonic_time ();
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		/**

=== modified file 'lib/Items/DockItem.vala'
--- lib/Items/DockItem.vala	2015-10-07 11:51:01 +0000
+++ lib/Items/DockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,13 +17,13 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
+<<<<<<< TREE
+=======
+	public delegate Surface DrawItemFunc (DockItem item, Surface source, Surface? target);
+>>>>>>> MERGE-SOURCE
 	 * The base class for all dock items.
 	 */
 	public abstract class DockItem : DockElement
@@ -103,7 +103,7 @@
 		/**
 		 * The average color of this item's icon.
 		 */
-		public Drawing.Color AverageIconColor { get; protected set; default = Drawing.Color () { red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0 }; }
+		public Color AverageIconColor { get; protected set; default = Color () { red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0 }; }
 		
 		/**
 		 * The filename of the preferences backing file.
@@ -126,7 +126,7 @@
 		
 		SurfaceCache<DockItem> buffer;
 		SurfaceCache<DockItem> background_buffer;
-		DockSurface? foreground_surface = null;
+		Surface? foreground_surface = null;
 		
 		FileMonitor? launcher_file_monitor = null;
 		FileMonitor? icon_file_monitor = null;
@@ -419,7 +419,7 @@
 		}
 		
 		/**
-		 * Returns the dock surface for this item.
+		 * Returns the surface for this item.
 		 *
 		 * It might trigger an internal redraw if the requested size
 		 * isn't cached yet.
@@ -427,17 +427,17 @@
 		 * @param width width of the icon surface
 		 * @param height height of the icon surface
 		 * @param model existing surface to use as basis of new surface
-		 * @return the dock surface for this item which may not be changed
+		 * @return the surface for this item which may not be changed
 		 */
-		public DockSurface get_surface (int width, int height, DockSurface model)
+		public Surface get_surface (int width, int height, Surface model)
 		{
 			return buffer.get_surface<DockItem> (width, height, model, (DrawFunc<DockItem>) internal_get_surface, null);
 		}
 		
 		[CCode (instance_pos = -1)]
-		DockSurface internal_get_surface (int width, int height, DockSurface model, DrawDataFunc<DockItem>? draw_data_func)
+		Surface internal_get_surface (int width, int height, Surface model, DrawDataFunc<DockItem>? draw_data_func)
 		{
-			var surface = new DockSurface.with_dock_surface (width, height, model);
+			var surface = new Surface.with_surface (width, height, model);
 			
 			Logger.verbose ("DockItem.draw_icon (width = %i, height = %i)", width, height);
 			draw_icon (surface);
@@ -458,13 +458,13 @@
 		 * @param draw_data_func function which creates/changes the background surface
 		 * @return the background surface of this item which may not be changed
 		 */
-		public DockSurface? get_background_surface (int width, int height, DockSurface model, DrawDataFunc<DockItem>? draw_data_func)
+		public Surface? get_background_surface (int width, int height, Surface model, DrawDataFunc<DockItem>? draw_data_func)
 		{
 			return background_buffer.get_surface<DockItem> (width, height, model, (DrawFunc<DockItem>) internal_get_background_surface, (DrawDataFunc<DockItem>) draw_data_func);
 		}
 		
 		[CCode (instance_pos = -1)]
-		DockSurface? internal_get_background_surface (int width, int height, DockSurface model, DrawDataFunc<DockItem>? draw_data_func)
+		Surface? internal_get_background_surface (int width, int height, Surface model, DrawDataFunc<DockItem>? draw_data_func)
 		{
 			if (draw_data_func == null)
 				return null;
@@ -483,7 +483,7 @@
 		 * @param draw_data_func function which creates/changes the foreground surface
 		 * @return the background surface of this item which may not be changed
 		 */
-		public DockSurface? get_foreground_surface (int width, int height, DockSurface model, DrawDataFunc<DockItem>? draw_data_func)
+		public Surface? get_foreground_surface (int width, int height, Surface model, DrawDataFunc<DockItem>? draw_data_func)
 		{
 			if (draw_data_func == null) {
 				foreground_surface = null;
@@ -500,7 +500,7 @@
 		}
 		
 		/**
-		 * Returns a copy of the dock surface for this item.
+		 * Returns a copy of the surface for this item.
 		 *
 		 * It will trigger an internal redraw if the requested size
 		 * isn't matching the cache.
@@ -508,9 +508,9 @@
 		 * @param width width of the icon surface
 		 * @param height height of the icon surface
 		 * @param model existing surface to use as basis of new surface
-		 * @return the copied dock surface for this item
+		 * @return the copied surface for this item
 		 */
-		public DockSurface get_surface_copy (int width, int height, DockSurface model)
+		public Surface get_surface_copy (int width, int height, Surface model)
 		{
 			return get_surface (width, height, model).copy ();
 		}
@@ -520,7 +520,7 @@
 		 *
 		 * @param surface the surface to draw on
 		 */
-		protected virtual void draw_icon (DockSurface surface)
+		protected virtual void draw_icon (Surface surface)
 		{
 			Cairo.Surface? icon = null;
 			Gdk.Pixbuf? pbuf = ForcePixbuf;
@@ -558,7 +558,7 @@
 		 *
 		 * @param surface the surface to draw on
 		 */
-		protected virtual void draw_icon_fast (DockSurface surface)
+		protected virtual void draw_icon_fast (Surface surface)
 		{
 			unowned Cairo.Context cr = surface.Context;
 			var width = surface.Width;

=== modified file 'lib/Items/DockItemPreferences.vala'
--- lib/Items/DockItemPreferences.vala	2015-04-27 13:39:02 +0000
+++ lib/Items/DockItemPreferences.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * Contains preference keys for a dock item.

=== modified file 'lib/Items/DockItemProvider.vala'
--- lib/Items/DockItemProvider.vala	2015-10-06 18:10:59 +0000
+++ lib/Items/DockItemProvider.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A container and controller class for managing dock items.

=== modified file 'lib/Items/Enums.vala'
--- lib/Items/Enums.vala	2015-05-08 18:03:50 +0000
+++ lib/Items/Enums.vala	2015-11-03 12:02:25 +0000
@@ -17,12 +17,12 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * What type of animation to perform when an item is or was interacted with.
 	 */
-	public enum Animation
+	public enum AnimationType
 	{
 		/**
 		 * No animation.

=== modified file 'lib/Items/FileDockItem.vala'
--- lib/Items/FileDockItem.vala	2015-10-07 11:51:01 +0000
+++ lib/Items/FileDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,10 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Services;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A dock item for files or folders on the dock.
@@ -141,7 +138,7 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override void draw_icon_fast (DockSurface surface)
+		protected override void draw_icon_fast (Surface surface)
 		{
 			unowned Cairo.Context cr = surface.Context;
 			var width = surface.Width;
@@ -175,7 +172,7 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override void draw_icon (DockSurface surface)
+		protected override void draw_icon (Surface surface)
 		{
 			if (!is_valid () || !has_default_icon_match ()) {
 				base.draw_icon (surface);
@@ -241,28 +238,28 @@
 		 */
 		public void launch ()
 		{
-			Services.System.open (OwnedFile);
-			ClickedAnimation = Animation.BOUNCE;
+			System.open (OwnedFile);
+			ClickedAnimation = AnimationType.BOUNCE;
 			LastClicked = GLib.get_monotonic_time ();
 		}
 		
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
 			if (button == PopupButton.MIDDLE) {
 				launch ();
-				return Animation.BOUNCE;
+				return AnimationType.BOUNCE;
 			}
 			
 			// this actually only happens if its a file, not a directory
 			if (button == PopupButton.LEFT) {
 				launch ();
-				return Animation.BOUNCE;
+				return AnimationType.BOUNCE;
 			}
 			
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		/**
@@ -295,8 +292,8 @@
 					ApplicationDockItem.parse_launcher (uri, out icon, out text);
 					item = create_menu_item (text, icon, true);
 					item.activate.connect (() => {
-						Services.System.launch (file);
-						ClickedAnimation = Animation.BOUNCE;
+						System.launch (file);
+						ClickedAnimation = AnimationType.BOUNCE;
 						LastClicked = GLib.get_monotonic_time ();
 					});
 				} else {
@@ -305,8 +302,8 @@
 					text = text.replace ("_", "__");
 					item = create_menu_item (text, icon, true);
 					item.activate.connect (() => {
-						Services.System.open (file);
-						ClickedAnimation = Animation.BOUNCE;
+						System.open (file);
+						ClickedAnimation = AnimationType.BOUNCE;
 						LastClicked = GLib.get_monotonic_time ();
 					});
 				}
@@ -356,8 +353,8 @@
 			
 			item = create_menu_item (_("Open Containing _Folder"), "folder");
 			item.activate.connect (() => {
-				Services.System.open (OwnedFile.get_parent ());
-				ClickedAnimation = Animation.BOUNCE;
+				System.open (OwnedFile.get_parent ());
+				ClickedAnimation = AnimationType.BOUNCE;
 				LastClicked = GLib.get_monotonic_time ();
 			});
 			items.add (item);

=== modified file 'lib/Items/PlaceholderDockItem.vala'
--- lib/Items/PlaceholderDockItem.vala	2015-05-09 13:27:52 +0000
+++ lib/Items/PlaceholderDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A dock item as a placeholder for the dock itself if nothing was added yet.
@@ -41,9 +41,9 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
-			return Animation.NONE;
+			return AnimationType.NONE;
 		}
 		
 		/**

=== modified file 'lib/Items/PlankDockItem.vala'
--- lib/Items/PlankDockItem.vala	2015-10-07 16:13:57 +0000
+++ lib/Items/PlankDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
-using Plank.Services;
-using Plank.Widgets;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A dock item for the dock itself.  Has things like about, help, quit etc.
@@ -60,11 +56,11 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		protected override Animation on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
+		protected override AnimationType on_clicked (PopupButton button, Gdk.ModifierType mod, uint32 event_time)
 		{
 			Application.get_default ().activate_action ("preferences", null);
 			
-			return Animation.DARKEN;
+			return AnimationType.DARKEN;
 		}
 		
 		/**

=== modified file 'lib/Items/TransientDockItem.vala'
--- lib/Items/TransientDockItem.vala	2015-10-08 19:50:22 +0000
+++ lib/Items/TransientDockItem.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services.Windows;
-
-namespace Plank.Items
+namespace Plank
 {
 	/**
 	 * A dock item for applications which aren't pinned or doesn't have a matched desktop-files.

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2015-11-02 13:42:37 +0000
+++ lib/Makefile.am	2015-11-03 12:02:25 +0000
@@ -68,12 +68,12 @@
 	PositionManager.vala \
 	DBus/Client.vala \
 	DBus/Interfaces.vala \
-	Drawing/AnimatedRenderer.vala \
 	Drawing/Color.vala \
 	Drawing/DrawingService.vala \
-	Drawing/DockSurface.vala \
 	Drawing/DockTheme.vala \
 	Drawing/Easing.vala \
+	Drawing/Renderer.vala \
+	Drawing/Surface.vala \
 	Drawing/SurfaceCache.vala \
 	Drawing/Theme.vala \
 	Factories/AbstractMain.vala \

=== modified file 'lib/PositionManager.vala'
--- lib/PositionManager.vala	2015-11-02 13:42:37 +0000
+++ lib/PositionManager.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
-using Plank.Drawing;
-using Plank.Services;
-using Plank.Services.Windows;
-
 namespace Plank
 {
 	/**

=== modified file 'lib/Services/Logger.vala'
--- lib/Services/Logger.vala	2015-06-08 12:10:47 +0000
+++ lib/Services/Logger.vala	2015-11-03 12:02:25 +0000
@@ -18,7 +18,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services
+namespace Plank
 {
 	const string[] LOG_LEVEL_TO_STRING = {
 		"VERBOSE",

=== modified file 'lib/Services/Matcher.vala'
--- lib/Services/Matcher.vala	2015-04-27 13:39:02 +0000
+++ lib/Services/Matcher.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services.Windows
+namespace Plank
 {
 	/**
 	 * Wrapper for Bamf.Matcher

=== modified file 'lib/Services/Paths.vala'
--- lib/Services/Paths.vala	2015-04-27 13:39:02 +0000
+++ lib/Services/Paths.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services
+namespace Plank
 {
 	/**
 	 * A wrapper class that gives static instances of {@link GLib.File}

=== modified file 'lib/Services/Preferences.vala'
--- lib/Services/Preferences.vala	2015-10-07 12:05:46 +0000
+++ lib/Services/Preferences.vala	2015-11-03 12:02:25 +0000
@@ -17,30 +17,28 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-
-namespace Plank.Services
+namespace Plank
 {
 	/**
 	 * This interface is used by objects that need to be serialized in a Preferences.
 	 * The object must have a string representation and provide these methods to
 	 * translate between the string and object representations.
 	 */
-	public interface PrefsSerializable : GLib.Object
+	public interface Serializable : GLib.Object
 	{
 		/**
 		 * Serializes the object into a string representation.
 		 *
 		 * @return the string representation of the object
 		 */
-		public abstract string prefs_serialize ();
+		public abstract string serialize ();
 		
 		/**
 		 * De-serializes the object from a string representation.
 		 *
 		 * @param s the string representation of the object
 		 */
-		public abstract void prefs_deserialize (string s);
+		public abstract void deserialize (string s);
 	}
 	
 	/**
@@ -51,6 +49,14 @@
 	 */
 	public abstract class Preferences : GLib.Object
 	{
+		// Transition old group-names to new ones to preserve existing settings and keep themes working
+		static string[,] TRANSITION_MAP = {
+			// 0.10.1 > 0.10.9/0.11.x
+			{"PlankItemsDockItemPreferences", "PlankDockItemPreferences"},
+			{"PlankDrawingTheme", "PlankTheme"},
+			{"PlankDrawingDockTheme", "PlankDockTheme"}
+		};
+		
 		/**
 		 * This signal indicates that the backing file for this preferences was deleted.
 		 */
@@ -353,6 +359,16 @@
 				foreach (var prop in get_class ().list_properties ()) {
 					unowned string group_name = prop.owner_type.name ();
 					
+					if (!file.has_group (group_name)) {
+						// Accept and handle old preferences files
+						for (var i = 0; i < 3; i++)
+							if (TRANSITION_MAP[i,1] == group_name) {
+								group_name = TRANSITION_MAP[i,0];
+								missing_keys = true;
+								break;
+							}
+					}
+					
 					if (!file.has_group (group_name) || !file.has_key (group_name, prop.name)) {
 						warning ("Missing key '%s' for group '%s' in preferences file '%s' - using default value", prop.name, group_name, backing_file.get_path () ?? "");
 						missing_keys = true;
@@ -404,21 +420,21 @@
 							if (old_val == new_val)
 								continue;
 							@set (prop.name, new_val);
-						} else if (type.is_a (typeof (Drawing.Color)) || type.is_a (typeof (Gdk.RGBA))) {
+						} else if (type.is_a (typeof (Color)) || type.is_a (typeof (Gdk.RGBA))) {
 							var val = Value (type);
 							get_property (prop.name, ref val);
-							Drawing.Color* old_val = val.get_boxed ();
+							Color* old_val = val.get_boxed ();
 							var old_val_string = old_val.to_prefs_string ();
 							var new_val_string = file.get_string (group_name, prop.name);
 							if (old_val_string == new_val_string)
 								continue;
-							var new_val = Drawing.Color.from_prefs_string (new_val_string);
+							var new_val = Color.from_prefs_string (new_val_string);
 							val.set_boxed (&new_val);
 							set_property (prop.name, val);
-						} else if (type.is_a (typeof (PrefsSerializable))) {
-							PrefsSerializable val;
+						} else if (type.is_a (typeof (Serializable))) {
+							Serializable val;
 							@get (prop.name, out val);
-							val.prefs_deserialize (file.get_string (group_name, prop.name));
+							val.deserialize (file.get_string (group_name, prop.name));
 							continue;
 						} else {
 							debug ("Unsupported preferences type '%s' for property '%s' in file '%s'", type.name (), prop.name, backing_file.get_path () ?? "");
@@ -499,15 +515,15 @@
 					int new_val;
 					@get (prop.name, out new_val);
 					file.set_integer (group_name, prop.name, new_val);
-				} else if (type.is_a (typeof (Drawing.Color)) || type.is_a (typeof (Gdk.RGBA))) {
+				} else if (type.is_a (typeof (Color)) || type.is_a (typeof (Gdk.RGBA))) {
 					var val = Value (type);
 					get_property (prop.name, ref val);
-					Drawing.Color* color = val.get_boxed ();
+					Color* color = val.get_boxed ();
 					file.set_string (group_name, prop.name, (color.to_prefs_string ()));
-				} else if (type.is_a (typeof (PrefsSerializable))) {
+				} else if (type.is_a (typeof (Serializable))) {
 					var val = Value (type);
 					get_property (prop.name, ref val);
-					file.set_string (group_name, prop.name, (val.get_object () as PrefsSerializable).prefs_serialize ());
+					file.set_string (group_name, prop.name, ((Serializable) val.get_object ()).serialize ());
 				} else {
 					debug ("Unsupported preferences type '%s' for property '%s' in file '%s'", type.name (), prop.name, backing_file.get_path () ?? "");
 					continue;

=== modified file 'lib/Services/Settings.vala'
--- lib/Services/Settings.vala	2015-11-02 13:42:37 +0000
+++ lib/Services/Settings.vala	2015-11-03 12:02:25 +0000
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services
+namespace Plank
 {
 	/**
 	 * The base class for gsettings-based configuration classes. Defined properties will be bound

=== modified file 'lib/Services/System.vala'
--- lib/Services/System.vala	2015-04-27 13:39:02 +0000
+++ lib/Services/System.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services
+namespace Plank
 {
 	/**
 	 * A utility class for launching applications and opening files/URIs.

=== modified file 'lib/Services/WindowControl.vala'
--- lib/Services/WindowControl.vala	2015-07-30 09:23:44 +0000
+++ lib/Services/WindowControl.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services.Windows
+namespace Plank
 {
 	public enum Struts
 	{

=== modified file 'lib/Services/Worker.vala'
--- lib/Services/Worker.vala	2015-06-08 21:31:17 +0000
+++ lib/Services/Worker.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Services
+namespace Plank
 {
 	public enum TaskPriority {
 		LOW,

=== modified file 'lib/Version.vala.in'
--- lib/Version.vala.in	2015-04-27 13:39:02 +0000
+++ lib/Version.vala.in	2015-11-03 12:02:25 +0000
@@ -20,105 +20,98 @@
 namespace Plank
 {
 	/**
-	 * Some constants and functions to determine and check the version
-	 * of the plank library.
-	 */
-	namespace Version
+	 * Like get_major_version, but from the headers used at application compile time,
+	 * rather than from the library linked against at application run time
+	 */
+	public const int MAJOR_VERSION = @PLANK_MAJOR_VERSION@;
+	/**
+	 * Like get_minor_version, but from the headers used at application compile time,
+	 * rather than from the library linked against at application run time
+	 */
+	public const int MINOR_VERSION = @PLANK_MINOR_VERSION@;
+	/**
+	 * Like get_micro_version, but from the headers used at application compile time,
+	 * rather than from the library linked against at application run time
+	 */
+	public const int MICRO_VERSION = @PLANK_MICRO_VERSION@;
+	/**
+	 * Like get_nano_version, but from the headers used at application compile time,
+	 * rather than from the library linked against at application run time
+	 */
+	public const int NANO_VERSION = @PLANK_NANO_VERSION@;
+
+	/**
+	 * Returns the major version number of the plank library.
+	 *
+	 * This function is in the library, so it represents the GTK+
+	 * library your code is are running against.
+	 *
+	 * @return the major version number of the plank library
+	 */
+	public uint get_major_version () {
+		return Build.VERSION_MAJOR;
+	}
+	
+	/**
+	 * Returns the minor version number of the plank library.
+	 *
+	 * This function is in the library, so it represents the plank
+	 * library your code is are running against.
+	 *
+	 * @return the minor version number of the plank library
+	 */
+	public uint get_minor_version () {
+		return Build.VERSION_MINOR;
+	}
+	
+	/**
+	 * Returns the micro version number of the plank library.
+	 *
+	 * This function is in the library, so it represents the plank
+	 * library your code is are running against.
+	 *
+	 * @return the micro version number of the plank library
+	 */
+	public uint get_micro_version () {
+		return Build.VERSION_MICRO;
+	}
+	
+	/**
+	 * Returns the nano version number of the plank library.
+	 *
+	 * This function is in the library, so it represents the plank
+	 * library your code is are running against.
+	 *
+	 * @return the nano version number of the plank library
+	 */
+	public uint get_nano_version () {
+		return Build.VERSION_NANO;
+	}
+	
+	/**
+	 * Checks that the plank library in use is compatible with the given version.
+	 *
+	 * This function is in the library, so it represents the plank
+	 * library your code is are running against.
+	 *
+	 * @param required_major the required major version
+	 * @param required_minor the required minor version
+	 * @param required_micro the required micro version
+	 * @return null if the plank library is compatible with the given version,
+	 * or a string describing the version mismatch.
+	 */
+	public unowned string? check_version (uint required_major, uint required_minor, uint required_micro)
 	{
-		/**
-		 * Like get_major_version, but from the headers used at application compile time,
-		 * rather than from the library linked against at application run time
-		 */
-		public const int MAJOR = @PLANK_MAJOR_VERSION@;
-		/**
-		 * Like get_minor_version, but from the headers used at application compile time,
-		 * rather than from the library linked against at application run time
-		 */
-		public const int MINOR = @PLANK_MINOR_VERSION@;
-		/**
-		 * Like get_micro_version, but from the headers used at application compile time,
-		 * rather than from the library linked against at application run time
-		 */
-		public const int MICRO = @PLANK_MICRO_VERSION@;
-		/**
-		 * Like get_nano_version, but from the headers used at application compile time,
-		 * rather than from the library linked against at application run time
-		 */
-		public const int NANO = @PLANK_NANO_VERSION@;
-	
-		/**
-		 * Returns the major version number of the plank library.
-		 *
-		 * This function is in the library, so it represents the GTK+
-		 * library your code is are running against.
-		 *
-		 * @return the major version number of the plank library
-		 */
-		public uint get_major_version () {
-			return Build.VERSION_MAJOR;
-		}
-		
-		/**
-		 * Returns the minor version number of the plank library.
-		 *
-		 * This function is in the library, so it represents the plank
-		 * library your code is are running against.
-		 *
-		 * @return the minor version number of the plank library
-		 */
-		public uint get_minor_version () {
-			return Build.VERSION_MINOR;
-		}
-		
-		/**
-		 * Returns the micro version number of the plank library.
-		 *
-		 * This function is in the library, so it represents the plank
-		 * library your code is are running against.
-		 *
-		 * @return the micro version number of the plank library
-		 */
-		public uint get_micro_version () {
-			return Build.VERSION_MICRO;
-		}
-		
-		/**
-		 * Returns the nano version number of the plank library.
-		 *
-		 * This function is in the library, so it represents the plank
-		 * library your code is are running against.
-		 *
-		 * @return the nano version number of the plank library
-		 */
-		public uint get_nano_version () {
-			return Build.VERSION_NANO;
-		}
-		
-		/**
-		 * Checks that the plank library in use is compatible with the given version.
-		 *
-		 * This function is in the library, so it represents the plank
-		 * library your code is are running against.
-		 *
-		 * @param required_major the required major version
-		 * @param required_minor the required minor version
-		 * @param required_micro the required micro version
-		 * @return null if the plank library is compatible with the given version,
-		 * or a string describing the version mismatch.
-		 */
-		public unowned string? check (uint required_major, uint required_minor, uint required_micro)
-		{
-			uint effective_micro = 100 * Build.VERSION_MINOR + Build.VERSION_MICRO;
-			uint required_effective_micro = 100 * required_minor + required_micro;
+		uint effective_micro = 100 * Build.VERSION_MINOR + Build.VERSION_MICRO;
+		uint required_effective_micro = 100 * required_minor + required_micro;
 
-			if (required_major > Build.VERSION_MAJOR)
-				return "plank version too old (major mismatch)";
-			
-			if (required_effective_micro > effective_micro)
-				return "plank version too old (micro mismatch)";
-			
-			return null;	
-		}
+		if (required_major > Build.VERSION_MAJOR)
+			return "plank version too old (major mismatch)";
+		
+		if (required_effective_micro > effective_micro)
+			return "plank version too old (micro mismatch)";
+		
+		return null;
 	}
 }
 

=== modified file 'lib/Widgets/CompositedWindow.vala'
--- lib/Widgets/CompositedWindow.vala	2015-04-28 11:05:27 +0000
+++ lib/Widgets/CompositedWindow.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Widgets
+namespace Plank
 {
 	/**
 	 * A {@link Gtk.Window} with compositing support enabled.

=== modified file 'lib/Widgets/DockWindow.vala'
--- lib/Widgets/DockWindow.vala	2015-08-23 15:14:48 +0000
+++ lib/Widgets/DockWindow.vala	2015-11-03 12:02:25 +0000
@@ -17,12 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
-using Plank.Items;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Widgets
+namespace Plank
 {
 	/**
 	 * The main window for all docks.
@@ -641,13 +636,13 @@
 			
 			menu_item = new Gtk.MenuItem.with_mnemonic ("Open config folder");
 			menu_item.activate.connect (() => {
-				Services.System.open (controller.config_folder);
+				System.open (controller.config_folder);
 			});
 			debug_items.add (menu_item);
 			
 			menu_item = new Gtk.MenuItem.with_mnemonic ("Open current theme file");
 			menu_item.activate.connect (() => {
-				Services.System.open (controller.renderer.theme.get_backing_file ());
+				System.open (controller.renderer.theme.get_backing_file ());
 			});
 			debug_items.add (menu_item);
 			
@@ -674,14 +669,14 @@
 			
 			menu_item = new Gtk.MenuItem.with_mnemonic ("Open dockitem file");
 			menu_item.activate.connect (() => {
-				Services.System.open (dock_item_file);
+				System.open (dock_item_file);
 			});
 			menu_item.sensitive = (dock_item_file != null && dock_item_file.query_exists ());
 			debug_items.add (menu_item);
 			
 			menu_item = new Gtk.MenuItem.with_mnemonic ("Open launcher file");
 			menu_item.activate.connect (() => {
-				Services.System.open (File.new_for_uri (item.Launcher));
+				System.open (File.new_for_uri (item.Launcher));
 			});
 			menu_item.sensitive = (item.Launcher != "");
 			debug_items.add (menu_item);

=== modified file 'lib/Widgets/HoverWindow.vala'
--- lib/Widgets/HoverWindow.vala	2015-09-10 14:58:38 +0000
+++ lib/Widgets/HoverWindow.vala	2015-11-03 12:02:25 +0000
@@ -17,7 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-namespace Plank.Widgets
+namespace Plank
 {
 	/**
 	 * A hover window that shows labels for dock items.

=== modified file 'lib/Widgets/PoofWindow.vala'
--- lib/Widgets/PoofWindow.vala	2015-07-30 09:23:44 +0000
+++ lib/Widgets/PoofWindow.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
-
-namespace Plank.Widgets
+namespace Plank
 {
 	/**
 	 * An animated window that draws a 'poof' animation.

=== modified file 'lib/Widgets/PreferencesWindow.vala'
--- lib/Widgets/PreferencesWindow.vala	2015-06-27 13:37:11 +0000
+++ lib/Widgets/PreferencesWindow.vala	2015-11-03 12:02:25 +0000
@@ -17,12 +17,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
-using Plank.Drawing;
-using Plank.Services;
-using Plank.Services.Windows;
-
-namespace Plank.Widgets
+namespace Plank
 {
 	public class PreferencesWindow : Gtk.Window
 	{
@@ -191,7 +186,7 @@
 				break;
 			case "Theme":
 				var pos = 0;
-				foreach (unowned string theme in Plank.Drawing.Theme.get_theme_list ()) {
+				foreach (unowned string theme in Plank.Theme.get_theme_list ()) {
 					if (theme == prefs.Theme)
 						cb_theme.set_active (pos);
 					pos++;
@@ -374,7 +369,7 @@
 		void init_dock_tab ()
 		{
 			var pos = 0;
-			foreach (unowned string theme in Plank.Drawing.Theme.get_theme_list ()) {
+			foreach (unowned string theme in Plank.Theme.get_theme_list ()) {
 				cb_theme.append ("%i".printf (pos), theme);
 				if (theme == prefs.Theme)
 					cb_theme.set_active (pos);

=== modified file 'lib/Widgets/TitledSeparatorMenuItem.vala'
--- lib/Widgets/TitledSeparatorMenuItem.vala	2015-01-21 12:26:03 +0000
+++ lib/Widgets/TitledSeparatorMenuItem.vala	2015-11-03 12:02:25 +0000
@@ -20,7 +20,7 @@
 //  Modified by Robert Dyer, Rico Tzschichholz
 //
 
-namespace Plank.Widgets
+namespace Plank
 {
 	/**
 	 * A {@link Gtk.SeparatorMenuItem} with a title on it.

=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2015-11-02 18:32:58 +0000
+++ lib/libplank.symbols	2015-11-03 12:02:25 +0000
@@ -1,3 +1,95 @@
+plank_abstract_main_construct
+plank_abstract_main_create_actions
+plank_abstract_main_create_controller
+plank_abstract_main_get_about_artists
+plank_abstract_main_get_about_authors
+plank_abstract_main_get_about_documenters
+plank_abstract_main_get_about_license_type
+plank_abstract_main_get_about_translators
+plank_abstract_main_get_app_copyright
+plank_abstract_main_get_app_dbus
+plank_abstract_main_get_app_icon
+plank_abstract_main_get_app_launcher
+plank_abstract_main_get_build_data_dir
+plank_abstract_main_get_build_pkg_data_dir
+plank_abstract_main_get_build_release_name
+plank_abstract_main_get_build_version
+plank_abstract_main_get_build_version_info
+plank_abstract_main_get_dock_name
+plank_abstract_main_get_exec_name
+plank_abstract_main_get_help_url
+plank_abstract_main_get_main_url
+plank_abstract_main_get_program_name
+plank_abstract_main_get_translate_url
+plank_abstract_main_get_type
+plank_abstract_main_initialize
+plank_abstract_main_is_launcher_for_dock
+plank_abstract_main_set_about_artists
+plank_abstract_main_set_about_authors
+plank_abstract_main_set_about_documenters
+plank_abstract_main_set_about_license_type
+plank_abstract_main_set_about_translators
+plank_abstract_main_set_dock_name
+plank_abstract_main_set_help_url
+plank_abstract_main_set_main_url
+plank_abstract_main_set_translate_url
+plank_animation_mode_get_type
+plank_animation_type_get_type
+plank_application_dock_item_construct
+plank_application_dock_item_construct_with_dockitem_file
+plank_application_dock_item_construct_with_dockitem_filename
+plank_application_dock_item_get_type
+plank_application_dock_item_get_unity_application_uri
+plank_application_dock_item_get_unity_dbusname
+plank_application_dock_item_has_unity_info
+plank_application_dock_item_is_running
+plank_application_dock_item_is_window
+plank_application_dock_item_new
+plank_application_dock_item_new_with_dockitem_file
+plank_application_dock_item_new_with_dockitem_filename
+plank_application_dock_item_parse_launcher
+plank_application_dock_item_provider_acquire_unity_dbus
+plank_application_dock_item_provider_app_opened
+plank_application_dock_item_provider_construct
+plank_application_dock_item_provider_delay_items_monitor
+plank_application_dock_item_provider_get_item_list_string
+plank_application_dock_item_provider_get_LaunchersDir
+plank_application_dock_item_provider_get_type
+plank_application_dock_item_provider_item_for_application
+plank_application_dock_item_provider_new
+plank_application_dock_item_provider_release_unity_dbus
+plank_application_dock_item_provider_resume_items_monitor
+plank_application_dock_item_set_urgent
+plank_application_dock_item_unity_reset
+plank_application_dock_item_unity_update
+plank_check_version
+plank_color_add_hue
+plank_color_brighten_val
+plank_color_darken_by_sat
+plank_color_darken_val
+plank_color_dup
+plank_color_free
+plank_color_from_prefs_string
+plank_color_get_hsv
+plank_color_get_hue
+plank_color_get_sat
+plank_color_get_type
+plank_color_get_val
+plank_color_multiply_sat
+plank_color_set_hsv
+plank_color_set_hue
+plank_color_set_max_sat
+plank_color_set_max_val
+plank_color_set_min_sat
+plank_color_set_min_val
+plank_color_set_sat
+plank_color_set_val
+plank_color_to_prefs_string
+plank_composited_window_construct
+plank_composited_window_construct_with_type
+plank_composited_window_get_type
+plank_composited_window_new
+plank_composited_window_new_with_type
 plank_dbus_client_add_item
 plank_dbus_client_get_instance
 plank_dbus_client_get_is_connected
@@ -9,6 +101,27 @@
 plank_dbus_manager_construct
 plank_dbus_manager_get_type
 plank_dbus_manager_new
+plank_default_application_dock_item_provider_construct
+plank_default_application_dock_item_provider_get_Prefs
+plank_default_application_dock_item_provider_get_type
+plank_default_application_dock_item_provider_new
+plank_default_application_dock_item_provider_pin_item
+plank_dock_container_add
+plank_dock_container_add_all
+plank_dock_container_connect_element
+plank_dock_container_construct
+plank_dock_container_disconnect_element
+plank_dock_container_get_Elements
+plank_dock_container_get_type
+plank_dock_container_get_VisibleElements
+plank_dock_container_move_element
+plank_dock_container_move_to
+plank_dock_container_prepare
+plank_dock_container_prepend
+plank_dock_container_remove
+plank_dock_container_remove_all
+plank_dock_container_replace
+plank_dock_container_update_visible_elements
 plank_dock_controller_add_default_provider
 plank_dock_controller_construct
 plank_dock_controller_get_config_folder
@@ -30,6 +143,115 @@
 plank_dock_controller_set_position_manager
 plank_dock_controller_set_renderer
 plank_dock_controller_set_window
+plank_dock_element_accept_drop
+plank_dock_element_as_uri
+plank_dock_element_can_accept_drop
+plank_dock_element_can_be_removed
+plank_dock_element_clicked
+plank_dock_element_construct
+plank_dock_element_create_menu_item
+plank_dock_element_create_menu_item_with_pixbuf
+plank_dock_element_get_AddTime
+plank_dock_element_get_Button
+plank_dock_element_get_ClickedAnimation
+plank_dock_element_get_Container
+plank_dock_element_get_dock
+plank_dock_element_get_HoveredAnimation
+plank_dock_element_get_IsAttached
+plank_dock_element_get_IsVisible
+plank_dock_element_get_LastActive
+plank_dock_element_get_LastClicked
+plank_dock_element_get_LastHovered
+plank_dock_element_get_LastMove
+plank_dock_element_get_LastScrolled
+plank_dock_element_get_LastUrgent
+plank_dock_element_get_LastValid
+plank_dock_element_get_menu_items
+plank_dock_element_get_RemoveTime
+plank_dock_element_get_ScrolledAnimation
+plank_dock_element_get_Text
+plank_dock_element_get_type
+plank_dock_element_hovered
+plank_dock_element_on_clicked
+plank_dock_element_on_hovered
+plank_dock_element_on_scrolled
+plank_dock_element_reset_buffers
+plank_dock_element_scrolled
+plank_dock_element_set_AddTime
+plank_dock_element_set_Button
+plank_dock_element_set_ClickedAnimation
+plank_dock_element_set_Container
+plank_dock_element_set_HoveredAnimation
+plank_dock_element_set_IsAttached
+plank_dock_element_set_IsVisible
+plank_dock_element_set_LastActive
+plank_dock_element_set_LastClicked
+plank_dock_element_set_LastHovered
+plank_dock_element_set_LastMove
+plank_dock_element_set_LastScrolled
+plank_dock_element_set_LastUrgent
+plank_dock_element_set_LastValid
+plank_dock_element_set_RemoveTime
+plank_dock_element_set_ScrolledAnimation
+plank_dock_element_set_Text
+plank_dock_element_unique_id
+plank_dock_item_construct
+plank_dock_item_copy_values_to
+plank_dock_item_delete
+plank_dock_item_draw_icon
+plank_dock_item_draw_icon_fast
+plank_dock_item_get_AverageIconColor
+plank_dock_item_get_background_surface
+plank_dock_item_get_Count
+plank_dock_item_get_CountVisible
+plank_dock_item_get_DockItemFilename
+plank_dock_item_get_ForcePixbuf
+plank_dock_item_get_foreground_surface
+plank_dock_item_get_Icon
+plank_dock_item_get_Indicator
+plank_dock_item_get_LastPosition
+plank_dock_item_get_Launcher
+plank_dock_item_get_Position
+plank_dock_item_get_Prefs
+plank_dock_item_get_Progress
+plank_dock_item_get_ProgressVisible
+plank_dock_item_get_State
+plank_dock_item_get_surface
+plank_dock_item_get_surface_copy
+plank_dock_item_get_type
+plank_dock_item_is_valid
+plank_dock_item_load_from_launcher
+plank_dock_item_preferences_construct
+plank_dock_item_preferences_construct_with_file
+plank_dock_item_preferences_construct_with_filename
+plank_dock_item_preferences_construct_with_launcher
+plank_dock_item_preferences_get_Launcher
+plank_dock_item_preferences_get_type
+plank_dock_item_preferences_new
+plank_dock_item_preferences_new_with_file
+plank_dock_item_preferences_new_with_filename
+plank_dock_item_preferences_new_with_launcher
+plank_dock_item_preferences_set_Launcher
+plank_dock_item_provider_add_item_with_uri
+plank_dock_item_provider_construct
+plank_dock_item_provider_get_type
+plank_dock_item_provider_handle_item_deleted
+plank_dock_item_provider_item_exists_for_uri
+plank_dock_item_provider_item_for_uri
+plank_dock_item_provider_new
+plank_dock_item_reset_icon_buffer
+plank_dock_item_set_AverageIconColor
+plank_dock_item_set_Count
+plank_dock_item_set_CountVisible
+plank_dock_item_set_ForcePixbuf
+plank_dock_item_set_Icon
+plank_dock_item_set_Indicator
+plank_dock_item_set_LastPosition
+plank_dock_item_set_Position
+plank_dock_item_set_Progress
+plank_dock_item_set_ProgressVisible
+plank_dock_item_set_State
+plank_dock_item_unset_move_state
 plank_dock_preferences_construct
 plank_dock_preferences_decrease_icon_size
 plank_dock_preferences_get_Alignment
@@ -85,6 +307,67 @@
 plank_dock_renderer_new
 plank_dock_renderer_reset_buffers
 plank_dock_renderer_update_local_cursor
+plank_dock_theme_construct
+plank_dock_theme_create_background
+plank_dock_theme_create_indicator
+plank_dock_theme_create_urgent_glow
+plank_dock_theme_draw_active_glow
+plank_dock_theme_draw_item_count
+plank_dock_theme_draw_item_progress
+plank_dock_theme_get_ActiveTime
+plank_dock_theme_get_BottomPadding
+plank_dock_theme_get_ClickTime
+plank_dock_theme_get_FadeOpacity
+plank_dock_theme_get_FadeTime
+plank_dock_theme_get_GlowPulseTime
+plank_dock_theme_get_GlowSize
+plank_dock_theme_get_GlowTime
+plank_dock_theme_get_HideTime
+plank_dock_theme_get_HorizPadding
+plank_dock_theme_get_IconShadowSize
+plank_dock_theme_get_IndicatorSize
+plank_dock_theme_get_ItemMoveTime
+plank_dock_theme_get_ItemPadding
+plank_dock_theme_get_LaunchBounceHeight
+plank_dock_theme_get_LaunchBounceTime
+plank_dock_theme_get_SlideTime
+plank_dock_theme_get_TopPadding
+plank_dock_theme_get_type
+plank_dock_theme_get_UrgentBounceHeight
+plank_dock_theme_get_UrgentBounceTime
+plank_dock_theme_get_UrgentHueShift
+plank_dock_theme_new
+plank_dock_theme_set_ActiveTime
+plank_dock_theme_set_BottomPadding
+plank_dock_theme_set_ClickTime
+plank_dock_theme_set_FadeOpacity
+plank_dock_theme_set_FadeTime
+plank_dock_theme_set_GlowPulseTime
+plank_dock_theme_set_GlowSize
+plank_dock_theme_set_GlowTime
+plank_dock_theme_set_HideTime
+plank_dock_theme_set_HorizPadding
+plank_dock_theme_set_IconShadowSize
+plank_dock_theme_set_IndicatorSize
+plank_dock_theme_set_ItemMoveTime
+plank_dock_theme_set_ItemPadding
+plank_dock_theme_set_LaunchBounceHeight
+plank_dock_theme_set_LaunchBounceTime
+plank_dock_theme_set_SlideTime
+plank_dock_theme_set_TopPadding
+plank_dock_theme_set_UrgentBounceHeight
+plank_dock_theme_set_UrgentBounceTime
+plank_dock_theme_set_UrgentHueShift
+plank_dock_window_construct
+plank_dock_window_get_HoveredItem
+plank_dock_window_get_HoveredItemProvider
+plank_dock_window_get_type
+plank_dock_window_menu_is_visible
+plank_dock_window_new
+plank_dock_window_update_hovered
+plank_dock_window_update_icon_region
+plank_dock_window_update_icon_regions
+plank_dock_window_update_size_and_position
 plank_drag_manager_construct
 plank_drag_manager_drop_is_accepted_by
 plank_drag_manager_ensure_proxy
@@ -96,203 +379,36 @@
 plank_drag_manager_get_type
 plank_drag_manager_initialize
 plank_drag_manager_new
-plank_drawing_animated_renderer_animated_draw
-plank_drawing_animated_renderer_animation_needed
-plank_drawing_animated_renderer_construct
-plank_drawing_animated_renderer_draw
-plank_drawing_animated_renderer_force_frame_time_update
-plank_drawing_animated_renderer_get_frame_time
-plank_drawing_animated_renderer_get_type
-plank_drawing_animated_renderer_get_widget
-plank_drawing_animated_renderer_initialize_frame
-plank_drawing_animation_mode_get_type
-plank_drawing_color_add_hue
-plank_drawing_color_brighten_val
-plank_drawing_color_darken_by_sat
-plank_drawing_color_darken_val
-plank_drawing_color_dup
-plank_drawing_color_free
-plank_drawing_color_from_prefs_string
-plank_drawing_color_get_hsv
-plank_drawing_color_get_hue
-plank_drawing_color_get_sat
-plank_drawing_color_get_type
-plank_drawing_color_get_val
-plank_drawing_color_multiply_sat
-plank_drawing_color_set_hsv
-plank_drawing_color_set_hue
-plank_drawing_color_set_max_sat
-plank_drawing_color_set_max_val
-plank_drawing_color_set_min_sat
-plank_drawing_color_set_min_val
-plank_drawing_color_set_sat
-plank_drawing_color_set_val
-plank_drawing_color_to_prefs_string
-plank_drawing_dock_surface_average_color
-plank_drawing_dock_surface_clear
-plank_drawing_dock_surface_construct
-plank_drawing_dock_surface_construct_with_dock_surface
-plank_drawing_dock_surface_construct_with_internal
-plank_drawing_dock_surface_construct_with_surface
-plank_drawing_dock_surface_copy
-plank_drawing_dock_surface_create_mask
-plank_drawing_dock_surface_exponential_blur
-plank_drawing_dock_surface_fast_blur
-plank_drawing_dock_surface_gaussian_blur
-plank_drawing_dock_surface_get_Context
-plank_drawing_dock_surface_get_Height
-plank_drawing_dock_surface_get_Internal
-plank_drawing_dock_surface_get_type
-plank_drawing_dock_surface_get_Width
-plank_drawing_dock_surface_new
-plank_drawing_dock_surface_new_with_dock_surface
-plank_drawing_dock_surface_new_with_internal
-plank_drawing_dock_surface_new_with_surface
-plank_drawing_dock_surface_scaled_copy
-plank_drawing_dock_surface_to_pixbuf
-plank_drawing_dock_theme_construct
-plank_drawing_dock_theme_create_background
-plank_drawing_dock_theme_create_indicator
-plank_drawing_dock_theme_create_urgent_glow
-plank_drawing_dock_theme_draw_active_glow
-plank_drawing_dock_theme_draw_item_count
-plank_drawing_dock_theme_draw_item_progress
-plank_drawing_dock_theme_get_ActiveTime
-plank_drawing_dock_theme_get_BottomPadding
-plank_drawing_dock_theme_get_ClickTime
-plank_drawing_dock_theme_get_FadeOpacity
-plank_drawing_dock_theme_get_FadeTime
-plank_drawing_dock_theme_get_GlowPulseTime
-plank_drawing_dock_theme_get_GlowSize
-plank_drawing_dock_theme_get_GlowTime
-plank_drawing_dock_theme_get_HideTime
-plank_drawing_dock_theme_get_HorizPadding
-plank_drawing_dock_theme_get_IconShadowSize
-plank_drawing_dock_theme_get_IndicatorSize
-plank_drawing_dock_theme_get_ItemMoveTime
-plank_drawing_dock_theme_get_ItemPadding
-plank_drawing_dock_theme_get_LaunchBounceHeight
-plank_drawing_dock_theme_get_LaunchBounceTime
-plank_drawing_dock_theme_get_SlideTime
-plank_drawing_dock_theme_get_TopPadding
-plank_drawing_dock_theme_get_type
-plank_drawing_dock_theme_get_UrgentBounceHeight
-plank_drawing_dock_theme_get_UrgentBounceTime
-plank_drawing_dock_theme_get_UrgentHueShift
-plank_drawing_dock_theme_new
-plank_drawing_dock_theme_set_ActiveTime
-plank_drawing_dock_theme_set_BottomPadding
-plank_drawing_dock_theme_set_ClickTime
-plank_drawing_dock_theme_set_FadeOpacity
-plank_drawing_dock_theme_set_FadeTime
-plank_drawing_dock_theme_set_GlowPulseTime
-plank_drawing_dock_theme_set_GlowSize
-plank_drawing_dock_theme_set_GlowTime
-plank_drawing_dock_theme_set_HideTime
-plank_drawing_dock_theme_set_HorizPadding
-plank_drawing_dock_theme_set_IconShadowSize
-plank_drawing_dock_theme_set_IndicatorSize
-plank_drawing_dock_theme_set_ItemMoveTime
-plank_drawing_dock_theme_set_ItemPadding
-plank_drawing_dock_theme_set_LaunchBounceHeight
-plank_drawing_dock_theme_set_LaunchBounceTime
-plank_drawing_dock_theme_set_SlideTime
-plank_drawing_dock_theme_set_TopPadding
-plank_drawing_dock_theme_set_UrgentBounceHeight
-plank_drawing_dock_theme_set_UrgentBounceTime
-plank_drawing_dock_theme_set_UrgentHueShift
-plank_drawing_drawing_service_ar_scale
-plank_drawing_drawing_service_average_color
-plank_drawing_drawing_service_get_icon_from_file
-plank_drawing_drawing_service_get_icon_from_gicon
-plank_drawing_drawing_service_get_icon_theme
-plank_drawing_drawing_service_get_type
-plank_drawing_drawing_service_load_icon
-plank_drawing_drawing_service_load_icon_for_scale
-plank_drawing_drawing_service_try_get_icon_file
-plank_drawing_easing_for_mode
-plank_drawing_surface_cache_clear
-plank_drawing_surface_cache_construct
-plank_drawing_surface_cache_flags_get_type
-plank_drawing_surface_cache_get_flags
-plank_drawing_surface_cache_get_surface
-plank_drawing_surface_cache_get_type
-plank_drawing_surface_cache_new
-plank_drawing_theme_construct
-plank_drawing_theme_construct_with_name
-plank_drawing_theme_draw_background
-plank_drawing_theme_draw_inner_rect
-plank_drawing_theme_draw_rounded_line
-plank_drawing_theme_draw_rounded_rect
-plank_drawing_theme_get_bottom_offset
-plank_drawing_theme_get_BottomRoundness
-plank_drawing_theme_get_FillEndColor
-plank_drawing_theme_get_FillStartColor
-plank_drawing_theme_get_InnerStrokeColor
-plank_drawing_theme_get_LineWidth
-plank_drawing_theme_get_OuterStrokeColor
-plank_drawing_theme_get_theme_folder
-plank_drawing_theme_get_theme_list
-plank_drawing_theme_get_top_offset
-plank_drawing_theme_get_TopRoundness
-plank_drawing_theme_get_type
-plank_drawing_theme_load
-plank_drawing_theme_set_BottomRoundness
-plank_drawing_theme_set_FillEndColor
-plank_drawing_theme_set_FillStartColor
-plank_drawing_theme_set_InnerStrokeColor
-plank_drawing_theme_set_LineWidth
-plank_drawing_theme_set_OuterStrokeColor
-plank_drawing_theme_set_TopRoundness
-plank_factories_abstract_main_construct
-plank_factories_abstract_main_create_actions
-plank_factories_abstract_main_create_controller
-plank_factories_abstract_main_get_about_artists
-plank_factories_abstract_main_get_about_authors
-plank_factories_abstract_main_get_about_documenters
-plank_factories_abstract_main_get_about_license_type
-plank_factories_abstract_main_get_about_translators
-plank_factories_abstract_main_get_app_copyright
-plank_factories_abstract_main_get_app_dbus
-plank_factories_abstract_main_get_app_icon
-plank_factories_abstract_main_get_app_launcher
-plank_factories_abstract_main_get_build_data_dir
-plank_factories_abstract_main_get_build_pkg_data_dir
-plank_factories_abstract_main_get_build_release_name
-plank_factories_abstract_main_get_build_version
-plank_factories_abstract_main_get_build_version_info
-plank_factories_abstract_main_get_dock_name
-plank_factories_abstract_main_get_exec_name
-plank_factories_abstract_main_get_help_url
-plank_factories_abstract_main_get_main_url
-plank_factories_abstract_main_get_program_name
-plank_factories_abstract_main_get_translate_url
-plank_factories_abstract_main_get_type
-plank_factories_abstract_main_initialize
-plank_factories_abstract_main_is_launcher_for_dock
-plank_factories_abstract_main_set_about_artists
-plank_factories_abstract_main_set_about_authors
-plank_factories_abstract_main_set_about_documenters
-plank_factories_abstract_main_set_about_license_type
-plank_factories_abstract_main_set_about_translators
-plank_factories_abstract_main_set_dock_name
-plank_factories_abstract_main_set_help_url
-plank_factories_abstract_main_set_main_url
-plank_factories_abstract_main_set_translate_url
-plank_factories_factory_construct
-plank_factories_factory_get_type
-plank_factories_factory_init
-plank_factories_factory_new
-plank_factories_item_factory_construct
-plank_factories_item_factory_default_make_element
-plank_factories_item_factory_get_item_for_dock
-plank_factories_item_factory_get_launcher_from_dockitem
-plank_factories_item_factory_get_type
-plank_factories_item_factory_load_items
-plank_factories_item_factory_make_default_items
-plank_factories_item_factory_make_dock_item
-plank_factories_item_factory_make_element
-plank_factories_item_factory_new
+plank_drawing_service_ar_scale
+plank_drawing_service_average_color
+plank_drawing_service_get_icon_from_file
+plank_drawing_service_get_icon_from_gicon
+plank_drawing_service_get_icon_theme
+plank_drawing_service_get_type
+plank_drawing_service_load_icon
+plank_drawing_service_load_icon_for_scale
+plank_drawing_service_try_get_icon_file
+plank_easing_for_mode
+plank_factory_construct
+plank_factory_get_type
+plank_factory_init
+plank_factory_new
+plank_file_dock_item_construct
+plank_file_dock_item_construct_with_dockitem_file
+plank_file_dock_item_construct_with_dockitem_filename
+plank_file_dock_item_construct_with_file
+plank_file_dock_item_get_OwnedFile
+plank_file_dock_item_get_type
+plank_file_dock_item_launch
+plank_file_dock_item_new
+plank_file_dock_item_new_with_dockitem_file
+plank_file_dock_item_new_with_dockitem_filename
+plank_file_dock_item_new_with_file
+plank_file_dock_item_set_OwnedFile
+plank_get_major_version
+plank_get_micro_version
+plank_get_minor_version
+plank_get_nano_version
 plank_hide_manager_construct
 plank_hide_manager_get_Disabled
 plank_hide_manager_get_Hidden
@@ -304,190 +420,69 @@
 plank_hide_manager_update_hovered
 plank_hide_manager_update_hovered_with_coords
 plank_hide_type_get_type
-plank_items_animation_get_type
-plank_items_application_dock_item_construct
-plank_items_application_dock_item_construct_with_dockitem_file
-plank_items_application_dock_item_construct_with_dockitem_filename
-plank_items_application_dock_item_get_type
-plank_items_application_dock_item_get_unity_application_uri
-plank_items_application_dock_item_get_unity_dbusname
-plank_items_application_dock_item_has_unity_info
-plank_items_application_dock_item_is_running
-plank_items_application_dock_item_is_window
-plank_items_application_dock_item_new
-plank_items_application_dock_item_new_with_dockitem_file
-plank_items_application_dock_item_new_with_dockitem_filename
-plank_items_application_dock_item_parse_launcher
-plank_items_application_dock_item_provider_acquire_unity_dbus
-plank_items_application_dock_item_provider_app_opened
-plank_items_application_dock_item_provider_construct
-plank_items_application_dock_item_provider_delay_items_monitor
-plank_items_application_dock_item_provider_get_item_list_string
-plank_items_application_dock_item_provider_get_LaunchersDir
-plank_items_application_dock_item_provider_get_type
-plank_items_application_dock_item_provider_item_for_application
-plank_items_application_dock_item_provider_new
-plank_items_application_dock_item_provider_release_unity_dbus
-plank_items_application_dock_item_provider_resume_items_monitor
-plank_items_application_dock_item_set_urgent
-plank_items_application_dock_item_unity_reset
-plank_items_application_dock_item_unity_update
-plank_items_default_application_dock_item_provider_construct
-plank_items_default_application_dock_item_provider_get_Prefs
-plank_items_default_application_dock_item_provider_get_type
-plank_items_default_application_dock_item_provider_new
-plank_items_default_application_dock_item_provider_pin_item
-plank_items_dock_container_add
-plank_items_dock_container_add_all
-plank_items_dock_container_connect_element
-plank_items_dock_container_construct
-plank_items_dock_container_disconnect_element
-plank_items_dock_container_get_Elements
-plank_items_dock_container_get_type
-plank_items_dock_container_get_VisibleElements
-plank_items_dock_container_move_element
-plank_items_dock_container_move_to
-plank_items_dock_container_prepare
-plank_items_dock_container_prepend
-plank_items_dock_container_remove
-plank_items_dock_container_remove_all
-plank_items_dock_container_replace
-plank_items_dock_container_update_visible_elements
-plank_items_dock_element_accept_drop
-plank_items_dock_element_as_uri
-plank_items_dock_element_can_accept_drop
-plank_items_dock_element_can_be_removed
-plank_items_dock_element_clicked
-plank_items_dock_element_construct
-plank_items_dock_element_create_menu_item
-plank_items_dock_element_create_menu_item_with_pixbuf
-plank_items_dock_element_get_AddTime
-plank_items_dock_element_get_Button
-plank_items_dock_element_get_ClickedAnimation
-plank_items_dock_element_get_Container
-plank_items_dock_element_get_dock
-plank_items_dock_element_get_HoveredAnimation
-plank_items_dock_element_get_IsAttached
-plank_items_dock_element_get_IsVisible
-plank_items_dock_element_get_LastActive
-plank_items_dock_element_get_LastClicked
-plank_items_dock_element_get_LastHovered
-plank_items_dock_element_get_LastMove
-plank_items_dock_element_get_LastScrolled
-plank_items_dock_element_get_LastUrgent
-plank_items_dock_element_get_LastValid
-plank_items_dock_element_get_menu_items
-plank_items_dock_element_get_RemoveTime
-plank_items_dock_element_get_ScrolledAnimation
-plank_items_dock_element_get_Text
-plank_items_dock_element_get_type
-plank_items_dock_element_hovered
-plank_items_dock_element_on_clicked
-plank_items_dock_element_on_hovered
-plank_items_dock_element_on_scrolled
-plank_items_dock_element_reset_buffers
-plank_items_dock_element_scrolled
-plank_items_dock_element_set_AddTime
-plank_items_dock_element_set_Button
-plank_items_dock_element_set_ClickedAnimation
-plank_items_dock_element_set_Container
-plank_items_dock_element_set_HoveredAnimation
-plank_items_dock_element_set_IsAttached
-plank_items_dock_element_set_IsVisible
-plank_items_dock_element_set_LastActive
-plank_items_dock_element_set_LastClicked
-plank_items_dock_element_set_LastHovered
-plank_items_dock_element_set_LastMove
-plank_items_dock_element_set_LastScrolled
-plank_items_dock_element_set_LastUrgent
-plank_items_dock_element_set_LastValid
-plank_items_dock_element_set_RemoveTime
-plank_items_dock_element_set_ScrolledAnimation
-plank_items_dock_element_set_Text
-plank_items_dock_element_unique_id
-plank_items_dock_item_construct
-plank_items_dock_item_copy_values_to
-plank_items_dock_item_delete
-plank_items_dock_item_draw_icon
-plank_items_dock_item_draw_icon_fast
-plank_items_dock_item_get_AverageIconColor
-plank_items_dock_item_get_background_surface
-plank_items_dock_item_get_Count
-plank_items_dock_item_get_CountVisible
-plank_items_dock_item_get_DockItemFilename
-plank_items_dock_item_get_ForcePixbuf
-plank_items_dock_item_get_foreground_surface
-plank_items_dock_item_get_Icon
-plank_items_dock_item_get_Indicator
-plank_items_dock_item_get_LastPosition
-plank_items_dock_item_get_Launcher
-plank_items_dock_item_get_Position
-plank_items_dock_item_get_Prefs
-plank_items_dock_item_get_Progress
-plank_items_dock_item_get_ProgressVisible
-plank_items_dock_item_get_State
-plank_items_dock_item_get_surface
-plank_items_dock_item_get_surface_copy
-plank_items_dock_item_get_type
-plank_items_dock_item_is_valid
-plank_items_dock_item_load_from_launcher
-plank_items_dock_item_preferences_construct
-plank_items_dock_item_preferences_construct_with_file
-plank_items_dock_item_preferences_construct_with_filename
-plank_items_dock_item_preferences_construct_with_launcher
-plank_items_dock_item_preferences_get_Launcher
-plank_items_dock_item_preferences_get_type
-plank_items_dock_item_preferences_new
-plank_items_dock_item_preferences_new_with_file
-plank_items_dock_item_preferences_new_with_filename
-plank_items_dock_item_preferences_new_with_launcher
-plank_items_dock_item_preferences_set_Launcher
-plank_items_dock_item_provider_add_item_with_uri
-plank_items_dock_item_provider_construct
-plank_items_dock_item_provider_get_type
-plank_items_dock_item_provider_handle_item_deleted
-plank_items_dock_item_provider_item_exists_for_uri
-plank_items_dock_item_provider_item_for_uri
-plank_items_dock_item_provider_new
-plank_items_dock_item_reset_icon_buffer
-plank_items_dock_item_set_AverageIconColor
-plank_items_dock_item_set_Count
-plank_items_dock_item_set_CountVisible
-plank_items_dock_item_set_ForcePixbuf
-plank_items_dock_item_set_Icon
-plank_items_dock_item_set_Indicator
-plank_items_dock_item_set_LastPosition
-plank_items_dock_item_set_Position
-plank_items_dock_item_set_Progress
-plank_items_dock_item_set_ProgressVisible
-plank_items_dock_item_set_State
-plank_items_dock_item_unset_move_state
-plank_items_file_dock_item_construct
-plank_items_file_dock_item_construct_with_dockitem_file
-plank_items_file_dock_item_construct_with_dockitem_filename
-plank_items_file_dock_item_construct_with_file
-plank_items_file_dock_item_get_OwnedFile
-plank_items_file_dock_item_get_type
-plank_items_file_dock_item_launch
-plank_items_file_dock_item_new
-plank_items_file_dock_item_new_with_dockitem_file
-plank_items_file_dock_item_new_with_dockitem_filename
-plank_items_file_dock_item_new_with_file
-plank_items_file_dock_item_set_OwnedFile
-plank_items_indicator_state_get_type
-plank_items_item_state_get_type
-plank_items_placeholder_dock_item_construct
-plank_items_placeholder_dock_item_get_type
-plank_items_placeholder_dock_item_new
-plank_items_plank_dock_item_get_instance
-plank_items_plank_dock_item_get_type
-plank_items_popup_button_from_event_button
-plank_items_popup_button_get_type
-plank_items_transient_dock_item_construct
-plank_items_transient_dock_item_construct_with_launcher
-plank_items_transient_dock_item_get_type
-plank_items_transient_dock_item_new
-plank_items_transient_dock_item_new_with_launcher
+plank_hover_window_construct
+plank_hover_window_get_type
+plank_hover_window_new
+plank_hover_window_set_text
+plank_hover_window_show_at
+plank_indicator_state_get_type
+plank_item_factory_construct
+plank_item_factory_default_make_element
+plank_item_factory_get_item_for_dock
+plank_item_factory_get_launcher_from_dockitem
+plank_item_factory_get_type
+plank_item_factory_load_items
+plank_item_factory_make_default_items
+plank_item_factory_make_dock_item
+plank_item_factory_make_element
+plank_item_factory_new
+plank_item_state_get_type
+plank_logger_get_DisplayLevel
+plank_logger_get_type
+plank_logger_initialize
+plank_logger_notification
+plank_logger_set_DisplayLevel
+plank_logger_verbose
+plank_log_level_get_type
+plank_paths_ensure_directory_exists
+plank_paths_get_AppCacheFolder
+plank_paths_get_AppConfigFolder
+plank_paths_get_AppDataFolder
+plank_paths_get_AppName
+plank_paths_get_AppThemeFolder
+plank_paths_get_CacheHomeFolder
+plank_paths_get_ConfigHomeFolder
+plank_paths_get_DataDirFolders
+plank_paths_get_DataFolder
+plank_paths_get_DataHomeFolder
+plank_paths_get_HomeFolder
+plank_paths_get_ThemeFolder
+plank_paths_get_type
+plank_paths_initialize
+plank_paths_set_AppCacheFolder
+plank_paths_set_AppConfigFolder
+plank_paths_set_AppDataFolder
+plank_paths_set_AppName
+plank_paths_set_AppThemeFolder
+plank_paths_set_CacheHomeFolder
+plank_paths_set_ConfigHomeFolder
+plank_paths_set_DataDirFolders
+plank_paths_set_DataFolder
+plank_paths_set_DataHomeFolder
+plank_paths_set_HomeFolder
+plank_paths_set_ThemeFolder
+plank_placeholder_dock_item_construct
+plank_placeholder_dock_item_get_type
+plank_placeholder_dock_item_new
+plank_plank_dock_item_get_instance
+plank_plank_dock_item_get_type
+plank_poof_window_construct
+plank_poof_window_get_default
+plank_poof_window_get_type
+plank_poof_window_new
+plank_poof_window_show_at
+plank_popup_button_from_event_button
+plank_popup_button_get_type
 plank_position_manager_construct
 plank_position_manager_dock_item_draw_value_construct
 plank_position_manager_dock_item_draw_value_get_type
@@ -544,113 +539,118 @@
 plank_position_manager_value_get_dock_item_draw_value
 plank_position_manager_value_set_dock_item_draw_value
 plank_position_manager_value_take_dock_item_draw_value
-plank_services_logger_get_DisplayLevel
-plank_services_logger_get_type
-plank_services_logger_initialize
-plank_services_logger_notification
-plank_services_logger_set_DisplayLevel
-plank_services_logger_verbose
-plank_services_log_level_get_type
-plank_services_paths_ensure_directory_exists
-plank_services_paths_get_AppCacheFolder
-plank_services_paths_get_AppConfigFolder
-plank_services_paths_get_AppDataFolder
-plank_services_paths_get_AppName
-plank_services_paths_get_AppThemeFolder
-plank_services_paths_get_CacheHomeFolder
-plank_services_paths_get_ConfigHomeFolder
-plank_services_paths_get_DataDirFolders
-plank_services_paths_get_DataFolder
-plank_services_paths_get_DataHomeFolder
-plank_services_paths_get_HomeFolder
-plank_services_paths_get_ThemeFolder
-plank_services_paths_get_type
-plank_services_paths_initialize
-plank_services_paths_set_AppCacheFolder
-plank_services_paths_set_AppConfigFolder
-plank_services_paths_set_AppDataFolder
-plank_services_paths_set_AppName
-plank_services_paths_set_AppThemeFolder
-plank_services_paths_set_CacheHomeFolder
-plank_services_paths_set_ConfigHomeFolder
-plank_services_paths_set_DataDirFolders
-plank_services_paths_set_DataFolder
-plank_services_paths_set_DataHomeFolder
-plank_services_paths_set_HomeFolder
-plank_services_paths_set_ThemeFolder
-plank_services_preferences_apply
-plank_services_preferences_construct
-plank_services_preferences_construct_with_file
-plank_services_preferences_construct_with_filename
-plank_services_preferences_delay
-plank_services_preferences_delete
-plank_services_preferences_get_backing_file
-plank_services_preferences_get_filename
-plank_services_preferences_get_type
-plank_services_preferences_init_from_file
-plank_services_preferences_init_from_filename
-plank_services_preferences_reset_properties
-plank_services_preferences_verify
-plank_services_prefs_serializable_get_type
-plank_services_prefs_serializable_prefs_deserialize
-plank_services_prefs_serializable_prefs_serialize
-plank_services_settings_apply
-plank_services_settings_construct
-plank_services_settings_construct_with_path
-plank_services_settings_delay
-plank_services_settings_get_settings
-plank_services_settings_get_type
-plank_services_settings_reset_all
-plank_services_settings_verify
-plank_services_system_get_type
-plank_services_system_is_desktop_session
-plank_services_system_launch
-plank_services_system_launch_with_files
-plank_services_system_open
-plank_services_system_open_files
-plank_services_system_open_uri
-plank_services_task_priority_get_type
-plank_services_worker_add_task
-plank_services_worker_add_task_with_result
-plank_services_worker_add_task_with_result_finish
-plank_services_worker_get_default
-plank_services_worker_get_type
-plank_version_check
-plank_version_get_major_version
-plank_version_get_micro_version
-plank_version_get_minor_version
-plank_version_get_nano_version
-plank_widgets_composited_window_construct
-plank_widgets_composited_window_construct_with_type
-plank_widgets_composited_window_get_type
-plank_widgets_composited_window_new
-plank_widgets_composited_window_new_with_type
-plank_widgets_dock_window_construct
-plank_widgets_dock_window_get_HoveredItem
-plank_widgets_dock_window_get_HoveredItemProvider
-plank_widgets_dock_window_get_type
-plank_widgets_dock_window_menu_is_visible
-plank_widgets_dock_window_new
-plank_widgets_dock_window_update_hovered
-plank_widgets_dock_window_update_icon_region
-plank_widgets_dock_window_update_icon_regions
-plank_widgets_dock_window_update_size_and_position
-plank_widgets_hover_window_construct
-plank_widgets_hover_window_get_type
-plank_widgets_hover_window_new
-plank_widgets_hover_window_set_text
-plank_widgets_hover_window_show_at
-plank_widgets_poof_window_construct
-plank_widgets_poof_window_get_default
-plank_widgets_poof_window_get_type
-plank_widgets_poof_window_new
-plank_widgets_poof_window_show_at
-plank_widgets_preferences_window_construct
-plank_widgets_preferences_window_get_prefs
-plank_widgets_preferences_window_get_type
-plank_widgets_preferences_window_new
-plank_widgets_titled_separator_menu_item_construct
-plank_widgets_titled_separator_menu_item_construct_no_line
-plank_widgets_titled_separator_menu_item_get_type
-plank_widgets_titled_separator_menu_item_new
-plank_widgets_titled_separator_menu_item_new_no_line
+plank_preferences_apply
+plank_preferences_construct
+plank_preferences_construct_with_file
+plank_preferences_construct_with_filename
+plank_preferences_delay
+plank_preferences_delete
+plank_preferences_get_backing_file
+plank_preferences_get_filename
+plank_preferences_get_type
+plank_preferences_init_from_file
+plank_preferences_init_from_filename
+plank_preferences_reset_properties
+plank_preferences_verify
+plank_preferences_window_construct
+plank_preferences_window_get_prefs
+plank_preferences_window_get_type
+plank_preferences_window_new
+plank_renderer_animated_draw
+plank_renderer_animation_needed
+plank_renderer_construct
+plank_renderer_draw
+plank_renderer_force_frame_time_update
+plank_renderer_get_frame_time
+plank_renderer_get_type
+plank_renderer_get_widget
+plank_renderer_initialize_frame
+plank_serializable_deserialize
+plank_serializable_get_type
+plank_serializable_serialize
+plank_settings_apply
+plank_settings_construct
+plank_settings_construct_with_path
+plank_settings_delay
+plank_settings_get_settings
+plank_settings_get_type
+plank_settings_reset_all
+plank_settings_verify
+plank_surface_average_color
+plank_surface_cache_clear
+plank_surface_cache_construct
+plank_surface_cache_flags_get_type
+plank_surface_cache_get_flags
+plank_surface_cache_get_surface
+plank_surface_cache_get_type
+plank_surface_cache_new
+plank_surface_clear
+plank_surface_construct
+plank_surface_construct_with_cairo_surface
+plank_surface_construct_with_internal
+plank_surface_construct_with_surface
+plank_surface_copy
+plank_surface_create_mask
+plank_surface_exponential_blur
+plank_surface_fast_blur
+plank_surface_gaussian_blur
+plank_surface_get_Context
+plank_surface_get_Height
+plank_surface_get_Internal
+plank_surface_get_type
+plank_surface_get_Width
+plank_surface_new
+plank_surface_new_with_cairo_surface
+plank_surface_new_with_internal
+plank_surface_new_with_surface
+plank_surface_scaled_copy
+plank_surface_to_pixbuf
+plank_system_get_type
+plank_system_is_desktop_session
+plank_system_launch
+plank_system_launch_with_files
+plank_system_open
+plank_system_open_files
+plank_system_open_uri
+plank_task_priority_get_type
+plank_theme_construct
+plank_theme_construct_with_name
+plank_theme_draw_background
+plank_theme_draw_inner_rect
+plank_theme_draw_rounded_line
+plank_theme_draw_rounded_rect
+plank_theme_get_bottom_offset
+plank_theme_get_BottomRoundness
+plank_theme_get_FillEndColor
+plank_theme_get_FillStartColor
+plank_theme_get_InnerStrokeColor
+plank_theme_get_LineWidth
+plank_theme_get_OuterStrokeColor
+plank_theme_get_theme_folder
+plank_theme_get_theme_list
+plank_theme_get_top_offset
+plank_theme_get_TopRoundness
+plank_theme_get_type
+plank_theme_load
+plank_theme_set_BottomRoundness
+plank_theme_set_FillEndColor
+plank_theme_set_FillStartColor
+plank_theme_set_InnerStrokeColor
+plank_theme_set_LineWidth
+plank_theme_set_OuterStrokeColor
+plank_theme_set_TopRoundness
+plank_titled_separator_menu_item_construct
+plank_titled_separator_menu_item_construct_no_line
+plank_titled_separator_menu_item_get_type
+plank_titled_separator_menu_item_new
+plank_titled_separator_menu_item_new_no_line
+plank_transient_dock_item_construct
+plank_transient_dock_item_construct_with_launcher
+plank_transient_dock_item_get_type
+plank_transient_dock_item_new
+plank_transient_dock_item_new_with_launcher
+plank_worker_add_task
+plank_worker_add_task_with_result
+plank_worker_add_task_with_result_finish
+plank_worker_get_default
+plank_worker_get_type

=== modified file 'src/Main.vala'
--- src/Main.vala	2015-11-02 08:40:11 +0000
+++ src/Main.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,6 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
-using Plank.Items;
-
 namespace Plank
 {
 	public static int main (string[] argv)

=== modified file 'tests/Controller.vala'
--- tests/Controller.vala	2015-11-02 13:42:37 +0000
+++ tests/Controller.vala	2015-11-03 12:02:25 +0000
@@ -17,11 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Items;
-using Plank.Services;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public static void register_controller_tests ()
 	{

=== modified file 'tests/Dock.vala'
--- tests/Dock.vala	2015-04-27 13:39:02 +0000
+++ tests/Dock.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Factories;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public class Dock : AbstractMain
 	{

=== modified file 'tests/Drawing.vala'
--- tests/Drawing.vala	2015-04-27 13:39:02 +0000
+++ tests/Drawing.vala	2015-11-03 12:02:25 +0000
@@ -17,10 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Items;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public static void register_drawing_tests ()
 	{
@@ -29,12 +28,12 @@
 		Test.add_func ("/Drawing/DrawingService/basics", drawing_drawingservice);
 		Test.add_func ("/Drawing/DrawingService/average_color", drawing_drawingservice_average_color);
 		
-		Test.add_func ("/Drawing/DockSurface/basics", drawing_docksurface);
-		Test.add_func ("/Drawing/DockSurface/create_mask", drawing_docksurface_create_mask);
-		Test.add_func ("/Drawing/DockSurface/exponential_blur", drawing_docksurface_exponential_blur);
-		Test.add_func ("/Drawing/DockSurface/fast_blur", drawing_docksurface_fast_blur);
-		Test.add_func ("/Drawing/DockSurface/gaussian_blur", drawing_docksurface_gaussian_blur);
-		Test.add_func ("/Drawing/DockSurface/to_pixbuf", drawing_docksurface_to_pixbuf);
+		Test.add_func ("/Drawing/Surface/basics", drawing_docksurface);
+		Test.add_func ("/Drawing/Surface/create_mask", drawing_docksurface_create_mask);
+		Test.add_func ("/Drawing/Surface/exponential_blur", drawing_docksurface_exponential_blur);
+		Test.add_func ("/Drawing/Surface/fast_blur", drawing_docksurface_fast_blur);
+		Test.add_func ("/Drawing/Surface/gaussian_blur", drawing_docksurface_gaussian_blur);
+		Test.add_func ("/Drawing/Surface/to_pixbuf", drawing_docksurface_to_pixbuf);
 		
 		Test.add_func ("/Drawing/Easing/basics", drawing_easing);
 		
@@ -49,7 +48,7 @@
 	
 	void drawing_color ()
 	{
-		Drawing.Color color, color2, color3;
+		Color color, color2, color3;
 		double h, s, v;
 		
 		color = { 0.5, 0.5, 0.5, 0.5 };
@@ -106,7 +105,7 @@
 		color = color3;
 		color.darken_by_sat (0.66);
 		
-		color = Drawing.Color.from_prefs_string ("123;;234;;123;;234");
+		color = Color.from_prefs_string ("123;;234;;123;;234");
 		assert (color.to_prefs_string () == "123;;234;;123;;234");
 	}
 	
@@ -166,11 +165,11 @@
 		drawing_drawingservice_average_color_helper ({ 1.0, 1.0, 1.0, 1.0 }, 0.0);
 	}
 	
-	void drawing_drawingservice_average_color_helper (Drawing.Color color, double delta)
+	void drawing_drawingservice_average_color_helper (Color color, double delta)
 	{
-		Drawing.Color average;
-		Drawing.DockSurface surface;
-		surface = new DockSurface (256, 256);
+		Color average;
+		Surface surface;
+		surface = new Surface (256, 256);
 		unowned Cairo.Context cr = surface.Context;
 		
 		cr.set_source_rgba (color.red, color.green, color.blue, color.alpha);
@@ -184,13 +183,13 @@
 
 	void drawing_docksurface ()
 	{
-		Drawing.DockSurface surface, surface2, surface3, surface4;
+		Surface surface, surface2, surface3, surface4;
 		Gdk.Pixbuf pixbuf;
 		
-		surface = new DockSurface (256, 256);
-		surface2 = new DockSurface.with_dock_surface (256, 256, new DockSurface (1, 1));
-		surface3 = new DockSurface.with_surface (256, 256, new DockSurface (1, 1).Internal);
-		surface4 = new DockSurface.with_internal (new Cairo.ImageSurface (Cairo.Format.ARGB32, 256, 256));
+		surface = new Surface (256, 256);
+		surface2 = new Surface.with_surface (256, 256, new Surface (1, 1));
+		surface3 = new Surface.with_cairo_surface (256, 256, new Surface (1, 1).Internal);
+		surface4 = new Surface.with_internal (new Cairo.ImageSurface (Cairo.Format.ARGB32, 256, 256));
 		
 		surface.clear ();
 		surface2.clear ();
@@ -211,11 +210,11 @@
 	
 	void drawing_docksurface_create_mask ()
 	{
-		Drawing.DockSurface surface, mask;
+		Surface surface, mask;
 		Gdk.Pixbuf pixbuf;
 		
 		pixbuf = DrawingService.load_icon (TEST_ICON, 256, 256);
-		surface = new DockSurface (256, 256);
+		surface = new Surface (256, 256);
 		
 		unowned Cairo.Context cr = surface.Context;
 		Gdk.cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
@@ -229,12 +228,12 @@
 	
 	void drawing_docksurface_fast_blur ()
 	{
-		Drawing.DockSurface surface, surface2;
+		Surface surface, surface2;
 		Gdk.Pixbuf pixbuf;
 		
 		pixbuf = DrawingService.load_icon (TEST_ICON, 256, 256);
-		surface = new DockSurface (256, 256);
-		surface2 = new DockSurface (256, 256);
+		surface = new Surface (256, 256);
+		surface2 = new Surface (256, 256);
 		
 		unowned Cairo.Context cr = surface.Context;
 		Gdk.cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
@@ -261,12 +260,12 @@
 	
 	void drawing_docksurface_exponential_blur ()
 	{
-		Drawing.DockSurface surface, surface2;
+		Surface surface, surface2;
 		Gdk.Pixbuf pixbuf;
 		
 		pixbuf = DrawingService.load_icon (TEST_ICON, 256, 256);
-		surface = new DockSurface (256, 256);
-		surface2 = new DockSurface (256, 256);
+		surface = new Surface (256, 256);
+		surface2 = new Surface (256, 256);
 		
 		unowned Cairo.Context cr = surface.Context;
 		Gdk.cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
@@ -293,12 +292,12 @@
 	
 	void drawing_docksurface_gaussian_blur ()
 	{
-		Drawing.DockSurface surface, surface2;
+		Surface surface, surface2;
 		Gdk.Pixbuf pixbuf;
 		
 		pixbuf = DrawingService.load_icon (TEST_ICON, 256, 256);
-		surface = new DockSurface (256, 256);
-		surface2 = new DockSurface (256, 256);
+		surface = new Surface (256, 256);
+		surface2 = new Surface (256, 256);
 		
 		unowned Cairo.Context cr = surface.Context;
 		Gdk.cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
@@ -325,12 +324,12 @@
 	
 	void drawing_docksurface_to_pixbuf ()
 	{
-		Drawing.DockSurface surface, surface2;
+		Surface surface, surface2;
 		Gdk.Pixbuf pixbuf;
 		
 		pixbuf = DrawingService.load_icon (TEST_ICON, 256, 256);
-		surface = new DockSurface (256, 256);
-		surface2 = new DockSurface (256, 256);
+		surface = new Surface (256, 256);
+		surface2 = new Surface (256, 256);
 		
 		unowned Cairo.Context cr = surface.Context;
 		Gdk.cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
@@ -347,7 +346,7 @@
 	{
 		for (int i = AnimationMode.LINEAR; i < AnimationMode.LAST; i++)
 			for (int j = 0; j <= 100; j++)
-				Drawing.easing_for_mode ((AnimationMode) i, j, 100);
+				easing_for_mode ((AnimationMode) i, j, 100);
 	}
 	
 	void drawing_theme ()
@@ -368,12 +367,12 @@
 	
 	void drawing_theme_draw_item_count ()
 	{
-		Drawing.DockSurface surface;
+		Surface surface;
 		DockTheme docktheme;
 		
-		surface = new DockSurface (512, 512);
+		surface = new Surface (512, 512);
 		docktheme = new DockTheme ("Test");
-		Drawing.Color color = { 0.5, 0.4, 0.3, 1.0 };
+		Color color = { 0.5, 0.4, 0.3, 1.0 };
 		
 		docktheme.draw_item_count (surface, 64, color, -100);
 		docktheme.draw_item_count (surface, 64, color, 0);
@@ -383,12 +382,12 @@
 	
 	void drawing_theme_draw_item_progress ()
 	{
-		Drawing.DockSurface surface;
+		Surface surface;
 		DockTheme docktheme;
 		
-		surface = new DockSurface (512, 512);
+		surface = new Surface (512, 512);
 		docktheme = new DockTheme ("Test");
-		Drawing.Color color = { 0.5, 0.4, 0.3, 1.0 };
+		Color color = { 0.5, 0.4, 0.3, 1.0 };
 		
 		docktheme.draw_item_progress (surface, 64, color, -1.0);
 		docktheme.draw_item_progress (surface, 64, color, 0);
@@ -399,12 +398,12 @@
 	
 	void drawing_theme_draw_active_glow ()
 	{
-		Drawing.DockSurface surface;
+		Surface surface;
 		DockTheme docktheme;
 		
-		surface = new DockSurface (512, 128);
+		surface = new Surface (512, 128);
 		docktheme = new DockTheme ("Test");
-		Drawing.Color color = { 0.5, 0.4, 0.3, 1.0 };
+		Color color = { 0.5, 0.4, 0.3, 1.0 };
 		
 		docktheme.draw_active_glow (surface, {16, 16, 480, 96}, {16, 16, 80, 80}, color, -0.1, Gtk.PositionType.BOTTOM);
 		docktheme.draw_active_glow (surface, {16, 16, 480, 96}, {16, 16, 80, 80}, color, 0.1, Gtk.PositionType.BOTTOM);
@@ -415,12 +414,12 @@
 	
 	void drawing_theme_create_indicator ()
 	{
-		Drawing.DockSurface surface, surface2;
+		Surface surface, surface2;
 		DockTheme docktheme;
 		
-		surface = new DockSurface (512, 512);
+		surface = new Surface (512, 512);
 		docktheme = new DockTheme ("Test");
-		Drawing.Color color = { 0.5, 0.4, 0.3, 1.0 };
+		Color color = { 0.5, 0.4, 0.3, 1.0 };
 		
 		surface2 = docktheme.create_indicator (-1, color, surface);
 		surface2 = docktheme.create_indicator (64, color, surface);
@@ -429,12 +428,12 @@
 	
 	void drawing_theme_create_urgent_glow ()
 	{
-		Drawing.DockSurface surface, surface2;
+		Surface surface, surface2;
 		DockTheme docktheme;
 		
-		surface = new DockSurface (512, 512);
+		surface = new Surface (512, 512);
 		docktheme = new DockTheme ("Test");
-		Drawing.Color color = { 0.5, 0.4, 0.3, 1.0 };
+		Color color = { 0.5, 0.4, 0.3, 1.0 };
 		
 		surface2 = docktheme.create_urgent_glow (-1, color, surface);
 		surface2 = docktheme.create_urgent_glow (64, color, surface);
@@ -443,11 +442,11 @@
 	
 	void drawing_theme_draw_background ()
 	{
-		Drawing.DockSurface surface, surface2, surface3, surface4, surface5;
+		Surface surface, surface2, surface3, surface4, surface5;
 		DockTheme docktheme;
 		Gdk.Pixbuf pixbuf2, pixbuf3, pixbuf4, pixbuf5;
 		
-		surface = new DockSurface (512, 512);
+		surface = new Surface (512, 512);
 		docktheme = new DockTheme ("Test");
 		docktheme.draw_background (surface);
 		

=== modified file 'tests/Items.vala'
--- tests/Items.vala	2015-05-17 11:04:46 +0000
+++ tests/Items.vala	2015-11-03 12:02:25 +0000
@@ -17,10 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Items;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public static void register_items_tests ()
 	{
@@ -71,12 +70,12 @@
 		assert (item.unique_id () != "");
 		assert (item.unique_id () != item2.unique_id ());
 		
-		var icon = item.get_surface_copy (111, 111, new DockSurface (1, 1));
+		var icon = item.get_surface_copy (111, 111, new Surface (1, 1));
 		assert (icon != null);
 		assert (icon.Width == 111);
 		assert (icon.Height == 111);
 		
-		var icon2 = item.get_surface_copy (111, 111, new DockSurface (1, 1));
+		var icon2 = item.get_surface_copy (111, 111, new Surface (1, 1));
 		assert (icon != null);
 		assert (icon2 != null);
 		assert (icon != icon2);
@@ -90,7 +89,7 @@
 		
 		item = new FileDockItem.with_file (File.new_for_path (Config.DATA_DIR + "/test.desktop"));
 		
-		var icon = item.get_surface_copy (64, 64, new DockSurface (1, 1));
+		var icon = item.get_surface_copy (64, 64, new Surface (1, 1));
 		assert (icon != null);
 		assert (icon.Width == 64);
 		assert (icon.Height == 64);

=== modified file 'tests/Main.vala'
--- tests/Main.vala	2015-04-27 13:39:02 +0000
+++ tests/Main.vala	2015-11-03 12:02:25 +0000
@@ -17,13 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Drawing;
-using Plank.Factories;
-using Plank.Services;
-
-using Plank.Services.Windows;
-
-namespace Plank.Tests
+using Plank;
+
+namespace PlankTests
 {
 	public const string TEST_ICON = Config.DATA_DIR + "/test-icon.svg";
 	public const string TEST_DOCK_NAME = "dock1";

=== modified file 'tests/Preferences.vala'
--- tests/Preferences.vala	2015-04-27 13:39:02 +0000
+++ tests/Preferences.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Services;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public static void register_preferences_tests ()
 	{
@@ -39,7 +39,7 @@
 		public double DoubleSetting { get; set; }
 		public int IntSetting { get; set; }
 		public string StringSetting { get; set; }
-		public Plank.Drawing.Color ColorSetting  { get; set; }
+		public Plank.Color ColorSetting  { get; set; }
 		
 		public TestPreferences (string filename)
 		{
@@ -81,8 +81,8 @@
 
 	void preferences_basics ()
 	{
-		Plank.Drawing.Color color = { 0.3, 0.6, 0.1, 1.0 };
-		Plank.Drawing.Color color2 = { 0.5, 0.3, 0.7, 0.9 };
+		Plank.Color color = { 0.3, 0.6, 0.1, 1.0 };
+		Plank.Color color2 = { 0.5, 0.3, 0.7, 0.9 };
 		
 		var prefs = new TestPreferences ("test_preferences_basics");
 		assert (prefs.BoolSetting == true);

=== modified file 'tests/TestHelper.vala'
--- tests/TestHelper.vala	2015-05-17 11:04:46 +0000
+++ tests/TestHelper.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Items;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public class TestDockItem : DockItem
 	{

=== modified file 'tests/Widgets.vala'
--- tests/Widgets.vala	2015-11-02 13:42:37 +0000
+++ tests/Widgets.vala	2015-11-03 12:02:25 +0000
@@ -17,9 +17,9 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-using Plank.Widgets;
+using Plank;
 
-namespace Plank.Tests
+namespace PlankTests
 {
 	public static void register_widgets_tests ()
 	{
@@ -117,7 +117,7 @@
 		prefs.HideDelay = 100;
 		prefs.Position = Gtk.PositionType.TOP;
 		prefs.Offset = -33;
-		prefs.Theme = Plank.Drawing.Theme.GTK_THEME_NAME;
+		prefs.Theme = Plank.Theme.GTK_THEME_NAME;
 		prefs.Alignment = Gtk.Align.FILL;
 		prefs.ItemsAlignment = Gtk.Align.FILL;
 		prefs.LockItems = true;

=== modified file 'tests/data/test-app.dockitem'
--- tests/data/test-app.dockitem	2013-03-30 08:59:31 +0000
+++ tests/data/test-app.dockitem	2015-11-03 12:02:25 +0000
@@ -1,6 +1,6 @@
 #This file auto-generated by Plank.
 #2013-01-28T20:33:01+0000
 
-[PlankItemsDockItemPreferences]
+[PlankDockItemPreferences]
 #The uri for this item.
 Launcher=%TEST_DATA_DIR%/test.desktop

=== modified file 'tests/data/themes/Test/dock.theme'
--- tests/data/themes/Test/dock.theme	2013-10-01 14:44:00 +0000
+++ tests/data/themes/Test/dock.theme	2015-11-03 12:02:25 +0000
@@ -1,7 +1,7 @@
 #This file auto-generated by Plank.
 #2013-02-02T11:25:31+0000
 
-[PlankDrawingTheme]
+[PlankTheme]
 #The roundness of the top corners.
 TopRoundness=4
 #The roundness of the bottom corners.
@@ -17,7 +17,7 @@
 #The color (RGBA) of the inner stroke.
 InnerStrokeColor=255;;255;;255;;255
 
-[PlankDrawingDockTheme]
+[PlankDockTheme]
 #The padding on the left/right dock edges, in tenths of a percent of IconSize.
 HorizPadding=0
 #The padding on the top dock edge, in tenths of a percent of IconSize.

=== modified file 'tests/gmock/color.cpp'
--- tests/gmock/color.cpp	2015-07-25 14:52:26 +0000
+++ tests/gmock/color.cpp	2015-11-03 12:02:25 +0000
@@ -23,571 +23,571 @@
 
 TEST (color, set_hsv_zero_1)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	double h = 0;
 	double s = 0;
 	double v = 0;
-	plank_drawing_color_set_hsv (c, h, s, v);
+	plank_color_set_hsv (c, h, s, v);
 
-	EXPECT_DOUBLE_EQ (h, plank_drawing_color_get_hue (c));
-	EXPECT_DOUBLE_EQ (s, plank_drawing_color_get_sat (c));
-	EXPECT_DOUBLE_EQ (v, plank_drawing_color_get_val (c));
+	EXPECT_DOUBLE_EQ (h, plank_color_get_hue (c));
+	EXPECT_DOUBLE_EQ (s, plank_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (v, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_hsv_inrange)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	double h = 100;
 	double s = 0.5;
 	double v = 0.5;
-	plank_drawing_color_set_hsv (c, h, s, v);
+	plank_color_set_hsv (c, h, s, v);
 
-	EXPECT_NEAR (h, plank_drawing_color_get_hue (c), 0.0001);
-	EXPECT_NEAR (s, plank_drawing_color_get_sat (c), 0.0001);
-	EXPECT_NEAR (v, plank_drawing_color_get_val (c), 0.0001);
+	EXPECT_NEAR (h, plank_color_get_hue (c), 0.0001);
+	EXPECT_NEAR (s, plank_color_get_sat (c), 0.0001);
+	EXPECT_NEAR (v, plank_color_get_val (c), 0.0001);
 
 	delete (c);
 }
 
 TEST (color, set_hsv_minus_value)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	double h = -1;
 	double s = -1;
 	double v = -1;
-	plank_drawing_color_set_hsv (c, h, s, v);
+	plank_color_set_hsv (c, h, s, v);
 
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_hue (c));
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_sat (c));
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_val (c));
+	EXPECT_DOUBLE_EQ (0, plank_color_get_hue (c));
+	EXPECT_DOUBLE_EQ (0, plank_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (0, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_hsv_max)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	double h = 40000;
 	double s = 50000;
 	double v = 60000;
-	plank_drawing_color_set_hsv (c, h, s, v);
+	plank_color_set_hsv (c, h, s, v);
 
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_hue (c));
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_sat (c));
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_val (c));
+	EXPECT_DOUBLE_EQ (0, plank_color_get_hue (c));
+	EXPECT_DOUBLE_EQ (0, plank_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (0, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_hue_in_range)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
-	plank_drawing_color_set_hue (c, 10);
-	EXPECT_NEAR (10, plank_drawing_color_get_hue (c), 0.0001);
+	plank_color_set_hue (c, 10);
+	EXPECT_NEAR (10, plank_color_get_hue (c), 0.0001);
 	double hue_value = 150;
-	double hue_current = plank_drawing_color_get_hue (c);
-	plank_drawing_color_set_hue (c, hue_value);
+	double hue_current = plank_color_get_hue (c);
+	plank_color_set_hue (c, hue_value);
 
-	EXPECT_EQ (hue_value, plank_drawing_color_get_hue (c));
-	EXPECT_NE (hue_current, plank_drawing_color_get_hue (c));
+	EXPECT_EQ (hue_value, plank_color_get_hue (c));
+	EXPECT_NE (hue_current, plank_color_get_hue (c));
 
 	delete (c);
 }
 
 TEST (color, set_hue_zero)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
-	plank_drawing_color_set_hue (c, 5);
+	plank_color_set_hue (c, 5);
 	double hue_zero = 0;
-	double hue_current = plank_drawing_color_get_hue (c);
-	plank_drawing_color_set_hue (c, hue_zero);
+	double hue_current = plank_color_get_hue (c);
+	plank_color_set_hue (c, hue_zero);
 
-	EXPECT_DOUBLE_EQ (hue_zero, plank_drawing_color_get_hue (c));
-	EXPECT_NE (hue_current, plank_drawing_color_get_hue (c));
+	EXPECT_DOUBLE_EQ (hue_zero, plank_color_get_hue (c));
+	EXPECT_NE (hue_current, plank_color_get_hue (c));
 
 	delete (c);
 }
 
 TEST (color, set_hue_out_of_range)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	double hue_value = 500;
-	double hue_current = plank_drawing_color_get_hue (c);
-	plank_drawing_color_set_hue (c, hue_value);
+	double hue_current = plank_color_get_hue (c);
+	plank_color_set_hue (c, hue_value);
 
-	EXPECT_NE (hue_value, plank_drawing_color_get_hue (c));
-	EXPECT_DOUBLE_EQ (hue_current, plank_drawing_color_get_hue (c));
+	EXPECT_NE (hue_value, plank_color_get_hue (c));
+	EXPECT_DOUBLE_EQ (hue_current, plank_color_get_hue (c));
 
 	delete (c);
 }
 
 TEST (color, add_hue)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double hue_value = 50;
-	plank_drawing_color_set_hue (c, hue_value);
-
-	EXPECT_DOUBLE_EQ (hue_value, plank_drawing_color_get_hue (c));
-	plank_drawing_color_add_hue (c, hue_value);
-
-	EXPECT_NE (hue_value, plank_drawing_color_get_hue (c));
-	EXPECT_DOUBLE_EQ (2 * hue_value, plank_drawing_color_get_hue (c));
+	plank_color_set_hue (c, hue_value);
+
+	EXPECT_DOUBLE_EQ (hue_value, plank_color_get_hue (c));
+	plank_color_add_hue (c, hue_value);
+
+	EXPECT_NE (hue_value, plank_color_get_hue (c));
+	EXPECT_DOUBLE_EQ (2 * hue_value, plank_color_get_hue (c));
 
 	delete (c);
 }
 
 TEST (color, add_hue_shift_more_than_one_rad)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double hue_value = 200;
-	plank_drawing_color_set_hue (c, hue_value);
-
-	EXPECT_DOUBLE_EQ (hue_value, plank_drawing_color_get_hue (c));
-	plank_drawing_color_add_hue (c, hue_value);
-
-	EXPECT_NE (hue_value, plank_drawing_color_get_hue (c));
-	EXPECT_DOUBLE_EQ ((2 * hue_value - 360), plank_drawing_color_get_hue (c));
+	plank_color_set_hue (c, hue_value);
+
+	EXPECT_DOUBLE_EQ (hue_value, plank_color_get_hue (c));
+	plank_color_add_hue (c, hue_value);
+
+	EXPECT_NE (hue_value, plank_color_get_hue (c));
+	EXPECT_DOUBLE_EQ ((2 * hue_value - 360), plank_color_get_hue (c));
 
 	delete (c);
 }
 
 TEST (color, set_sat_zero)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_zero = 0;
-	double sat_old = plank_drawing_color_get_sat (c);
-	plank_drawing_color_set_sat (c, sat_zero);
+	double sat_old = plank_color_get_sat (c);
+	plank_color_set_sat (c, sat_zero);
 
-	EXPECT_DOUBLE_EQ (sat_zero, plank_drawing_color_get_sat (c));
-	EXPECT_NE (sat_old, plank_drawing_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (sat_zero, plank_color_get_sat (c));
+	EXPECT_NE (sat_old, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, set_sat_in_range)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.5);
+	plank_color_set_hsv (c, 100, 0.1, 0.5);
 
 	double sat_in_range = 0.5; //50%
-	double sat_old = plank_drawing_color_get_sat (c);
-	plank_drawing_color_set_sat (c, sat_in_range);
+	double sat_old = plank_color_get_sat (c);
+	plank_color_set_sat (c, sat_in_range);
 
-	EXPECT_DOUBLE_EQ (sat_in_range, plank_drawing_color_get_sat (c));
-	EXPECT_NE (sat_old, plank_drawing_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (sat_in_range, plank_color_get_sat (c));
+	EXPECT_NE (sat_old, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, set_sat_out_of_range)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.5);
+	plank_color_set_hsv (c, 100, 0.1, 0.5);
 
 	double sat_out_range = 5; // 500%
-	double sat_old = plank_drawing_color_get_sat (c);
-	plank_drawing_color_set_sat (c, sat_out_range);
+	double sat_old = plank_color_get_sat (c);
+	plank_color_set_sat (c, sat_out_range);
 
-	EXPECT_NE (sat_out_range, plank_drawing_color_get_sat (c));
-	EXPECT_DOUBLE_EQ (sat_old, plank_drawing_color_get_sat (c));
+	EXPECT_NE (sat_out_range, plank_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (sat_old, plank_color_get_sat (c));
 	
 	delete (c);
 }
 
 TEST (color, set_min_sat)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.5);
+	plank_color_set_hsv (c, 100, 0.1, 0.5);
 
 	double sat_value = 0.5; //50%
-	plank_drawing_color_set_min_sat (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
+	plank_color_set_min_sat (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, set_min_sat_changed)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.5);
+	plank_color_set_hsv (c, 100, 0.1, 0.5);
 
 	double sat_value = 0.1; //10%
 	double sat_min = 0.5; //50%
-	plank_drawing_color_set_min_sat (c, sat_min);
-	EXPECT_DOUBLE_EQ (sat_min, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_sat (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_min_sat (c, sat_min);
-	EXPECT_NE (sat_value, plank_drawing_color_get_sat (c));
-	EXPECT_DOUBLE_EQ (sat_min, plank_drawing_color_get_sat (c));
+	plank_color_set_min_sat (c, sat_min);
+	EXPECT_DOUBLE_EQ (sat_min, plank_color_get_sat (c));
+
+	plank_color_set_sat (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
+
+	plank_color_set_min_sat (c, sat_min);
+	EXPECT_NE (sat_value, plank_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (sat_min, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, set_max_sat)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_value = 0.1; //10%
-	plank_drawing_color_set_max_sat (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
+	plank_color_set_max_sat (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, set_max_sat_changed)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_value = 0.5; //50%
 	double sat_max = 0.2; //20%	
-	plank_drawing_color_set_max_sat (c, sat_max);
-	EXPECT_DOUBLE_EQ (sat_max, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_sat (c, sat_value);	
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_max_sat (c, sat_max);
-	EXPECT_NE (sat_value, plank_drawing_color_get_sat (c));
-	EXPECT_DOUBLE_EQ (sat_max, plank_drawing_color_get_sat (c));
+	plank_color_set_max_sat (c, sat_max);
+	EXPECT_DOUBLE_EQ (sat_max, plank_color_get_sat (c));
+
+	plank_color_set_sat (c, sat_value);	
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
+
+	plank_color_set_max_sat (c, sat_max);
+	EXPECT_NE (sat_value, plank_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (sat_max, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, set_max_and_min_sat)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_value = 0.25; //25%
 	double sat_min = 0.5; //50%
 	double sat_max = 0.1; //10%
-	plank_drawing_color_set_max_sat (c, sat_max);
-	EXPECT_DOUBLE_EQ (sat_max, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_min_sat (c, sat_min);
-	EXPECT_DOUBLE_EQ (sat_min, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_sat (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
+	plank_color_set_max_sat (c, sat_max);
+	EXPECT_DOUBLE_EQ (sat_max, plank_color_get_sat (c));
+
+	plank_color_set_min_sat (c, sat_min);
+	EXPECT_DOUBLE_EQ (sat_min, plank_color_get_sat (c));
+
+	plank_color_set_sat (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, multiply_sat)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_value = 0.2; //20%
 	double sat_multiply = 2;
-	plank_drawing_color_set_sat (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
+	plank_color_set_sat (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
 
-	plank_drawing_color_multiply_sat (c, sat_multiply);
+	plank_color_multiply_sat (c, sat_multiply);
 	// expect equal with sat_value * sat_multiply.
-	EXPECT_DOUBLE_EQ (sat_value * sat_multiply, plank_drawing_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (sat_value * sat_multiply, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, multiply_sat_false)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_value = 0.8; //20%
 	double sat_multiply = 2;
-	plank_drawing_color_set_sat (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_sat (c));
+	plank_color_set_sat (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_sat (c));
 
-	plank_drawing_color_multiply_sat (c, sat_multiply);
+	plank_color_multiply_sat (c, sat_multiply);
 	// expect 1 because 1 is the max
-	EXPECT_DOUBLE_EQ (1, plank_drawing_color_get_sat (c));
+	EXPECT_DOUBLE_EQ (1, plank_color_get_sat (c));
 
 	delete (c);
 }
 
 TEST (color, darken_by_sat)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat = 0.2; //20%
 	double value = 0.8; //80%
 	double sat_darken_amount = 0.2;
-	plank_drawing_color_set_sat (c, sat);
-	EXPECT_DOUBLE_EQ (sat, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_val (c, value);
-	EXPECT_DOUBLE_EQ (value, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_darken_by_sat (c, sat_darken_amount);
-	EXPECT_NEAR (0.2 , plank_drawing_color_get_sat (c), 0.0001);
-	EXPECT_NEAR (value - 0.04, plank_drawing_color_get_val (c), 0.0001);
+	plank_color_set_sat (c, sat);
+	EXPECT_DOUBLE_EQ (sat, plank_color_get_sat (c));
+
+	plank_color_set_val (c, value);
+	EXPECT_DOUBLE_EQ (value, plank_color_get_val (c));
+
+	plank_color_darken_by_sat (c, sat_darken_amount);
+	EXPECT_NEAR (0.2 , plank_color_get_sat (c), 0.0001);
+	EXPECT_NEAR (value - 0.04, plank_color_get_val (c), 0.0001);
 
 	delete (c);
 }
 
 TEST (color, darken_by_sat_false)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat = 0.8; //20%
 	double value = 0.2; //80%
 	double sat_darken_amount = 0.8;
-	plank_drawing_color_set_sat (c, sat);
-	EXPECT_DOUBLE_EQ (sat, plank_drawing_color_get_sat (c));
-
-	plank_drawing_color_set_val (c, value);
-	EXPECT_DOUBLE_EQ (value, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_darken_by_sat (c, sat_darken_amount);
-	EXPECT_DOUBLE_EQ (0, plank_drawing_color_get_val (c));
+	plank_color_set_sat (c, sat);
+	EXPECT_DOUBLE_EQ (sat, plank_color_get_sat (c));
+
+	plank_color_set_val (c, value);
+	EXPECT_DOUBLE_EQ (value, plank_color_get_val (c));
+
+	plank_color_darken_by_sat (c, sat_darken_amount);
+	EXPECT_DOUBLE_EQ (0, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_value_zero)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
-	plank_drawing_color_set_val (c, 0.5);
+	plank_color_set_val (c, 0.5);
 	double value_zero = 0;
-	double value_old = plank_drawing_color_get_val (c);
-	plank_drawing_color_set_val (c, value_zero);
+	double value_old = plank_color_get_val (c);
+	plank_color_set_val (c, value_zero);
 
 	// expect 0 and not equal with the old value.
-	EXPECT_DOUBLE_EQ (value_zero, plank_drawing_color_get_val (c));
-	EXPECT_NE (value_old, plank_drawing_color_get_val (c));
+	EXPECT_DOUBLE_EQ (value_zero, plank_color_get_val (c));
+	EXPECT_NE (value_old, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_value_in_range)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.1);
+	plank_color_set_hsv (c, 100, 0.1, 0.1);
 
 	double value_in_range = 0.5; //50%
-	double value_old = plank_drawing_color_get_val (c);
-	plank_drawing_color_set_val (c, value_in_range);
+	double value_old = plank_color_get_val (c);
+	plank_color_set_val (c, value_in_range);
 
 	// expect 50 and not equal with the old value.
-	EXPECT_DOUBLE_EQ (value_in_range, plank_drawing_color_get_val (c));
-	EXPECT_NE (value_old, plank_drawing_color_get_val (c));
+	EXPECT_DOUBLE_EQ (value_in_range, plank_color_get_val (c));
+	EXPECT_NE (value_old, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_value_out_of_range)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
-	plank_drawing_color_set_val (c, 5);
+	plank_color_set_val (c, 5);
 	double vaule_out_range = 500; // 500%
-	double value_old = plank_drawing_color_get_val (c);
-	plank_drawing_color_set_val (c, vaule_out_range);
+	double value_old = plank_color_get_val (c);
+	plank_color_set_val (c, vaule_out_range);
 
 	// expect equal with the old value not 500.
-	EXPECT_NE (vaule_out_range, plank_drawing_color_get_val (c));
-	EXPECT_DOUBLE_EQ (value_old, plank_drawing_color_get_val (c));
+	EXPECT_NE (vaule_out_range, plank_color_get_val (c));
+	EXPECT_DOUBLE_EQ (value_old, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_min_val)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.1);
+	plank_color_set_hsv (c, 100, 0.1, 0.1);
 
 	double value = 0.5; //50%
-	plank_drawing_color_set_min_val (c, value);
-	EXPECT_DOUBLE_EQ (value, plank_drawing_color_get_val (c));
+	plank_color_set_min_val (c, value);
+	EXPECT_DOUBLE_EQ (value, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_min_val_changed)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.1, 0.1);
+	plank_color_set_hsv (c, 100, 0.1, 0.1);
 
 	double value = 0.1; //10%
 	double val_min = 0.5; //50%
-	plank_drawing_color_set_min_val (c, val_min);
-	EXPECT_DOUBLE_EQ (val_min, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_set_val (c, value);
-	EXPECT_DOUBLE_EQ (value, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_set_min_val (c, val_min);
-	EXPECT_NE (value, plank_drawing_color_get_val (c));
-	EXPECT_DOUBLE_EQ (val_min, plank_drawing_color_get_val (c));
+	plank_color_set_min_val (c, val_min);
+	EXPECT_DOUBLE_EQ (val_min, plank_color_get_val (c));
+
+	plank_color_set_val (c, value);
+	EXPECT_DOUBLE_EQ (value, plank_color_get_val (c));
+
+	plank_color_set_min_val (c, val_min);
+	EXPECT_NE (value, plank_color_get_val (c));
+	EXPECT_DOUBLE_EQ (val_min, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_max_val)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double sat_value = 0.1; //10%
-	plank_drawing_color_set_max_val (c, sat_value);
-	EXPECT_DOUBLE_EQ (sat_value, plank_drawing_color_get_val (c));
+	plank_color_set_max_val (c, sat_value);
+	EXPECT_DOUBLE_EQ (sat_value, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_max_val_changed)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double value = 0.5; //50%
 	double val_max = 0.2; //20%
-	plank_drawing_color_set_max_val (c, val_max);
-	EXPECT_DOUBLE_EQ (val_max, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_set_val (c, value);
-	EXPECT_DOUBLE_EQ (value, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_set_max_val (c, val_max);
-	EXPECT_NE (value, plank_drawing_color_get_val (c));
-	EXPECT_DOUBLE_EQ (val_max, plank_drawing_color_get_val (c));
+	plank_color_set_max_val (c, val_max);
+	EXPECT_DOUBLE_EQ (val_max, plank_color_get_val (c));
+
+	plank_color_set_val (c, value);
+	EXPECT_DOUBLE_EQ (value, plank_color_get_val (c));
+
+	plank_color_set_max_val (c, val_max);
+	EXPECT_NE (value, plank_color_get_val (c));
+	EXPECT_DOUBLE_EQ (val_max, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, set_max_and_min_val)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double value = 0.25; //25%
 	double val_min = 0.5; //50%
 	double val_max = 0.1; //10%
-	plank_drawing_color_set_max_val (c, val_max);
-	EXPECT_DOUBLE_EQ (val_max, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_set_min_val (c, val_min);
-	EXPECT_DOUBLE_EQ (val_min, plank_drawing_color_get_val (c));
-
-	plank_drawing_color_set_val (c, value);
-	EXPECT_DOUBLE_EQ (value, plank_drawing_color_get_val (c));
+	plank_color_set_max_val (c, val_max);
+	EXPECT_DOUBLE_EQ (val_max, plank_color_get_val (c));
+
+	plank_color_set_min_val (c, val_min);
+	EXPECT_DOUBLE_EQ (val_min, plank_color_get_val (c));
+
+	plank_color_set_val (c, value);
+	EXPECT_DOUBLE_EQ (value, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, brighten_val)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);
 
 	double value = 0.25; //25%
-	plank_drawing_color_brighten_val (c,value);
-	EXPECT_DOUBLE_EQ (0.625, plank_drawing_color_get_val (c));
+	plank_color_brighten_val (c,value);
+	EXPECT_DOUBLE_EQ (0.625, plank_color_get_val (c));
 
 	delete (c);
 }
 
 TEST (color, darken_val)
 {
-	PlankDrawingColor* c = new PlankDrawingColor ();
+	PlankColor* c = new PlankColor ();
 
 	//init color with value's
-	plank_drawing_color_set_hsv (c, 100, 0.5, 0.5);
+	plank_color_set_hsv (c, 100, 0.5, 0.5);