diff --git a/aguignard-ppa-natty.list b/aguignard-ppa-natty.list
deleted file mode 100644
index 80616ac..0000000
--- a/aguignard-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/aguignard/ppa/ubuntu natty main
diff --git a/aguignard-ppa-oneiric.list b/aguignard-ppa-oneiric.list
new file mode 100644
index 0000000..0c96b2a
--- /dev/null
+++ b/aguignard-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/aguignard/ppa/ubuntu oneiric main
diff --git a/blueman-ppa-natty.list b/blueman-ppa-natty.list
deleted file mode 100644
index 8c80624..0000000
--- a/blueman-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/blueman/ppa/ubuntu natty main
diff --git a/blueman-ppa-oneiric.list b/blueman-ppa-oneiric.list
new file mode 100644
index 0000000..f77cf60
--- /dev/null
+++ b/blueman-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/blueman/ppa/ubuntu oneiric main
diff --git a/bodiltv-ppa-natty.list b/bodiltv-ppa-natty.list
deleted file mode 100644
index c6588ca..0000000
--- a/bodiltv-ppa-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/bodiltv/ppa/ubuntu natty main
-deb-src http://ppa.launchpad.net/bodiltv/ppa/ubuntu natty main
diff --git a/bodiltv-ppa-oneiric.list b/bodiltv-ppa-oneiric.list
new file mode 100644
index 0000000..707c772
--- /dev/null
+++ b/bodiltv-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/bodiltv/ppa/ubuntu oneiric main
diff --git a/bzr-beta-ppa-ppa-natty.list b/bzr-beta-ppa-ppa-natty.list
deleted file mode 100644
index 56e6562..0000000
--- a/bzr-beta-ppa-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/bzr-beta-ppa/ppa/ubuntu natty main
diff --git a/bzr-ppa-natty.list b/bzr-ppa-natty.list
deleted file mode 100644
index c4783ca..0000000
--- a/bzr-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/bzr/ppa/ubuntu natty main
diff --git a/bzr-ppa-oneiric.list b/bzr-ppa-oneiric.list
new file mode 100644
index 0000000..ada05b7
--- /dev/null
+++ b/bzr-ppa-oneiric.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/bzr/ppa/ubuntu oneiric main
+deb http://ppa.launchpad.net/bzr/beta/ubuntu oneiric main
diff --git a/c-korn-ppa-natty.list b/c-korn-ppa-natty.list
deleted file mode 100644
index b4ebdbc..0000000
--- a/c-korn-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/c-korn/ppa/ubuntu natty main
diff --git a/canonical-dx-team-une-maverick.list b/canonical-dx-team-une-maverick.list
deleted file mode 100644
index 6012219..0000000
--- a/canonical-dx-team-une-maverick.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/canonical-dx-team/une/ubuntu maverick main
diff --git a/cdekter-ppa-natty.list b/cdekter-ppa-natty.list
deleted file mode 100644
index f49ac4e..0000000
--- a/cdekter-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/cdekter/ppa/ubuntu natty main
diff --git a/cdekter-ppa-oneiric.list b/cdekter-ppa-oneiric.list
new file mode 100644
index 0000000..4ccb8e7
--- /dev/null
+++ b/cdekter-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/cdekter/ppa/ubuntu oneiric main
diff --git a/chris-lea-node.js-oneiric.list b/chris-lea-node.js-oneiric.list
new file mode 100644
index 0000000..053fb42
--- /dev/null
+++ b/chris-lea-node.js-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu oneiric main
diff --git a/chris-lea-node_js-natty.list b/chris-lea-node_js-natty.list
deleted file mode 100644
index 2fb35c9..0000000
--- a/chris-lea-node_js-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu natty main
-# deb-src http://ppa.launchpad.net/chris-lea/node.js/ubuntu natty main
diff --git a/chromium-daily-beta-natty.list b/chromium-daily-beta-natty.list
deleted file mode 100644
index 3bc0cd3..0000000
--- a/chromium-daily-beta-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/chromium-daily/beta/ubuntu natty main
diff --git a/chromium-daily-beta-oneiric.list b/chromium-daily-beta-oneiric.list
new file mode 100644
index 0000000..4eb9c5a
--- /dev/null
+++ b/chromium-daily-beta-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/chromium-daily/beta/ubuntu oneiric main
diff --git a/chromium-daily-dev-natty.list b/chromium-daily-dev-natty.list
deleted file mode 100644
index 478816e..0000000
--- a/chromium-daily-dev-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/chromium-daily/dev/ubuntu natty main
diff --git a/chromium-daily-dev-oneiric.list b/chromium-daily-dev-oneiric.list
new file mode 100644
index 0000000..8272aa1
--- /dev/null
+++ b/chromium-daily-dev-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/chromium-daily/dev/ubuntu oneiric main
diff --git a/chromium-daily-ppa-natty.list b/chromium-daily-ppa-natty.list
deleted file mode 100644
index 41e7d92..0000000
--- a/chromium-daily-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/chromium-daily/ppa/ubuntu natty main
diff --git a/chromium-daily-ppa-oneiric.list b/chromium-daily-ppa-oneiric.list
new file mode 100644
index 0000000..0deaed9
--- /dev/null
+++ b/chromium-daily-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/chromium-daily/ppa/ubuntu oneiric main
diff --git a/cjsmo-ppa-natty.list b/cjsmo-ppa-natty.list
deleted file mode 100644
index d1778ec..0000000
--- a/cjsmo-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/cjsmo/ppa/ubuntu natty main
diff --git a/conduit-ppa-karmic.list b/conduit-ppa-karmic.list
deleted file mode 100644
index 079ae61..0000000
--- a/conduit-ppa-karmic.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/conduit/ppa/ubuntu karmic main
diff --git a/daves-daves-natty.list b/daves-daves-natty.list
deleted file mode 100644
index b932af2..0000000
--- a/daves-daves-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/daves/daves/ubuntu natty main
-deb-src http://ppa.launchpad.net/daves/daves/ubuntu natty main
diff --git a/deluge-team-ppa-natty.list b/deluge-team-ppa-natty.list
deleted file mode 100644
index 8745cf9..0000000
--- a/deluge-team-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/deluge-team/ppa/ubuntu natty main
diff --git a/docky-core-ppa-natty.list b/docky-core-ppa-natty.list
deleted file mode 100644
index c69f9db..0000000
--- a/docky-core-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/docky-core/ppa/ubuntu natty main
diff --git a/dropbox.list b/dropbox.list
index 9d5ed59..4ac4dd1 100644
--- a/dropbox.list
+++ b/dropbox.list
@@ -1 +1 @@
-deb http://linux.dropbox.com/ubuntu natty main
+deb http://linux.dropbox.com/ubuntu oneiric main
diff --git a/dschaerf-ffgtk-oneiric.list b/dschaerf-ffgtk-oneiric.list
new file mode 100644
index 0000000..1234097
--- /dev/null
+++ b/dschaerf-ffgtk-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/dschaerf/ffgtk/ubuntu oneiric main
diff --git a/eduke32.list b/eduke32.list
index a401700..ad07230 100644
--- a/eduke32.list
+++ b/eduke32.list
@@ -1,2 +1,2 @@
-deb http://apt.duke4.net natty main
-# deb-src http://apt.duke4.net natty main
+deb http://apt.duke4.net oneiric main
+# deb-src http://apt.duke4.net oneiric main
diff --git a/f-spot-f-spot-ppa-maverick.list b/f-spot-f-spot-ppa-maverick.list
deleted file mode 100644
index 24cb968..0000000
--- a/f-spot-f-spot-ppa-maverick.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/f-spot/f-spot-ppa/ubuntu maverick main
diff --git a/fabricesp-ppa-natty.list b/fabricesp-ppa-natty.list
deleted file mode 100644
index 392917f..0000000
--- a/fabricesp-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/fabricesp/ppa/ubuntu natty main
diff --git a/festor-hack-tools-karmic.list b/festor-hack-tools-karmic.list
deleted file mode 100644
index f0298af..0000000
--- a/festor-hack-tools-karmic.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/festor/hack-tools/ubuntu karmic main
diff --git a/geany-dev-ppa-maverick.list b/geany-dev-ppa-maverick.list
deleted file mode 100644
index 51b60da..0000000
--- a/geany-dev-ppa-maverick.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/geany-dev/ppa/ubuntu maverick main
diff --git a/george-edison55-webp-oneiric.list b/george-edison55-webp-oneiric.list
new file mode 100644
index 0000000..a66d6b0
--- /dev/null
+++ b/george-edison55-webp-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/george-edison55/webp/ubuntu oneiric main
diff --git a/getdeb.list b/getdeb.list
index 55b11f7..e35c0fb 100644
--- a/getdeb.list
+++ b/getdeb.list
@@ -1,3 +1,6 @@
 # getdeb / playdeb
-deb http://archive.getdeb.net/ubuntu natty-getdeb apps games
-deb http://archive.getdeb.net/ubuntu natty-getdeb-testing apps games
+# deb http://archive.getdeb.net/ubuntu natty-getdeb apps games
+# deb http://archive.getdeb.net/ubuntu natty-getdeb-testing apps games
+
+deb http://archive.getdeb.net/ubuntu oneiric-getdeb apps games
+deb http://archive.getdeb.net/ubuntu oneiric-getdeb-testing apps games
diff --git a/gezakovacs-coffeescript-natty.list b/gezakovacs-coffeescript-natty.list
deleted file mode 100644
index b40fb50..0000000
--- a/gezakovacs-coffeescript-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/gezakovacs/coffeescript/ubuntu natty main
diff --git a/gezakovacs-ppa-natty.list b/gezakovacs-ppa-natty.list
deleted file mode 100644
index e149d60..0000000
--- a/gezakovacs-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/gezakovacs/ppa/ubuntu natty main
diff --git a/gezakovacs-ppa-oneiric.list b/gezakovacs-ppa-oneiric.list
new file mode 100644
index 0000000..77fc8ec
--- /dev/null
+++ b/gezakovacs-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/gezakovacs/ppa/ubuntu oneiric main
diff --git a/globalmenu-team-ppa-lucid.list b/globalmenu-team-ppa-lucid.list
deleted file mode 100644
index b7b2479..0000000
--- a/globalmenu-team-ppa-lucid.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/globalmenu-team/ppa/ubuntu lucid main
-# deb-src http://ppa.launchpad.net/globalmenu-team/ppa/ubuntu lucid main
diff --git a/gmpc-trunk-mpd-trunk-natty.list b/gmpc-trunk-mpd-trunk-natty.list
deleted file mode 100644
index 53cb6fb..0000000
--- a/gmpc-trunk-mpd-trunk-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/gmpc-trunk/mpd-trunk/ubuntu natty main
-# deb-src http://ppa.launchpad.net/gmpc-trunk/mpd-trunk/ubuntu natty main
diff --git a/gmpc-trunk-mpd-trunk-oneiric.list b/gmpc-trunk-mpd-trunk-oneiric.list
new file mode 100644
index 0000000..a86039b
--- /dev/null
+++ b/gmpc-trunk-mpd-trunk-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/gmpc-trunk/mpd-trunk/ubuntu oneiric main
diff --git a/gnome-terminator-ppa-natty.list b/gnome-terminator-ppa-natty.list
deleted file mode 100644
index ebac68a..0000000
--- a/gnome-terminator-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/gnome-terminator/ppa/ubuntu natty main
diff --git a/gnome-terminator-ppa-oneiric.list b/gnome-terminator-ppa-oneiric.list
new file mode 100644
index 0000000..94b237b
--- /dev/null
+++ b/gnome-terminator-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/gnome-terminator/ppa/ubuntu oneiric main
diff --git a/gnome3-team-gnome3-oneiric.list b/gnome3-team-gnome3-oneiric.list
new file mode 100644
index 0000000..8525e69
--- /dev/null
+++ b/gnome3-team-gnome3-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/gnome3-team/gnome3/ubuntu oneiric main
diff --git a/gwibber-daily-ppa-natty.list b/gwibber-daily-ppa-natty.list
deleted file mode 100644
index c55f200..0000000
--- a/gwibber-daily-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/gwibber-daily/ppa/ubuntu natty main
diff --git a/gwibber-daily-ppa-oneiric.list b/gwibber-daily-ppa-oneiric.list
new file mode 100644
index 0000000..28a07f5
--- /dev/null
+++ b/gwibber-daily-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/gwibber-daily/ppa/ubuntu oneiric main
diff --git a/handschuh-ppa-natty.list b/handschuh-ppa-natty.list
deleted file mode 100644
index 2e58079..0000000
--- a/handschuh-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/handschuh/ppa/ubuntu natty main
diff --git a/handschuh-ppa-oneiric.list b/handschuh-ppa-oneiric.list
new file mode 100644
index 0000000..58c3a47
--- /dev/null
+++ b/handschuh-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/handschuh/ppa/ubuntu oneiric main
diff --git a/hel-sheep-pastie-natty.list b/hel-sheep-pastie-natty.list
deleted file mode 100644
index d9d1c70..0000000
--- a/hel-sheep-pastie-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/hel-sheep/pastie/ubuntu natty main
-# deb-src http://ppa.launchpad.net/hel-sheep/pastie/ubuntu natty main
diff --git a/hel-sheep-pastie-oneiric.list b/hel-sheep-pastie-oneiric.list
new file mode 100644
index 0000000..bbed65a
--- /dev/null
+++ b/hel-sheep-pastie-oneiric.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/hel-sheep/pastie/ubuntu oneiric main
+# deb-src http://ppa.launchpad.net/hel-sheep/pastie/ubuntu oneiric main
diff --git a/indicator-multiload-stable-daily-natty.list b/indicator-multiload-stable-daily-natty.list
deleted file mode 100644
index dac460c..0000000
--- a/indicator-multiload-stable-daily-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/indicator-multiload/stable-daily/ubuntu natty main
-deb-src http://ppa.launchpad.net/indicator-multiload/stable-daily/ubuntu natty main
diff --git a/indicator-multiload-stable-daily-oneiric.list b/indicator-multiload-stable-daily-oneiric.list
new file mode 100644
index 0000000..caf7328
--- /dev/null
+++ b/indicator-multiload-stable-daily-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/indicator-multiload/stable-daily/ubuntu oneiric main
diff --git a/jcfp-ppa-natty.list b/jcfp-ppa-natty.list
deleted file mode 100644
index 8dabdf5..0000000
--- a/jcfp-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/jcfp/ppa/ubuntu natty main
diff --git a/jcfp-ppa-oneiric.list b/jcfp-ppa-oneiric.list
new file mode 100644
index 0000000..4da05c2
--- /dev/null
+++ b/jcfp-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/jcfp/ppa/ubuntu oneiric main
diff --git a/jd-team-jdownloader-natty.list b/jd-team-jdownloader-natty.list
deleted file mode 100644
index afbe72d..0000000
--- a/jd-team-jdownloader-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/jd-team/jdownloader/ubuntu natty main
diff --git a/jd-team-jdownloader-oneiric.list b/jd-team-jdownloader-oneiric.list
new file mode 100644
index 0000000..fbc806e
--- /dev/null
+++ b/jd-team-jdownloader-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/jd-team/jdownloader/ubuntu oneiric main
diff --git a/jean-baptiste-lab-ubuntu-lucid.list b/jean-baptiste-lab-ubuntu-lucid.list
deleted file mode 100644
index 5acde3c..0000000
--- a/jean-baptiste-lab-ubuntu-lucid.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/jean-baptiste-lab/ubuntu lucid main
diff --git a/jfi-pidgin-natty.list b/jfi-pidgin-natty.list
deleted file mode 100644
index 245481b..0000000
--- a/jfi-pidgin-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/jfi/pidgin/ubuntu natty main
-deb-src http://ppa.launchpad.net/jfi/pidgin/ubuntu natty main
diff --git a/keepassx-ppa-lucid.list b/keepassx-ppa-lucid.list
deleted file mode 100644
index 2772d3f..0000000
--- a/keepassx-ppa-lucid.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/keepassx/ppa/ubuntu lucid main
diff --git a/kilian-f_lux-oneiric.list b/kilian-f_lux-oneiric.list
new file mode 100644
index 0000000..73efca3
--- /dev/null
+++ b/kilian-f_lux-oneiric.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/kilian/f.lux/ubuntu oneiric main
+deb-src http://ppa.launchpad.net/kilian/f.lux/ubuntu oneiric main
diff --git a/libreoffice-ppa-natty.list b/libreoffice-ppa-natty.list
deleted file mode 100644
index 797eaf7..0000000
--- a/libreoffice-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/libreoffice/ppa/ubuntu natty main
diff --git a/libreoffice-ppa-oneiric.list b/libreoffice-ppa-oneiric.list
new file mode 100644
index 0000000..3664afd
--- /dev/null
+++ b/libreoffice-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/libreoffice/ppa/ubuntu oneiric main
diff --git a/liferea-ppa-maverick.list b/liferea-ppa-maverick.list
deleted file mode 100644
index f93ae9b..0000000
--- a/liferea-ppa-maverick.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/liferea/ppa/ubuntu maverick main
diff --git a/marcusls-maverick-natty.list b/marcusls-maverick-natty.list
deleted file mode 100644
index 5ca3e5d..0000000
--- a/marcusls-maverick-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/marcusls/maverick/ubuntu natty main
diff --git a/mario-sitz-ppa-natty.list b/mario-sitz-ppa-natty.list
deleted file mode 100644
index c364075..0000000
--- a/mario-sitz-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/mario-sitz/ppa/ubuntu natty main
diff --git a/matthaeus123-mrw-gimp-svn-natty.list b/matthaeus123-mrw-gimp-svn-natty.list
deleted file mode 100644
index 2acd289..0000000
--- a/matthaeus123-mrw-gimp-svn-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/matthaeus123/mrw-gimp-svn/ubuntu natty main
diff --git a/matthaeus123-mrw-gimp-svn-oneiric.list b/matthaeus123-mrw-gimp-svn-oneiric.list
new file mode 100644
index 0000000..37ac549
--- /dev/null
+++ b/matthaeus123-mrw-gimp-svn-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/matthaeus123/mrw-gimp-svn/ubuntu oneiric main
diff --git a/medibuntu.list b/medibuntu.list
index abfaa7b..d6b32da 100644
--- a/medibuntu.list
+++ b/medibuntu.list
@@ -1,4 +1,3 @@
 ## Medibuntu - Ubuntu 11.04 "natty narwhal"
 ## Please report any bug on https://bugs.launchpad.net/medibuntu/
-# deb http://packages.medibuntu.org/ maverick free non-free
-deb http://packages.medibuntu.org/ natty free non-free
+deb http://packages.medibuntu.org/ oneiric free non-free
diff --git a/midori-ppa-natty.list b/midori-ppa-natty.list
deleted file mode 100644
index 37f3269..0000000
--- a/midori-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/midori/ppa/ubuntu natty main
diff --git a/miro.list b/miro.list
deleted file mode 100644
index 5b83f79..0000000
--- a/miro.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# miro Player
-deb http://ftp.osuosl.org/pub/pculture.org/miro/linux/repositories/ubuntu karmic/
-
diff --git a/mitya57-ppa-oneiric.list b/mitya57-ppa-oneiric.list
new file mode 100644
index 0000000..4a449a2
--- /dev/null
+++ b/mitya57-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/mitya57/ppa/ubuntu oneiric main
diff --git a/mozillateam-firefox-stable-natty.list b/mozillateam-firefox-stable-natty.list
index 4aad153..a440c6a 100644
--- a/mozillateam-firefox-stable-natty.list
+++ b/mozillateam-firefox-stable-natty.list
@@ -1,2 +1 @@
 deb http://ppa.launchpad.net/mozillateam/firefox-stable/ubuntu natty main
-deb-src http://ppa.launchpad.net/mozillateam/firefox-stable/ubuntu natty main
diff --git a/mozillateam-thunderbird-stable-natty.list b/mozillateam-thunderbird-stable-natty.list
index 8e2fcaa..e929e68 100644
--- a/mozillateam-thunderbird-stable-natty.list
+++ b/mozillateam-thunderbird-stable-natty.list
@@ -1,2 +1 @@
 deb http://ppa.launchpad.net/mozillateam/thunderbird-stable/ubuntu natty main
-deb-src http://ppa.launchpad.net/mozillateam/thunderbird-stable/ubuntu natty main
diff --git a/n-muench-calibre-natty.list b/n-muench-calibre-natty.list
deleted file mode 100644
index ae7015b..0000000
--- a/n-muench-calibre-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/n-muench/calibre/ubuntu natty main
diff --git a/n-muench-calibre-oneiric.list b/n-muench-calibre-oneiric.list
new file mode 100644
index 0000000..0a6397f
--- /dev/null
+++ b/n-muench-calibre-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/n-muench/calibre/ubuntu oneiric main
diff --git a/nijel-ppa-natty.list b/nijel-ppa-natty.list
deleted file mode 100644
index 2f5fb8e..0000000
--- a/nijel-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/nijel/ppa/ubuntu natty main
diff --git a/nilarimogard-webupd8-natty.list b/nilarimogard-webupd8-natty.list
deleted file mode 100644
index 3419816..0000000
--- a/nilarimogard-webupd8-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu natty main
diff --git a/nilarimogard-webupd8-oneiric.list b/nilarimogard-webupd8-oneiric.list
new file mode 100644
index 0000000..8d12031
--- /dev/null
+++ b/nilarimogard-webupd8-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu oneiric main
diff --git a/nuvola-player-builders-oneiric.list b/nuvola-player-builders-oneiric.list
new file mode 100644
index 0000000..b4bf67e
--- /dev/null
+++ b/nuvola-player-builders-oneiric.list
@@ -0,0 +1,4 @@
+deb http://ppa.launchpad.net/nuvola-player-builders/unstable/ubuntu oneiric main
+deb http://ppa.launchpad.net/nuvola-player-builders/stable/ubuntu oneiric main
+#deb http://ppa.launchpad.net/nuvola-player-builders/candidate/ubuntu oneiric main
+deb http://ppa.launchpad.net/nuvola-player-builders/bugfix/ubuntu oneiric main
diff --git a/openstreetmap-ppa-jaunty.list b/openstreetmap-ppa-jaunty.list
deleted file mode 100644
index f24dd56..0000000
--- a/openstreetmap-ppa-jaunty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/openstreetmap/ppa/ubuntu jaunty main
diff --git a/pcf-miro-releases-natty.list b/pcf-miro-releases-natty.list
deleted file mode 100644
index 3b4c438..0000000
--- a/pcf-miro-releases-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/pcf/miro-releases/ubuntu natty main
-deb-src http://ppa.launchpad.net/pcf/miro-releases/ubuntu natty main
diff --git a/pcf-miro-releases-oneiric.list b/pcf-miro-releases-oneiric.list
new file mode 100644
index 0000000..17df1ce
--- /dev/null
+++ b/pcf-miro-releases-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/pcf/miro-releases/ubuntu oneiric main
diff --git a/pdfmod-team-ppa-natty.list b/pdfmod-team-ppa-natty.list
deleted file mode 100644
index a2997d4..0000000
--- a/pdfmod-team-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/pdfmod-team/ppa/ubuntu natty main
diff --git a/pidgin-developers-ppa-oneiric.list b/pidgin-developers-ppa-oneiric.list
new file mode 100644
index 0000000..54917d1
--- /dev/null
+++ b/pidgin-developers-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/pidgin-developers/ppa/ubuntu oneiric main
diff --git a/pidgin-ppa.list b/pidgin-ppa.list
deleted file mode 100644
index cc0cf1d..0000000
--- a/pidgin-ppa.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/pidgin-developers/ppa/ubuntu natty main
-deb-src http://ppa.launchpad.net/pidgin-developers/ppa/ubuntu natty main
diff --git a/ricotz-testing-oneiric.list b/ricotz-testing-oneiric.list
new file mode 100644
index 0000000..f2e7b92
--- /dev/null
+++ b/ricotz-testing-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/ricotz/testing/ubuntu oneiric main
diff --git a/roignac-weather-indicator-natty.list b/roignac-weather-indicator-natty.list
deleted file mode 100644
index cb2c570..0000000
--- a/roignac-weather-indicator-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/roignac/weather-indicator/ubuntu natty main
diff --git a/ruben-verweij-thunderbird-indicator-natty.list b/ruben-verweij-thunderbird-indicator-natty.list
deleted file mode 100644
index 577b916..0000000
--- a/ruben-verweij-thunderbird-indicator-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ruben-verweij/thunderbird-indicator/ubuntu natty main
-deb-src http://ppa.launchpad.net/ruben-verweij/thunderbird-indicator/ubuntu natty main
diff --git a/screen-profiles-ppa-natty.list b/screen-profiles-ppa-natty.list
deleted file mode 100644
index cfaa70a..0000000
--- a/screen-profiles-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/screen-profiles/ppa/ubuntu natty main
diff --git a/screen-profiles-ppa-oneiric.list b/screen-profiles-ppa-oneiric.list
new file mode 100644
index 0000000..e7a8f39
--- /dev/null
+++ b/screen-profiles-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/screen-profiles/ppa/ubuntu oneiric main
diff --git a/scribus-ppa-natty.list b/scribus-ppa-natty.list
deleted file mode 100644
index 4412458..0000000
--- a/scribus-ppa-natty.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/scribus/ppa/ubuntu natty main
-deb-src http://ppa.launchpad.net/scribus/ppa/ubuntu natty main
diff --git a/scribus.list b/scribus.list
index 22c56f3..494a303 100644
--- a/scribus.list
+++ b/scribus.list
@@ -1,4 +1,4 @@
 # Key: EEF818CF
-# non-free doesn't work
-deb http://debian.scribus.net/debian/ natty main
-deb http://debian.tagancha.org/debian/ natty main
+# DOESN'T WORK: non-free
+deb http://debian.scribus.net/debian/ oneiric main
+deb http://debian.tagancha.org/debian/ oneiric main
diff --git a/sevenmachines-flash-natty.list b/sevenmachines-flash-natty.list
deleted file mode 100644
index ffef5dd..0000000
--- a/sevenmachines-flash-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/sevenmachines/flash/ubuntu natty main
diff --git a/simonschneegans-testing-oneiric.list b/simonschneegans-testing-oneiric.list
new file mode 100644
index 0000000..f73ff8e
--- /dev/null
+++ b/simonschneegans-testing-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/simonschneegans/testing/ubuntu oneiric main
diff --git a/sroecker-ppa-maverick.list b/sroecker-ppa-maverick.list
deleted file mode 100644
index 41ac02e..0000000
--- a/sroecker-ppa-maverick.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/sroecker/ppa/ubuntu maverick main
diff --git a/synapse-core-ppa-natty.list b/synapse-core-ppa-natty.list
deleted file mode 100644
index c62e72b..0000000
--- a/synapse-core-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/synapse-core/ppa/ubuntu natty main
diff --git a/synapse-core-ppa-oneiric.list b/synapse-core-ppa-oneiric.list
new file mode 100644
index 0000000..3568c02
--- /dev/null
+++ b/synapse-core-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/synapse-core/ppa/ubuntu oneiric main
diff --git a/synapse-core-testing-natty.list b/synapse-core-testing-natty.list
deleted file mode 100644
index 13b7238..0000000
--- a/synapse-core-testing-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/synapse-core/testing/ubuntu natty main
diff --git a/synapse-core-testing-oneiric.list b/synapse-core-testing-oneiric.list
new file mode 100644
index 0000000..bd4ba56
--- /dev/null
+++ b/synapse-core-testing-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/synapse-core/testing/ubuntu oneiric main
diff --git a/synce-ppa-natty.list b/synce-ppa-natty.list
deleted file mode 100644
index 316a84c..0000000
--- a/synce-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/synce/ppa/ubuntu natty main
diff --git a/tfogal-ppa-natty.list b/tfogal-ppa-natty.list
deleted file mode 100644
index c913e6c..0000000
--- a/tfogal-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/tfogal/ppa/ubuntu natty main
diff --git a/tiheum-equinox-oneiric.list b/tiheum-equinox-oneiric.list
new file mode 100644
index 0000000..3477635
--- /dev/null
+++ b/tiheum-equinox-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/tiheum/equinox/ubuntu oneiric main
diff --git a/tormodvolden-ppa-natty.list b/tormodvolden-ppa-natty.list
deleted file mode 100644
index 03b1282..0000000
--- a/tormodvolden-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/tormodvolden/ppa/ubuntu natty main
diff --git a/tsbarnes-misc-natty.list b/tsbarnes-misc-natty.list
deleted file mode 100644
index eb506d6..0000000
--- a/tsbarnes-misc-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/tsbarnes/misc/ubuntu natty main
diff --git a/tualatrix-ppa-natty.list b/tualatrix-ppa-natty.list
deleted file mode 100644
index 732912c..0000000
--- a/tualatrix-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/tualatrix/ppa/ubuntu natty main
diff --git a/tualatrix-ppa-oneiric.list b/tualatrix-ppa-oneiric.list
new file mode 100644
index 0000000..b059e4e
--- /dev/null
+++ b/tualatrix-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/tualatrix/ppa/ubuntu oneiric main
diff --git a/ubuntu-mozilla-daily-ppa-natty.list b/ubuntu-mozilla-daily-ppa-natty.list
deleted file mode 100644
index 91e0318..0000000
--- a/ubuntu-mozilla-daily-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu natty main
diff --git a/ubuntu-mozilla-daily-ppa-oneiric.list b/ubuntu-mozilla-daily-ppa-oneiric.list
new file mode 100644
index 0000000..6446248
--- /dev/null
+++ b/ubuntu-mozilla-daily-ppa-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu oneiric main
diff --git a/ubuntu-mozilla-security-ppa-natty.list b/ubuntu-mozilla-security-ppa-oneiric.list
similarity index 83%
rename from ubuntu-mozilla-security-ppa-natty.list
rename to ubuntu-mozilla-security-ppa-oneiric.list
index 32bc5d4..38bd41b 100644
--- a/ubuntu-mozilla-security-ppa-natty.list
+++ b/ubuntu-mozilla-security-ppa-oneiric.list
@@ -1 +1 @@
-deb http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu natty main
+deb http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu oneiric main
diff --git a/virtualbox.list b/virtualbox.list
index c5463fb..5b8ccf0 100644
--- a/virtualbox.list
+++ b/virtualbox.list
@@ -1,3 +1,3 @@
 # VirtualBox
 # wget -q http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc -O- | sudo apt-key add -
-deb http://download.virtualbox.org/virtualbox/debian natty contrib
+deb http://download.virtualbox.org/virtualbox/debian oneiric contrib
diff --git a/webkit-team-epiphany-maverick.list b/webkit-team-epiphany-maverick.list
deleted file mode 100644
index 1f43c02..0000000
--- a/webkit-team-epiphany-maverick.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webkit-team/epiphany/ubuntu maverick main
diff --git a/webkit-team-ppa-natty.list b/webkit-team-ppa-natty.list
deleted file mode 100644
index 9c3e9f4..0000000
--- a/webkit-team-ppa-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webkit-team/ppa/ubuntu natty main
diff --git a/webupd8team-parcellite-natty.list b/webupd8team-parcellite-natty.list
deleted file mode 100644
index 3421dd2..0000000
--- a/webupd8team-parcellite-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/parcellite/ubuntu natty main
diff --git a/webupd8team-puddletag-natty.list b/webupd8team-puddletag-natty.list
deleted file mode 100644
index ed7bf55..0000000
--- a/webupd8team-puddletag-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/puddletag/ubuntu natty main
diff --git a/webupd8team-puddletag-oneiric.list b/webupd8team-puddletag-oneiric.list
new file mode 100644
index 0000000..96162c1
--- /dev/null
+++ b/webupd8team-puddletag-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/puddletag/ubuntu oneiric main
diff --git a/webupd8team-themes-natty.list b/webupd8team-themes-natty.list
deleted file mode 100644
index 1ef7d99..0000000
--- a/webupd8team-themes-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/themes/ubuntu natty main
diff --git a/webupd8team-themes-oneiric.list b/webupd8team-themes-oneiric.list
new file mode 100644
index 0000000..3236b07
--- /dev/null
+++ b/webupd8team-themes-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/themes/ubuntu oneiric main
diff --git a/webupd8team-unstable-natty.list b/webupd8team-unstable-natty.list
deleted file mode 100644
index 2d6a33f..0000000
--- a/webupd8team-unstable-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/unstable/ubuntu natty main
diff --git a/webupd8team-unstable-oneiric.list b/webupd8team-unstable-oneiric.list
new file mode 100644
index 0000000..d6c788a
--- /dev/null
+++ b/webupd8team-unstable-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/unstable/ubuntu oneiric main
diff --git a/webupd8team-y-ppa-manager-natty.list b/webupd8team-y-ppa-manager-natty.list
deleted file mode 100644
index d7e9013..0000000
--- a/webupd8team-y-ppa-manager-natty.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/y-ppa-manager/ubuntu natty main
diff --git a/webupd8team-y-ppa-manager-oneiric.list b/webupd8team-y-ppa-manager-oneiric.list
new file mode 100644
index 0000000..9c31a27
--- /dev/null
+++ b/webupd8team-y-ppa-manager-oneiric.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/y-ppa-manager/ubuntu oneiric main
diff --git a/wine.list b/wine.list
deleted file mode 100644
index 49a992e..0000000
--- a/wine.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wine
-# deb http://wine.budgetdedicated.com/apt maverick main #Wine
-