34 files changed, 7 insertions, 7 deletions
diff --git a/examples/data/uzbl/bookmarks b/examples/data/bookmarks
index 13fcd48..13fcd48 100644
--- a/examples/data/uzbl/bookmarks
+++ b/examples/data/bookmarks
diff --git a/examples/data/uzbl/forms/bbs.archlinux.org b/examples/data/forms/bbs.archlinux.org
index 73c1539..73c1539 100644
--- a/examples/data/uzbl/forms/bbs.archlinux.org
+++ b/examples/data/forms/bbs.archlinux.org
diff --git a/examples/data/uzbl/plugins/bind.py b/examples/data/plugins/bind.py
index 9e09337..9e09337 100644
--- a/examples/data/uzbl/plugins/bind.py
+++ b/examples/data/plugins/bind.py
diff --git a/examples/data/uzbl/plugins/cmd_expand.py b/examples/data/plugins/cmd_expand.py
index 3f6ae2b..3f6ae2b 100644
--- a/examples/data/uzbl/plugins/cmd_expand.py
+++ b/examples/data/plugins/cmd_expand.py
diff --git a/examples/data/uzbl/plugins/completion.py b/examples/data/plugins/completion.py
index 8cea203..8cea203 100644
--- a/examples/data/uzbl/plugins/completion.py
+++ b/examples/data/plugins/completion.py
diff --git a/examples/data/uzbl/plugins/config.py b/examples/data/plugins/config.py
index 4a848a3..4a848a3 100644
--- a/examples/data/uzbl/plugins/config.py
+++ b/examples/data/plugins/config.py
diff --git a/examples/data/uzbl/plugins/keycmd.py b/examples/data/plugins/keycmd.py
index c119077..c119077 100644
--- a/examples/data/uzbl/plugins/keycmd.py
+++ b/examples/data/plugins/keycmd.py
diff --git a/examples/data/uzbl/plugins/mode.py b/examples/data/plugins/mode.py
index 54d865a..54d865a 100644
--- a/examples/data/uzbl/plugins/mode.py
+++ b/examples/data/plugins/mode.py
diff --git a/examples/data/uzbl/plugins/on_event.py b/examples/data/plugins/on_event.py
index b9c504a..b9c504a 100644
--- a/examples/data/uzbl/plugins/on_event.py
+++ b/examples/data/plugins/on_event.py
diff --git a/examples/data/uzbl/plugins/plugin_template.py b/examples/data/plugins/plugin_template.py
index 565a999..565a999 100644
--- a/examples/data/uzbl/plugins/plugin_template.py
+++ b/examples/data/plugins/plugin_template.py
diff --git a/examples/data/uzbl/plugins/progress_bar.py b/examples/data/plugins/progress_bar.py
index 89ba175..89ba175 100644
--- a/examples/data/uzbl/plugins/progress_bar.py
+++ b/examples/data/plugins/progress_bar.py
diff --git a/examples/data/uzbl/scripts/cookies.sh b/examples/data/scripts/cookies.sh
index ee2ce51..ee2ce51 100755
--- a/examples/data/uzbl/scripts/cookies.sh
+++ b/examples/data/scripts/cookies.sh
diff --git a/examples/data/uzbl/scripts/download.sh b/examples/data/scripts/download.sh
index 1c7d039..1c7d039 100755
--- a/examples/data/uzbl/scripts/download.sh
+++ b/examples/data/scripts/download.sh
diff --git a/examples/data/uzbl/scripts/extedit.js b/examples/data/scripts/extedit.js
index 8ed346d..8ed346d 100644
--- a/examples/data/uzbl/scripts/extedit.js
+++ b/examples/data/scripts/extedit.js
diff --git a/examples/data/uzbl/scripts/follow_Numbers.js b/examples/data/scripts/follow_Numbers.js
index 00b279e..00b279e 100644
--- a/examples/data/uzbl/scripts/follow_Numbers.js
+++ b/examples/data/scripts/follow_Numbers.js
diff --git a/examples/data/uzbl/scripts/follow_Numbers_Strings.js b/examples/data/scripts/follow_Numbers_Strings.js
index e50da5d..e50da5d 100644
--- a/examples/data/uzbl/scripts/follow_Numbers_Strings.js
+++ b/examples/data/scripts/follow_Numbers_Strings.js
diff --git a/examples/data/uzbl/scripts/formfiller.pl b/examples/data/scripts/formfiller.pl
index 23da347..74dcc80 100755
--- a/examples/data/uzbl/scripts/formfiller.pl
+++ b/examples/data/scripts/formfiller.pl
@@ -10,9 +10,9 @@
 # new:  fetch new file
 
 # usage example:
-# bind LL = spawn /usr/share/uzbl/examples/scripts/formfiller.pl load
-# bind LN = spawn /usr/share/uzbl/examples/scripts/formfiller.pl new
-# bind LE = spawn /usr/share/uzbl/examples/scripts/formfiller.pl edit
+# bind LL = spawn /usr/share/uzbl/examples/data/scripts/formfiller.pl load
+# bind LN = spawn /usr/share/uzbl/examples/data/scripts/formfiller.pl new
+# bind LE = spawn /usr/share/uzbl/examples/data/scripts/formfiller.pl edit
 
 use strict;
 use warnings;
diff --git a/examples/data/uzbl/scripts/formfiller.sh b/examples/data/scripts/formfiller.sh
index 10afaba..10afaba 100755
--- a/examples/data/uzbl/scripts/formfiller.sh
+++ b/examples/data/scripts/formfiller.sh
diff --git a/examples/data/uzbl/scripts/hint.js b/examples/data/scripts/hint.js
index ec7f1e2..ec7f1e2 100644
--- a/examples/data/uzbl/scripts/hint.js
+++ b/examples/data/scripts/hint.js
diff --git a/examples/data/uzbl/scripts/history.sh b/examples/data/scripts/history.sh
index 7c83aa6..7c83aa6 100755
--- a/examples/data/uzbl/scripts/history.sh
+++ b/examples/data/scripts/history.sh
diff --git a/examples/data/uzbl/scripts/insert_bookmark.sh b/examples/data/scripts/insert_bookmark.sh
index c34e7db..c34e7db 100755
--- a/examples/data/uzbl/scripts/insert_bookmark.sh
+++ b/examples/data/scripts/insert_bookmark.sh
diff --git a/examples/data/uzbl/scripts/instance-select-wmii.sh b/examples/data/scripts/instance-select-wmii.sh
index 2bf13ba..2bf13ba 100755
--- a/examples/data/uzbl/scripts/instance-select-wmii.sh
+++ b/examples/data/scripts/instance-select-wmii.sh
diff --git a/examples/data/uzbl/scripts/linkfollow.js b/examples/data/scripts/linkfollow.js
index 0eb629b..3109cda 100644
--- a/examples/data/uzbl/scripts/linkfollow.js
+++ b/examples/data/scripts/linkfollow.js
@@ -3,14 +3,14 @@
 //
 // first, it needs to be loaded before every time it is used.
 // One way would be to use the load_commit_handler:
-// set load_commit_handler = sh 'echo "script /usr/share/uzbl/examples/scripts/linkfollow.js" > "$4"'
+// set load_commit_handler = sh 'echo "script /usr/share/uzbl/examples/data/scripts/linkfollow.js" > "$4"'
 //
 // when script is loaded, it can be invoked with
 // bind f* = js hints.set("%s",   hints.open)
 // bind f_ = js hints.follow("%s",hints.open)
 //
 // At the moment, it may be useful to have way of forcing uzbl to load the script
-// bind :lf = script /usr/share/uzbl/examples/scripts/linkfollow.js
+// bind :lf = script /usr/share/uzbl/examples/data/scripts/linkfollow.js
 //
 // The default style for the hints are pretty ugly, so it is recommended to add the following
 // to config file
diff --git a/examples/data/uzbl/scripts/load_url_from_bookmarks.sh b/examples/data/scripts/load_url_from_bookmarks.sh
index 1e9f9e7..1e9f9e7 100755
--- a/examples/data/uzbl/scripts/load_url_from_bookmarks.sh
+++ b/examples/data/scripts/load_url_from_bookmarks.sh
diff --git a/examples/data/uzbl/scripts/load_url_from_history.sh b/examples/data/scripts/load_url_from_history.sh
index 62e02ac..62e02ac 100755
--- a/examples/data/uzbl/scripts/load_url_from_history.sh
+++ b/examples/data/scripts/load_url_from_history.sh
diff --git a/examples/data/uzbl/scripts/scheme.py b/examples/data/scripts/scheme.py
index 0916466..0916466 100755
--- a/examples/data/uzbl/scripts/scheme.py
+++ b/examples/data/scripts/scheme.py
diff --git a/examples/data/uzbl/scripts/scroll-percentage.js b/examples/data/scripts/scroll-percentage.js
index c9a51aa..c9a51aa 100644
--- a/examples/data/uzbl/scripts/scroll-percentage.js
+++ b/examples/data/scripts/scroll-percentage.js
diff --git a/examples/data/uzbl/scripts/session.sh b/examples/data/scripts/session.sh
index 1059b5e..1059b5e 100755
--- a/examples/data/uzbl/scripts/session.sh
+++ b/examples/data/scripts/session.sh
diff --git a/examples/data/uzbl/scripts/uzbl-cookie-daemon b/examples/data/scripts/uzbl-cookie-daemon
index fde8b8e..fde8b8e 100755
--- a/examples/data/uzbl/scripts/uzbl-cookie-daemon
+++ b/examples/data/scripts/uzbl-cookie-daemon
diff --git a/examples/data/uzbl/scripts/uzbl-event-manager b/examples/data/scripts/uzbl-event-manager
index b3fdb3c..99b215a 100755
--- a/examples/data/uzbl/scripts/uzbl-event-manager
+++ b/examples/data/scripts/uzbl-event-manager
@@ -74,7 +74,7 @@ CONFIG = {
     'plugins_ignore':  [],
 
     'plugin_dirs':     [os.path.join(DATA_DIR, 'plugins/'),
-        os.path.join(PREFIX, 'share/uzbl/examples/data/uzbl/plugins/')],
+        os.path.join(PREFIX, 'share/uzbl/examples/data/plugins/')],
 
     'server_socket':   os.path.join(CACHE_DIR, 'event_daemon'),
     'pid_file':        os.path.join(CACHE_DIR, 'event_daemon.pid'),
diff --git a/examples/data/uzbl/scripts/uzbl-tabbed b/examples/data/scripts/uzbl-tabbed
index 5d1a9f8..7bd90d5 100755
--- a/examples/data/uzbl/scripts/uzbl-tabbed
+++ b/examples/data/scripts/uzbl-tabbed
@@ -562,7 +562,7 @@ class UzblTabbed:
             self.window.set_icon(gtk.gdk.pixbuf_new_from_file(icon_path))
 
         else:
-            icon_path = '/usr/share/uzbl/examples/data/uzbl/uzbl.png'
+            icon_path = '/usr/share/uzbl/examples/data/uzbl.png'
             if os.path.exists(icon_path):
                 self.window.set_icon(gtk.gdk.pixbuf_new_from_file(icon_path))
 
diff --git a/examples/data/uzbl/scripts/uzblcat b/examples/data/scripts/uzblcat
index e955608..e955608 100755
--- a/examples/data/uzbl/scripts/uzblcat
+++ b/examples/data/scripts/uzblcat
diff --git a/examples/data/uzbl/style.css b/examples/data/style.css
index f9b111e..f9b111e 100644
--- a/examples/data/uzbl/style.css
+++ b/examples/data/style.css
diff --git a/examples/data/uzbl/uzbl.png b/examples/data/uzbl.png
index 773ea84..773ea84 100644
--- a/examples/data/uzbl/uzbl.png
+++ b/examples/data/uzbl.png