diff --git a/atareao-atareao-wily.list b/atareao-atareao-wily.list
deleted file mode 100644
index 0f979d8..0000000
--- a/atareao-atareao-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/atareao/atareao/ubuntu wily main
-# deb-src http://ppa.launchpad.net/atareao/atareao/ubuntu wily main
diff --git a/atareao-atareao-xenial.list b/atareao-atareao-xenial.list
new file mode 100644
index 0000000..9562e52
--- /dev/null
+++ b/atareao-atareao-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/atareao/atareao/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/atareao/atareao/ubuntu xenial main
diff --git a/bitcoin-bitcoin-wily.list b/bitcoin-bitcoin-wily.list
deleted file mode 100644
index eb2d869..0000000
--- a/bitcoin-bitcoin-wily.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Key: 0x8842CE5E
-deb http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu wily main
-# deb-src http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu wily main
diff --git a/bitcoin-bitcoin-xenial.list b/bitcoin-bitcoin-xenial.list
new file mode 100644
index 0000000..3c3643b
--- /dev/null
+++ b/bitcoin-bitcoin-xenial.list
@@ -0,0 +1,3 @@
+# Key: 0x8842CE5E
+deb http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/bitcoin/bitcoin/ubuntu xenial main
diff --git a/ehoover-compholio-wily.list b/ehoover-compholio-wily.list
deleted file mode 100644
index 5e48d14..0000000
--- a/ehoover-compholio-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ehoover/compholio/ubuntu wily main
-# deb-src http://ppa.launchpad.net/ehoover/compholio/ubuntu wily main
diff --git a/ehoover-compholio-xenial.list b/ehoover-compholio-xenial.list
new file mode 100644
index 0000000..eef1596
--- /dev/null
+++ b/ehoover-compholio-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/ehoover/compholio/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/ehoover/compholio/ubuntu xenial main
diff --git a/git-core-ppa-wily.list b/git-core-ppa-wily.list
deleted file mode 100644
index dfce5b6..0000000
--- a/git-core-ppa-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
-# deb-src http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
diff --git a/git-core-ppa-xenial.list b/git-core-ppa-xenial.list
new file mode 100644
index 0000000..9665d1c
--- /dev/null
+++ b/git-core-ppa-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main
diff --git a/gottengeography-ubuntu-ppa-wily.list b/gottengeography-ubuntu-ppa-wily.list
deleted file mode 100644
index 6c74cc7..0000000
--- a/gottengeography-ubuntu-ppa-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/gottengeography/ppa/ubuntu wily main
-# deb-src http://ppa.launchpad.net/gottengeography/ppa/ubuntu wily main
diff --git a/gottengeography-ubuntu-ppa-xenial.list b/gottengeography-ubuntu-ppa-xenial.list
new file mode 100644
index 0000000..2cc64eb
--- /dev/null
+++ b/gottengeography-ubuntu-ppa-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/gottengeography/ppa/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/gottengeography/ppa/ubuntu xenial main
diff --git a/indicator-multiload-stable-daily-wily.list b/indicator-multiload-stable-daily-xenial.list
similarity index 79%
rename from indicator-multiload-stable-daily-wily.list
rename to indicator-multiload-stable-daily-xenial.list
index 39092f1..88b8e35 100644
--- a/indicator-multiload-stable-daily-wily.list
+++ b/indicator-multiload-stable-daily-xenial.list
@@ -1 +1 @@
-deb http://ppa.launchpad.net/indicator-multiload/stable-daily/ubuntu wily main
+deb http://ppa.launchpad.net/indicator-multiload/stable-daily/ubuntu xenial main
diff --git a/insync.list b/insync.list
index 1f78370..46aed1b 100644
--- a/insync.list
+++ b/insync.list
@@ -1,3 +1,3 @@
 # wget -O - https://d2t3ff60b2tol4.cloudfront.net/services@insynchq.com.gpg.key | sudo apt-key add -
-deb http://apt.insynchq.com/ubuntu wily non-free
+deb http://apt.insynchq.com/ubuntu xenial non-free
 
diff --git a/jcfp-ppa-wily.list b/jcfp-ppa-wily.list
deleted file mode 100644
index 2840e06..0000000
--- a/jcfp-ppa-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/jcfp/ppa/ubuntu wily main
diff --git a/jcfp-ppa-xenial.list b/jcfp-ppa-xenial.list
new file mode 100644
index 0000000..11a7f37
--- /dev/null
+++ b/jcfp-ppa-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/jcfp/ppa/ubuntu xenial main
diff --git a/josm.list b/josm.list
index bc339bf..63d3f8e 100644
--- a/josm.list
+++ b/josm.list
@@ -1,2 +1,2 @@
 # wget -q http://josm.openstreetmap.de/josm-apt.key -O- | sudo apt-key add -
-deb http://josm.openstreetmap.de/apt wily universe
+deb http://josm.openstreetmap.de/apt xenial universe
diff --git a/libreoffice-ppa-wily.list b/libreoffice-ppa-wily.list
deleted file mode 100644
index e106fa6..0000000
--- a/libreoffice-ppa-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/libreoffice/ppa/ubuntu wily main
diff --git a/libreoffice-ppa-xenial.list b/libreoffice-ppa-xenial.list
new file mode 100644
index 0000000..a935557
--- /dev/null
+++ b/libreoffice-ppa-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/libreoffice/ppa/ubuntu xenial main
diff --git a/musicbrainz-developers-daily-wily.list b/musicbrainz-developers-daily-xenial.list
similarity index 85%
rename from musicbrainz-developers-daily-wily.list
rename to musicbrainz-developers-daily-xenial.list
index fed3eee..6474a2a 100644
--- a/musicbrainz-developers-daily-wily.list
+++ b/musicbrainz-developers-daily-xenial.list
@@ -1,3 +1,3 @@
 # MusicBrainz Picard (daily/unstable) PPA, Key 0xCEDF0F40
-deb http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu wily main
-# deb-src http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu wily main
+deb http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu xenial main
diff --git a/musicbrainz-developers-stable-wily.list b/musicbrainz-developers-stable-xenial.list
similarity index 83%
rename from musicbrainz-developers-stable-wily.list
rename to musicbrainz-developers-stable-xenial.list
index 93d9506..7c8d72e 100644
--- a/musicbrainz-developers-stable-wily.list
+++ b/musicbrainz-developers-stable-xenial.list
@@ -1,3 +1,3 @@
 # MusicBrainz Picard (stable) PPA, Key 0xCEDF0F40
-deb http://ppa.launchpad.net/musicbrainz-developers/stable/ubuntu wily main
-# deb-src http://ppa.launchpad.net/musicbrainz-developers/stable/ubuntu wily main
+deb http://ppa.launchpad.net/musicbrainz-developers/stable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/musicbrainz-developers/stable/ubuntu xenial main
diff --git a/neovim-ppa-ubuntu-unstable-wily.list b/neovim-ppa-ubuntu-unstable-wily.list
deleted file mode 100644
index 0ec4479..0000000
--- a/neovim-ppa-ubuntu-unstable-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/neovim-ppa/unstable/ubuntu wily main
-# deb-src http://ppa.launchpad.net/neovim-ppa/unstable/ubuntu wily main
diff --git a/neovim-ppa-ubuntu-unstable-xenial.list b/neovim-ppa-ubuntu-unstable-xenial.list
new file mode 100644
index 0000000..ba7442d
--- /dev/null
+++ b/neovim-ppa-ubuntu-unstable-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/neovim-ppa/unstable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/neovim-ppa/unstable/ubuntu xenial main
diff --git a/nilarimogard-webupd8-wily.list b/nilarimogard-webupd8-wily.list
deleted file mode 100644
index ac7a377..0000000
--- a/nilarimogard-webupd8-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu wily main
diff --git a/nilarimogard-webupd8-xenial.list b/nilarimogard-webupd8-xenial.list
new file mode 100644
index 0000000..93e9044
--- /dev/null
+++ b/nilarimogard-webupd8-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu xenial main
diff --git a/numix-ppa-wily.list b/numix-ppa-wily.list
deleted file mode 100644
index 40e475a..0000000
--- a/numix-ppa-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/numix/ppa/ubuntu wily main
-# deb-src http://ppa.launchpad.net/numix/ppa/ubuntu wily main
diff --git a/numix-ppa-xenial.list b/numix-ppa-xenial.list
new file mode 100644
index 0000000..315fc3e
--- /dev/null
+++ b/numix-ppa-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/numix/ppa/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/numix/ppa/ubuntu xenial main
diff --git a/nuvola-player.list b/nuvola-player.list
index 357e737..5adc118 100644
--- a/nuvola-player.list
+++ b/nuvola-player.list
@@ -1,3 +1,3 @@
 # apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 40554B8FA5FE6F6A
-deb https://tiliado.eu/nuvolaplayer/repository/deb/ wily stable beta
+deb https://tiliado.eu/nuvolaplayer/repository/deb/ xenial stable beta
 
diff --git a/otto-kesselgulasch-gimp-wily.list b/otto-kesselgulasch-gimp-wily.list
deleted file mode 100644
index 6a9f5fc..0000000
--- a/otto-kesselgulasch-gimp-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/otto-kesselgulasch/gimp/ubuntu wily main
-# deb-src http://ppa.launchpad.net/otto-kesselgulasch/gimp/ubuntu wily main
diff --git a/otto-kesselgulasch-gimp-xenial.list b/otto-kesselgulasch-gimp-xenial.list
new file mode 100644
index 0000000..eca7332
--- /dev/null
+++ b/otto-kesselgulasch-gimp-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/otto-kesselgulasch/gimp/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/otto-kesselgulasch/gimp/ubuntu xenial main
diff --git a/pipelight-daily-wily.list b/pipelight-daily-wily.list
deleted file mode 100644
index 0a86c7e..0000000
--- a/pipelight-daily-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/pipelight/daily/ubuntu wily main
-# deb-src http://ppa.launchpad.net/pipelight/daily/ubuntu wily main
diff --git a/pipelight-daily-xenial.list b/pipelight-daily-xenial.list
new file mode 100644
index 0000000..5e737ab
--- /dev/null
+++ b/pipelight-daily-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/pipelight/daily/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/pipelight/daily/ubuntu xenial main
diff --git a/pipelight-stable-wily.list b/pipelight-stable-wily.list
deleted file mode 100644
index 0aebe4f..0000000
--- a/pipelight-stable-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/pipelight/stable/ubuntu wily main
-# deb-src http://ppa.launchpad.net/pipelight/stable/ubuntu wily main
diff --git a/pipelight-stable-xenial.list b/pipelight-stable-xenial.list
new file mode 100644
index 0000000..e72a681
--- /dev/null
+++ b/pipelight-stable-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/pipelight/stable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/pipelight/stable/ubuntu xenial main
diff --git a/plexapp-plexht-wily.list b/plexapp-plexht-wily.list
deleted file mode 100644
index 62b3fb8..0000000
--- a/plexapp-plexht-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/plexapp/plexht/ubuntu wily main
-# deb-src http://ppa.launchpad.net/plexapp/plexht/ubuntu wily main
diff --git a/plexapp-plexht-xenial.list b/plexapp-plexht-xenial.list
new file mode 100644
index 0000000..f2157d3
--- /dev/null
+++ b/plexapp-plexht-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/plexapp/plexht/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/plexapp/plexht/ubuntu xenial main
diff --git a/retroshare-ubuntu-unstable-wily.list b/retroshare-ubuntu-unstable-wily.list
deleted file mode 100644
index 2244476..0000000
--- a/retroshare-ubuntu-unstable-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/retroshare/unstable/ubuntu wily main
-# deb-src http://ppa.launchpad.net/retroshare/unstable/ubuntu wily main
diff --git a/retroshare-ubuntu-unstable-xenial.list b/retroshare-ubuntu-unstable-xenial.list
new file mode 100644
index 0000000..f14240b
--- /dev/null
+++ b/retroshare-ubuntu-unstable-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/retroshare/unstable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/retroshare/unstable/ubuntu xenial main
diff --git a/rvm-smplayer-wily.list b/rvm-smplayer-wily.list
deleted file mode 100644
index 58da26d..0000000
--- a/rvm-smplayer-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/rvm/smplayer/ubuntu wily main
-# deb-src http://ppa.launchpad.net/rvm/smplayer/ubuntu wily main
diff --git a/rvm-smplayer-xenial.list b/rvm-smplayer-xenial.list
new file mode 100644
index 0000000..c101b8a
--- /dev/null
+++ b/rvm-smplayer-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/rvm/smplayer/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/rvm/smplayer/ubuntu xenial main
diff --git a/saiarcot895-ubuntu-myppa-wily.list b/saiarcot895-ubuntu-myppa-wily.list
deleted file mode 100644
index e41e6e7..0000000
--- a/saiarcot895-ubuntu-myppa-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/saiarcot895/myppa/ubuntu wily main
-# deb-src http://ppa.launchpad.net/saiarcot895/myppa/ubuntu wily main
diff --git a/saiarcot895-ubuntu-myppa-xenial.list b/saiarcot895-ubuntu-myppa-xenial.list
new file mode 100644
index 0000000..c22b874
--- /dev/null
+++ b/saiarcot895-ubuntu-myppa-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/saiarcot895/myppa/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/saiarcot895/myppa/ubuntu xenial main
diff --git a/screen-profiles-ppa-wily.list b/screen-profiles-ppa-wily.list
deleted file mode 100644
index 77e96ff..0000000
--- a/screen-profiles-ppa-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/screen-profiles/ppa/ubuntu wily main
diff --git a/screen-profiles-ppa-xenial.list b/screen-profiles-ppa-xenial.list
new file mode 100644
index 0000000..fd41228
--- /dev/null
+++ b/screen-profiles-ppa-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/screen-profiles/ppa/ubuntu xenial main
diff --git a/scribus-ppa-wily.list b/scribus-ppa-wily.list
deleted file mode 100644
index 4f2fdc6..0000000
--- a/scribus-ppa-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/scribus/ppa/ubuntu wily main
-# deb-src http://ppa.launchpad.net/scribus/ppa/ubuntu wily main
diff --git a/scribus-ppa-xenial.list b/scribus-ppa-xenial.list
new file mode 100644
index 0000000..b129dd4
--- /dev/null
+++ b/scribus-ppa-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/scribus/ppa/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/scribus/ppa/ubuntu xenial main
diff --git a/synapse-core-testing-wily.list b/synapse-core-testing-wily.list
deleted file mode 100644
index ec6e0d0..0000000
--- a/synapse-core-testing-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/synapse-core/testing/ubuntu wily main
diff --git a/synapse-core-testing-xenial.list b/synapse-core-testing-xenial.list
new file mode 100644
index 0000000..be577be
--- /dev/null
+++ b/synapse-core-testing-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/synapse-core/testing/ubuntu xenial main
diff --git a/ubuntu-mozilla-daily-ppa-wily.list b/ubuntu-mozilla-daily-ppa-wily.list
deleted file mode 100644
index 011a744..0000000
--- a/ubuntu-mozilla-daily-ppa-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu wily main
diff --git a/ubuntu-mozilla-daily-ppa-xenial.list b/ubuntu-mozilla-daily-ppa-xenial.list
new file mode 100644
index 0000000..f64c5a7
--- /dev/null
+++ b/ubuntu-mozilla-daily-ppa-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/ubuntu-mozilla-daily/ppa/ubuntu xenial main
diff --git a/ubuntu-mozilla-security-ppa-wily.list b/ubuntu-mozilla-security-ppa-xenial.list
similarity index 84%
rename from ubuntu-mozilla-security-ppa-wily.list
rename to ubuntu-mozilla-security-ppa-xenial.list
index 352cc64..592a1b7 100644
--- a/ubuntu-mozilla-security-ppa-wily.list
+++ b/ubuntu-mozilla-security-ppa-xenial.list
@@ -1 +1 @@
-deb http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu wily main
+deb http://ppa.launchpad.net/ubuntu-mozilla-security/ppa/ubuntu xenial main
diff --git a/videolan-stable-daily-wily.list b/videolan-stable-daily-xenial.list
similarity index 50%
rename from videolan-stable-daily-wily.list
rename to videolan-stable-daily-xenial.list
index 321d9fb..76dcf94 100644
--- a/videolan-stable-daily-wily.list
+++ b/videolan-stable-daily-xenial.list
@@ -1,3 +1,3 @@
 # Key: 0x801df724
-deb http://ppa.launchpad.net/videolan/stable-daily/ubuntu wily main
-# deb-src http://ppa.launchpad.net/videolan/stable-daily/ubuntu wily main
+deb http://ppa.launchpad.net/videolan/stable-daily/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/videolan/stable-daily/ubuntu xenial main
diff --git a/virtualbox.list b/virtualbox.list
index c32b360..151406b 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 wily contrib
+deb http://download.virtualbox.org/virtualbox/debian xenial contrib
diff --git a/webupd8team-atom-wily.list b/webupd8team-atom-wily.list
deleted file mode 100644
index 1f07689..0000000
--- a/webupd8team-atom-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/atom/ubuntu wily main
-# deb-src http://ppa.launchpad.net/webupd8team/atom/ubuntu wily main
diff --git a/webupd8team-atom-xenial.list b/webupd8team-atom-xenial.list
new file mode 100644
index 0000000..902bc4c
--- /dev/null
+++ b/webupd8team-atom-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/webupd8team/atom/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/webupd8team/atom/ubuntu xenial main
diff --git a/webupd8team-java-wily.list b/webupd8team-java-wily.list
deleted file mode 100644
index 9b60615..0000000
--- a/webupd8team-java-wily.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/java/ubuntu wily main
-# deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu wily main
diff --git a/webupd8team-java-xenial.list b/webupd8team-java-xenial.list
new file mode 100644
index 0000000..501341a
--- /dev/null
+++ b/webupd8team-java-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main
diff --git a/webupd8team-puddletag-wily.list b/webupd8team-puddletag-wily.list
deleted file mode 100644
index 60b3f13..0000000
--- a/webupd8team-puddletag-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/puddletag/ubuntu wily main
diff --git a/webupd8team-puddletag-xenial.list b/webupd8team-puddletag-xenial.list
new file mode 100644
index 0000000..7a4cf1b
--- /dev/null
+++ b/webupd8team-puddletag-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/puddletag/ubuntu xenial main
diff --git a/webupd8team-sublime-text-2-wily.list b/webupd8team-sublime-text-2-wily.list
deleted file mode 100644
index c2b8caa..0000000
--- a/webupd8team-sublime-text-2-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/sublime-text-2/ubuntu wily main
diff --git a/webupd8team-sublime-text-2-xenial.list b/webupd8team-sublime-text-2-xenial.list
new file mode 100644
index 0000000..a5b76d4
--- /dev/null
+++ b/webupd8team-sublime-text-2-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/sublime-text-2/ubuntu xenial main
diff --git a/webupd8team-unstable-wily.list b/webupd8team-unstable-wily.list
deleted file mode 100644
index 9afc997..0000000
--- a/webupd8team-unstable-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/unstable/ubuntu wily main
diff --git a/webupd8team-unstable-xenial.list b/webupd8team-unstable-xenial.list
new file mode 100644
index 0000000..693439a
--- /dev/null
+++ b/webupd8team-unstable-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/unstable/ubuntu xenial main
diff --git a/webupd8team-y-ppa-manager-wily.list b/webupd8team-y-ppa-manager-wily.list
deleted file mode 100644
index 68e5150..0000000
--- a/webupd8team-y-ppa-manager-wily.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/y-ppa-manager/ubuntu wily main
diff --git a/webupd8team-y-ppa-manager-xenial.list b/webupd8team-y-ppa-manager-xenial.list
new file mode 100644
index 0000000..286afa1
--- /dev/null
+++ b/webupd8team-y-ppa-manager-xenial.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/y-ppa-manager/ubuntu xenial main