diff --git a/additional-gui-dev.md b/additional-gui-dev.md
index 4ead49016171be36797b8438ec8a3c9afb13b304..8ad913122c41233cd6242755855767e28e894606 100644
--- a/additional-gui-dev.md
+++ b/additional-gui-dev.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Additional GUI Developer
 author: Jaquee
 amount: 2,475
diff --git a/documentation-cleanup.md b/documentation-cleanup.md
index b3f580775ad47cc48d2fc2aaa3ea78e190d74b97..b22899afeeae3b86e3f3b76c54adc846e2bdc7fa 100644
--- a/documentation-cleanup.md
+++ b/documentation-cleanup.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Documentation and cleanup of source code 
 author: tewinget
 amount: 3,600
diff --git a/fp-conference-2017.md b/fp-conference-2017.md
index 18f1dfb5fbc84efbac4f541a5e8f65b4a490cde2..2a37a7d9e89924a1f9c307416904c9dab0d6c353 100644
--- a/fp-conference-2017.md
+++ b/fp-conference-2017.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: fluffyponys Conference Circuit Jan 2017 Edition
 author: fluffypony
 amount: 590
diff --git a/getmonero-redesign.md b/getmonero-redesign.md
index 235aae6bee0c513a1f4992974240f7d55f246930..7aa8ee9bcff53b565e9109ed4c11ced0ecf912e1 100644
--- a/getmonero-redesign.md
+++ b/getmonero-redesign.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-wip
+layout: cp
 title: Getmonero.org Redesign because we're going to design all of the things and you can't stop us
 author: rehrar
 date: 02/14/2017
diff --git a/improve-devguides-simplewallet.md b/improve-devguides-simplewallet.md
index 4eb0546663242c01b1957967ec2438cf3bbfcf94..207a7a71026cc75e866a864dcc80fcab1a83cb8b 100644
--- a/improve-devguides-simplewallet.md
+++ b/improve-devguides-simplewallet.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples
 author: bigreddmachine
 amount: 90
diff --git a/justin-local-meetups-1.md b/justin-local-meetups-1.md
index 95c79395f059cf45173cf40eef0a874c46542c06..9ede824cd4274be680363545d6fcd2f0b7006cc5 100644
--- a/justin-local-meetups-1.md
+++ b/justin-local-meetups-1.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Justin's Local Meetup Talks Proposal #1: Valencia, Graz, and Zagreb
 author: samsunggalaxyplayer
 amount: 66
diff --git a/justin-local-meetups-2.md b/justin-local-meetups-2.md
index c8f6c1f7430f4552a1de27fffe6f9b9a4a40ad99..4b1bc40f414d8871b63271f3aa497fc2919b3c1c 100644
--- a/justin-local-meetups-2.md
+++ b/justin-local-meetups-2.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Justin's Local Meetup Talks Proposal #2: April to June
 author: samsunggalaxyplayer
 amount: 26
diff --git a/kovri-end-user-docs.md b/kovri-end-user-docs.md
index 19194945c8b48942335e09bc76cf4ceb427f9e9b..278f9ef3f49b0848a3873cd87e0932cff3f5d14d 100644
--- a/kovri-end-user-docs.md
+++ b/kovri-end-user-docs.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Create End-User Kovri documentation
 author: anonimal
 amount: 100
diff --git a/monero-bounty-hackerone.md b/monero-bounty-hackerone.md
index e47dfe2d98b73fbecdcd85087538b7479b50d29d..ab4cfc3e6546da5b597e90b9f23d0a3dedf0a1d9 100644
--- a/monero-bounty-hackerone.md
+++ b/monero-bounty-hackerone.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-fr
+layout: fr
 title: Monero Bounty For HackerOne
 address: 45ttEikQEZWN1m7VxaVN9rjQkpSdmpGZ82GwUps66neQ1PqbQMno4wMY8F5jiDt2GoHzCtMwa7PDPJUJYb1GYrMP4CwAwNp
 paymentid: 8d3526aed9a09a943788496751c78c8f4757e7f6f3234a547efe77f3c9c6cc4b
diff --git a/monero-integrations.md b/monero-integrations.md
index 057c4ff7a4d2fb908b2a487a635e61f9a87dcc4f..00e09c6372604041ce8a812d1d050d5f35516bc8 100644
--- a/monero-integrations.md
+++ b/monero-integrations.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Monero integrations with web apps
 author: serhack
 amount: 126
diff --git a/monero-subforum-8btc.md b/monero-subforum-8btc.md
index 9d3ba819f05b62f84430c2664a15b4cb512db4f6..d9965cd00309135edf7a19202e64f890f8245be7 100644
--- a/monero-subforum-8btc.md
+++ b/monero-subforum-8btc.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Funding for a Monero subforum on the largest chinese BTC forum 8BTC
 author: firperfect
 amount: 570
diff --git a/mooo-continuation-programming.md b/mooo-continuation-programming.md
index 49cd1c00f63c384ae76a46cc4aa4b3cef1589ec2..72fcdf6babfab62889be4f4b128d6db0dc8b501d 100644
--- a/mooo-continuation-programming.md
+++ b/mooo-continuation-programming.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: A continuation for all purpose programming of what needs to get done in monero
 author: moneromooo
 amount: 18,000
diff --git a/more-mooo-coding-goodness.md b/more-mooo-coding-goodness.md
index c5ac8f21bf66346fbc967235e1462bdb70626aca..308c192b770211eab3cbb45b2605ef7ea1a8fa2b 100644
--- a/more-mooo-coding-goodness.md
+++ b/more-mooo-coding-goodness.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: More mooo coding goodness
 author: moneromooo
 amount: 1800
diff --git a/official-qt-gui.md b/official-qt-gui.md
index 0e21366d0ae02ba82732c12a609099876ab687d7..26a2b48edbf0e380fc7b93ee7d982cf28e2fcdf0 100644
--- a/official-qt-gui.md
+++ b/official-qt-gui.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: The official Qt GUI Project
 author: othe
 amount: 14,000
diff --git a/qr-code-for-fr.md b/qr-code-for-fr.md
index c3540f6c0b0c18b3d21897078ac3c7045d8e06ee..f1e842a01baeb03deebf73629866e1cef693afa7 100644
--- a/qr-code-for-fr.md
+++ b/qr-code-for-fr.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-fr
+layout: fr
 title: QR Codes for Funding Required
 summary: The title says it all!
 author: m2049r
diff --git a/release-pool-software.md b/release-pool-software.md
index 610d2395d1fcce4f19212fa3b8e753b394ec2b3e..a55b3baf78615351d2797f22670a2397eca7f14b 100644
--- a/release-pool-software.md
+++ b/release-pool-software.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: Release of new/updated pool software
 author: Snipa22
 amount: 800
diff --git a/whatismonero-produced.md b/whatismonero-produced.md
index 281fdb30d7181f3b31bfb0990baa15ed4d0a3e56..39d3a86c164268a74feae6831a23c3d1ab571b20 100644
--- a/whatismonero-produced.md
+++ b/whatismonero-produced.md
@@ -1,5 +1,5 @@
 ---
-layout: ffs-cp
+layout: cp
 title: What is Monero? is produced and open-sourced
 author: savandra
 amount: 72