diff --git a/README.mediawiki b/README.mediawiki
index da18d6b3..9ee9e98f 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -433,12 +433,12 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Marco Pontello
 | Standard
 | Draft
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0123.mediawiki|123]]
 | BIP Classification
 | Eric Lombrozo
 | Process
-| Draft
+| Active
 |-
 | [[bip-0124.mediawiki|124]]
 | Hierarchical Deterministic Script Templates
diff --git a/bip-0010.mediawiki b/bip-0010.mediawiki
index d15cd77e..ef8da665 100644
--- a/bip-0010.mediawiki
+++ b/bip-0010.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 10
+  Layer: Applications
   Title: Multi-Sig Transaction Distribution
   Author: Alan Reiner <etotheipi@gmail.com>
   Status: Withdrawn
diff --git a/bip-0011.mediawiki b/bip-0011.mediawiki
index 4b12340d..1248d38d 100644
--- a/bip-0011.mediawiki
+++ b/bip-0011.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 11
+  Layer: Applications
   Title: M-of-N Standard Transactions
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0012.mediawiki b/bip-0012.mediawiki
index ee2fda6b..d55cf87d 100644
--- a/bip-0012.mediawiki
+++ b/bip-0012.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 12
+  Layer: Consensus (soft fork)
   Title: OP_EVAL
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Withdrawn
diff --git a/bip-0013.mediawiki b/bip-0013.mediawiki
index a537d16a..833ffeac 100644
--- a/bip-0013.mediawiki
+++ b/bip-0013.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 13
+  Layer: Applications
   Title: Address Format for pay-to-script-hash
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0014.mediawiki b/bip-0014.mediawiki
index f11cb630..61c625a5 100644
--- a/bip-0014.mediawiki
+++ b/bip-0014.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 14
+  Layer: Peer Services
   Title: Protocol Version and User Agent
   Author: Amir Taaki <genjix@riseup.net>
           Patrick Strateman <bitcoin-bips@covertinferno.org>
diff --git a/bip-0015.mediawiki b/bip-0015.mediawiki
index b90539da..c340e876 100644
--- a/bip-0015.mediawiki
+++ b/bip-0015.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 15
+  Layer: Applications
   Title: Aliases
   Author: Amir Taaki <genjix@riseup.net>
   Status: Deferred
diff --git a/bip-0016.mediawiki b/bip-0016.mediawiki
index 25b652db..9d7fdf8c 100644
--- a/bip-0016.mediawiki
+++ b/bip-0016.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 16
+  Layer: Consensus (soft fork)
   Title: Pay to Script Hash
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0017.mediawiki b/bip-0017.mediawiki
index 44011d57..af001cfc 100644
--- a/bip-0017.mediawiki
+++ b/bip-0017.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 17
+  Layer: Consensus (soft fork)
   Title: OP_CHECKHASHVERIFY (CHV)
   Author: Luke Dashjr <luke+bip17@dashjr.org>
   Status: Withdrawn
diff --git a/bip-0018.mediawiki b/bip-0018.mediawiki
index fce42004..9dadcf3f 100644
--- a/bip-0018.mediawiki
+++ b/bip-0018.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 18
+  Layer: Consensus (soft fork)
   Title: hashScriptCheck
   Author: Luke Dashjr <luke+bip17@dashjr.org>
   Status: Accepted
diff --git a/bip-0019.mediawiki b/bip-0019.mediawiki
index 7784e084..5ad0e0b2 100644
--- a/bip-0019.mediawiki
+++ b/bip-0019.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 19
+  Layer: Applications
   Title: M-of-N Standard Transactions (Low SigOp)
   Author: Luke Dashjr <luke+bip17@dashjr.org>
   Status: Draft
diff --git a/bip-0020.mediawiki b/bip-0020.mediawiki
index fad634b7..2ce8bb3a 100644
--- a/bip-0020.mediawiki
+++ b/bip-0020.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 20
+  Layer: Applications
   Title: URI Scheme
   Author: Luke Dashjr <luke+bip@dashjr.org>
   Status: Replaced
diff --git a/bip-0021.mediawiki b/bip-0021.mediawiki
index 513b8bb8..2862679a 100644
--- a/bip-0021.mediawiki
+++ b/bip-0021.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 21
+  Layer: Applications
   Title: URI Scheme
   Author: Nils Schneider <nils.schneider@gmail.com>
           Matt Corallo <bip21@bluematt.me>
diff --git a/bip-0022.mediawiki b/bip-0022.mediawiki
index 4b33e595..785d05d6 100644
--- a/bip-0022.mediawiki
+++ b/bip-0022.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 22
+  Layer: API/RPC
   Title: getblocktemplate - Fundamentals
   Author: Luke Dashjr <luke+bip22@dashjr.org>
   Status: Final
diff --git a/bip-0023.mediawiki b/bip-0023.mediawiki
index 03909587..660880ef 100644
--- a/bip-0023.mediawiki
+++ b/bip-0023.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 23
+  Layer: API/RPC
   Title: getblocktemplate - Pooled Mining
   Author: Luke Dashjr <luke+bip22@dashjr.org>
   Status: Final
diff --git a/bip-0030.mediawiki b/bip-0030.mediawiki
index 135d3006..679ef8a5 100644
--- a/bip-0030.mediawiki
+++ b/bip-0030.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 30
+  Layer: Consensus (soft fork)
   Title: Duplicate transactions
   Author: Pieter Wuille <pieter.wuille@gmail.com>
   Status: Final
diff --git a/bip-0031.mediawiki b/bip-0031.mediawiki
index 1bfe143c..e30e125e 100644
--- a/bip-0031.mediawiki
+++ b/bip-0031.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 31
+  Layer: Peer Services
   Title: Pong message
   Author: Mike Hearn <hearn@google.com>
   Status: Final
diff --git a/bip-0032.mediawiki b/bip-0032.mediawiki
index 0c660ad8..da09c9fb 100644
--- a/bip-0032.mediawiki
+++ b/bip-0032.mediawiki
@@ -6,6 +6,7 @@ RECENT CHANGES:
 
 <pre>
   BIP: 32
+  Layer: Applications
   Title: Hierarchical Deterministic Wallets
   Author: Pieter Wuille <pieter.wuille@gmail.com>
   Status: Final
diff --git a/bip-0033.mediawiki b/bip-0033.mediawiki
index 6768e198..254e21ed 100644
--- a/bip-0033.mediawiki
+++ b/bip-0033.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 33
+  Layer: Peer Services
   Title: Stratized Nodes
   Author: Amir Taaki <genjix@riseup.net>
   Status: Draft
diff --git a/bip-0034.mediawiki b/bip-0034.mediawiki
index 4870fc13..d8b70455 100644
--- a/bip-0034.mediawiki
+++ b/bip-0034.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 34
+  Layer: Consensus (soft fork)
   Title: Block v2, Height in Coinbase
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0035.mediawiki b/bip-0035.mediawiki
index c66735ca..5b69eeee 100644
--- a/bip-0035.mediawiki
+++ b/bip-0035.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 35
+  Layer: Peer Services
   Title: mempool message
   Author: Jeff Garzik <jgarzik@exmulti.com>
   Status: Final
diff --git a/bip-0036.mediawiki b/bip-0036.mediawiki
index 9c61fdb6..cfcd7d72 100644
--- a/bip-0036.mediawiki
+++ b/bip-0036.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 36
+  Layer: Peer Services
   Title: Custom Services
   Author: Stefan Thomas <justmoon@members.fsf.org>
   Status: Draft
diff --git a/bip-0037.mediawiki b/bip-0037.mediawiki
index eba06287..65d4004a 100644
--- a/bip-0037.mediawiki
+++ b/bip-0037.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 37
+  Layer: Peer Services
   Title: Connection Bloom filtering
   Author: Mike Hearn <hearn@google.com>
           Matt Corallo <bip37@bluematt.me>
diff --git a/bip-0038.mediawiki b/bip-0038.mediawiki
index 650b7d02..facc27df 100644
--- a/bip-0038.mediawiki
+++ b/bip-0038.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 38
+  Layer: Applications
   Title: Passphrase-protected private key
   Author: Mike Caldwell <mcaldwell@swipeclock.com>
           Aaron Voisine <voisine@gmail.com>
diff --git a/bip-0039.mediawiki b/bip-0039.mediawiki
index f0f59099..ef3dda3c 100644
--- a/bip-0039.mediawiki
+++ b/bip-0039.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 39
+  Layer: Applications
   Title: Mnemonic code for generating deterministic keys
   Author: Marek Palatinus <slush@satoshilabs.com>
           Pavol Rusnak <stick@satoshilabs.com>
diff --git a/bip-0042.mediawiki b/bip-0042.mediawiki
index d7ce71c4..87b0977c 100644
--- a/bip-0042.mediawiki
+++ b/bip-0042.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 42
+  Layer: Consensus (soft fork)
   Title: A finite monetary supply for Bitcoin
   Author: Pieter Wuille <pieter.wuille@gmail.com>
   Status: Draft
diff --git a/bip-0043.mediawiki b/bip-0043.mediawiki
index 686221aa..8a164c06 100644
--- a/bip-0043.mediawiki
+++ b/bip-0043.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 43
+  Layer: Applications
   Title: Purpose Field for Deterministic Wallets
   Author: Marek Palatinus <slush@satoshilabs.com>
           Pavol Rusnak <stick@satoshilabs.com>
diff --git a/bip-0044.mediawiki b/bip-0044.mediawiki
index c289887a..43fdbd9d 100644
--- a/bip-0044.mediawiki
+++ b/bip-0044.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 44
+  Layer: Applications
   Title: Multi-Account Hierarchy for Deterministic Wallets
   Author: Marek Palatinus <slush@satoshilabs.com>
           Pavol Rusnak <stick@satoshilabs.com>
diff --git a/bip-0045.mediawiki b/bip-0045.mediawiki
index 757fc7fe..22a51423 100644
--- a/bip-0045.mediawiki
+++ b/bip-0045.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 45
+  Layer: Applications
   Title: Structure for Deterministic P2SH Multisignature Wallets
   Author: Manuel Araoz <manu@bitpay.com>
           Ryan X. Charles <ryan@bitpay.com>
diff --git a/bip-0047.mediawiki b/bip-0047.mediawiki
index b1145b38..1aba5018 100644
--- a/bip-0047.mediawiki
+++ b/bip-0047.mediawiki
@@ -5,6 +5,7 @@ RECENT CHANGES:
 
 <pre>
   BIP: 47
+  Layer: Applications
   Title: Reusable Payment Codes for Hierarchical Deterministic Wallets
   Author: Justus Ranvier <justus@openbitcoinprivacyproject.org>
   Status: Draft
diff --git a/bip-0049.mediawiki b/bip-0049.mediawiki
index 4460ba76..3f465b15 100644
--- a/bip-0049.mediawiki
+++ b/bip-0049.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 49
+  Layer: Applications
   Title: Derivation scheme for P2WPKH-nested-in-P2SH based accounts
   Author: Daniel Weigl <Daniel.Weigl@mycelium.com>
   Status: Draft
@@ -101,4 +102,4 @@ This BIP is not backwards compatible by design as described under [#consideratio
 
 == Copyright ==
 
-This document is placed in the public domain.
\ No newline at end of file
+This document is placed in the public domain.
diff --git a/bip-0060.mediawiki b/bip-0060.mediawiki
index ae9592ad..28c7ba60 100644
--- a/bip-0060.mediawiki
+++ b/bip-0060.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 60
+  Layer: Peer Services
   Title: Fixed Length "version" Message (Relay-Transactions Field)
   Author: Amir Taaki <genjix@riseup.net>
   Status: Draft
diff --git a/bip-0061.mediawiki b/bip-0061.mediawiki
index aca329a7..7fa8c7cd 100644
--- a/bip-0061.mediawiki
+++ b/bip-0061.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 61
+  Layer: Peer Services
   Title: Reject P2P message
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0062.mediawiki b/bip-0062.mediawiki
index 28b20dd8..13cf6580 100644
--- a/bip-0062.mediawiki
+++ b/bip-0062.mediawiki
@@ -2,6 +2,7 @@
 
 <pre>
   BIP: 62
+  Layer: Consensus (soft fork)
   Title: Dealing with malleability
   Author: Pieter Wuille <pieter.wuille@gmail.com>
   Status: Withdrawn
diff --git a/bip-0064.mediawiki b/bip-0064.mediawiki
index b03dcac1..43c5b0fa 100644
--- a/bip-0064.mediawiki
+++ b/bip-0064.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 64
+  Layer: Peer Services
   Title: getutxo message
   Author: Mike Hearn <hearn@vinumeris.com>
   Status: Draft
@@ -100,4 +101,4 @@ results.
 
 ==Implementation==
 
-https://github.com/bitcoin/bitcoin/pull/4351/files
\ No newline at end of file
+https://github.com/bitcoin/bitcoin/pull/4351/files
diff --git a/bip-0065.mediawiki b/bip-0065.mediawiki
index 99298bf1..012a8deb 100644
--- a/bip-0065.mediawiki
+++ b/bip-0065.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 65
+  Layer: Consensus (soft fork)
   Title: OP_CHECKLOCKTIMEVERIFY
   Author: Peter Todd <pete@petertodd.org>
   Status: Final
diff --git a/bip-0066.mediawiki b/bip-0066.mediawiki
index 1235afde..421b445d 100644
--- a/bip-0066.mediawiki
+++ b/bip-0066.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 66
+  Layer: Consensus (soft fork)
   Title: Strict DER signatures
   Author: Pieter Wuille <pieter.wuille@gmail.com>
   Status: Final
diff --git a/bip-0067.mediawiki b/bip-0067.mediawiki
index 13e2ed99..0d3f4f49 100644
--- a/bip-0067.mediawiki
+++ b/bip-0067.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 67
+  Layer: Applications
   Title: Deterministic Pay-to-script-hash multi-signature addresses through public key sorting
   Author: Thomas Kerin <me@thomaskerin.io>
           Jean-Pierre Rupp <root@haskoin.com>
diff --git a/bip-0068.mediawiki b/bip-0068.mediawiki
index 923441ec..fbd0a7ab 100644
--- a/bip-0068.mediawiki
+++ b/bip-0068.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 68
+  Layer: Consensus (soft fork)
   Title: Relative lock-time using consensus-enforced sequence numbers
   Author: Mark Friedenbach <mark@friedenbach.org>
           BtcDrak <btcdrak@gmail.com>
diff --git a/bip-0069.mediawiki b/bip-0069.mediawiki
index 832438c4..dd7ae9f8 100644
--- a/bip-0069.mediawiki
+++ b/bip-0069.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 69
+  Layer: Applications
   Title: Lexicographical Indexing of Transaction Inputs and Outputs
   Author: Kristov Atlas <kristov@openbitcoinprivacyproject.org>
   Editor: Daniel Cousens <bips@dcousens.com>
diff --git a/bip-0070.mediawiki b/bip-0070.mediawiki
index e3c17cf0..b09530e3 100644
--- a/bip-0070.mediawiki
+++ b/bip-0070.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 70
+  Layer: Applications
   Title: Payment Protocol
   Author: Gavin Andresen <gavinandresen@gmail.com>
           Mike Hearn <mhearn@bitcoinfoundation.org>
diff --git a/bip-0071.mediawiki b/bip-0071.mediawiki
index 1fc84892..9fd2e814 100644
--- a/bip-0071.mediawiki
+++ b/bip-0071.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 71
+  Layer: Applications
   Title: Payment Protocol MIME types
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0072.mediawiki b/bip-0072.mediawiki
index 4dcc48b5..86546808 100644
--- a/bip-0072.mediawiki
+++ b/bip-0072.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 72
+  Layer: Applications
   Title: bitcoin: uri extensions for Payment Protocol
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Final
diff --git a/bip-0073.mediawiki b/bip-0073.mediawiki
index 41c89a30..1e93d810 100644
--- a/bip-0073.mediawiki
+++ b/bip-0073.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 73
+  Layer: Applications
   Title: Use "Accept" header for response type negotiation with Payment Request URLs
   Author: Stephen Pair <stephen@bitpay.com>
   Status: Final
diff --git a/bip-0074.mediawiki b/bip-0074.mediawiki
index a860b381..526cb9c2 100644
--- a/bip-0074.mediawiki
+++ b/bip-0074.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 74
+  Layer: Applications
   Title: Allow zero value OP_RETURN in Payment Protocol
   Author: Toby Padilla <tobypadilla@gmail.com>
   Status: Draft
diff --git a/bip-0075.mediawiki b/bip-0075.mediawiki
index 878d708e..f23a84b1 100644
--- a/bip-0075.mediawiki
+++ b/bip-0075.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 75
+  Layer: Applications
   Title: Out of Band Address Exchange using Payment Protocol Encryption
   Author: Justin Newton <justin@netki.com>
           Matt David <mgd@mgddev.com>
diff --git a/bip-0083.mediawiki b/bip-0083.mediawiki
index f6aa8e77..9897e883 100644
--- a/bip-0083.mediawiki
+++ b/bip-0083.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 83
+  Layer: Applications
   Title: Dynamic Hierarchical Deterministic Key Trees
   Author: Eric Lombrozo <eric@ciphrex.com>
   Status: Draft
diff --git a/bip-0101.mediawiki b/bip-0101.mediawiki
index cc8cfd5f..23f490c3 100644
--- a/bip-0101.mediawiki
+++ b/bip-0101.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 101
+  Layer: Consensus (hard fork)
   Title: Increase maximum block size
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Withdrawn
diff --git a/bip-0102.mediawiki b/bip-0102.mediawiki
index fc909f75..3ba2d4a3 100644
--- a/bip-0102.mediawiki
+++ b/bip-0102.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 102
+  Layer: Consensus (hard fork)
   Title: Block size increase to 2MB
   Author: Jeff Garzik <jgarzik@gmail.com>
   Status: Draft
diff --git a/bip-0103.mediawiki b/bip-0103.mediawiki
index 39e8a3f6..71c6d2a5 100644
--- a/bip-0103.mediawiki
+++ b/bip-0103.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 103
+  Layer: Consensus (hard fork)
   Title: Block size following technological growth
   Author: Pieter Wuille <pieter.wuille@gmail.com>
   Status: Draft
diff --git a/bip-0105.mediawiki b/bip-0105.mediawiki
index c4f0a099..021bc3aa 100644
--- a/bip-0105.mediawiki
+++ b/bip-0105.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 105
+  Layer: Consensus (hard fork)
   Title: Consensus based block size retargeting algorithm
   Author: BtcDrak <btcdrak@gmail.com>
   Status: Draft
diff --git a/bip-0106.mediawiki b/bip-0106.mediawiki
index e9018fac..9f64f13b 100644
--- a/bip-0106.mediawiki
+++ b/bip-0106.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 106
+  Layer: Consensus (hard fork)
   Title: Dynamically Controlled Bitcoin Block Size Max Cap
   Author: Upal Chakraborty <bitcoin@upalc.com>
   Status: Draft
diff --git a/bip-0107.mediawiki b/bip-0107.mediawiki
index 86edd995..440866a7 100644
--- a/bip-0107.mediawiki
+++ b/bip-0107.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 107
+  Layer: Consensus (hard fork)
   Title: Dynamic limit on the block size
   Author: Washington Y. Sanchez <washington.sanchez@gmail.com>
   Status: Draft
diff --git a/bip-0109.mediawiki b/bip-0109.mediawiki
index 667ef5f5..6de37abf 100644
--- a/bip-0109.mediawiki
+++ b/bip-0109.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 109
+  Layer: Consensus (hard fork)
   Title: Two million byte size limit with sigop and sighash limits
   Author: Gavin Andresen <gavinandresen@gmail.com>
   Status: Draft
diff --git a/bip-0111.mediawiki b/bip-0111.mediawiki
index 45578329..7e20e658 100644
--- a/bip-0111.mediawiki
+++ b/bip-0111.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 111
+  Layer: Peer Services
   Title: NODE_BLOOM service bit
   Author: Matt Corallo <bip111@bluematt.me>
           Peter Todd <pete@petertodd.org>
diff --git a/bip-0112.mediawiki b/bip-0112.mediawiki
index 40378ee7..fb736647 100644
--- a/bip-0112.mediawiki
+++ b/bip-0112.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 112
+  Layer: Consensus (soft fork)
   Title: CHECKSEQUENCEVERIFY
   Author: BtcDrak <btcdrak@gmail.com>
           Mark Friedenbach <mark@friedenbach.org>
diff --git a/bip-0113.mediawiki b/bip-0113.mediawiki
index 1c402aa0..8842e63c 100644
--- a/bip-0113.mediawiki
+++ b/bip-0113.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 113
+  Layer: Consensus (soft fork)
   Title: Median time-past as endpoint for lock-time calculations
   Author: Thomas Kerin <me@thomaskerin.io>
           Mark Friedenbach <mark@friedenbach.org>
diff --git a/bip-0114.mediawiki b/bip-0114.mediawiki
index cb9aea7c..1838c56e 100644
--- a/bip-0114.mediawiki
+++ b/bip-0114.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 114
+  Layer: Consensus (soft fork)
   Title: Merkelized Abstract Syntax Tree
   Author: Johnson Lau <jl2012@xbt.hk>
   Status: Draft
diff --git a/bip-0120.mediawiki b/bip-0120.mediawiki
index 1602c655..89be19a7 100644
--- a/bip-0120.mediawiki
+++ b/bip-0120.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 120
+  Layer: Applications
   Title: Proof of Payment
   Author: Kalle Rosenbaum <kalle@rosenbaum.se>
   Status: Draft
diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index bafe8564..f0aaf343 100644
--- a/bip-0121.mediawiki
+++ b/bip-0121.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 121
+  Layer: Applications
   Title: Proof of Payment URI scheme
   Author: Kalle Rosenbaum <kalle@rosenbaum.se>
   Status: Draft
diff --git a/bip-0122.mediawiki b/bip-0122.mediawiki
index 5386dd27..0457f73c 100644
--- a/bip-0122.mediawiki
+++ b/bip-0122.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 122
+  Layer: Applications
   Title: URI scheme for Blockchain references / exploration
   Author: Marco Pontello <marcopon@gmail.com>
   Status: Draft
diff --git a/bip-0123.mediawiki b/bip-0123.mediawiki
index 3005f012..3f3f5e62 100644
--- a/bip-0123.mediawiki
+++ b/bip-0123.mediawiki
@@ -2,7 +2,7 @@
   BIP: 123
   Title: BIP Classification
   Author: Eric Lombrozo <elombrozo@gmail.com>
-  Status: Draft
+  Status: Active
   Type: Process
   Created: 2015-08-26
 </pre>
diff --git a/bip-0124.mediawiki b/bip-0124.mediawiki
index 2f9f4ad7..ea1c72df 100644
--- a/bip-0124.mediawiki
+++ b/bip-0124.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 124
+  Layer: Applications
   Title: Hierarchical Deterministic Script Templates
   Author: Eric Lombrozo <eric@ciphrex.com>
           William Swanson <swansontec@gmail.com>
diff --git a/bip-0125.mediawiki b/bip-0125.mediawiki
index 52dfe404..7773c7b6 100644
--- a/bip-0125.mediawiki
+++ b/bip-0125.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 125
+  Layer: Applications
   Title: Opt-in Full Replace-by-Fee Signaling
   Author: David A. Harding <dave@dtrt.org>
           Peter Todd <pete@petertodd.org>
diff --git a/bip-0130.mediawiki b/bip-0130.mediawiki
index ae1e602a..9f5365b7 100644
--- a/bip-0130.mediawiki
+++ b/bip-0130.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 130
+  Layer: Peer Services
   Title: sendheaders message
   Author: Suhas Daftuar <sdaftuar@chaincode.com>
   Status: Accepted
diff --git a/bip-0131.mediawiki b/bip-0131.mediawiki
index 1efe7133..2a1699c5 100644
--- a/bip-0131.mediawiki
+++ b/bip-0131.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 131
+  Layer: Consensus (hard fork)
   Title: "Coalescing Transaction" Specification (wildcard inputs)
   Author: Chris Priest <cp368202@ohiou.edu>
   Status: Draft
diff --git a/bip-0133.mediawiki b/bip-0133.mediawiki
index 7d98f87c..bebba7e5 100644
--- a/bip-0133.mediawiki
+++ b/bip-0133.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 133
+  Layer: Peer Services
   Title: feefilter message
   Author: Alex Morcos <morcos@chaincode.com>
   Status: Draft
diff --git a/bip-0134.mediawiki b/bip-0134.mediawiki
index fa2103bd..eb3cab62 100644
--- a/bip-0134.mediawiki
+++ b/bip-0134.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 134
+  Layer: Consensus (hard fork)
   Title: Flexible Transactions
   Author: Tom Zander <tomz@freedommail.ch>
   Status: Draft
diff --git a/bip-0140.mediawiki b/bip-0140.mediawiki
index b187a49b..71637f27 100644
--- a/bip-0140.mediawiki
+++ b/bip-0140.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 140
+  Layer: Consensus (soft fork)
   Title: Normalized TXID
   Author: Christian Decker <decker.christian@gmail.com>
   Status: Draft
@@ -110,4 +111,4 @@ This is a softfork which replaces <code>OP_NOP4</code> with the new implementati
 <references>
 
 ==Copyright==
-This document is placed in the public domain.
\ No newline at end of file
+This document is placed in the public domain.
diff --git a/bip-0141.mediawiki b/bip-0141.mediawiki
index 352256f7..4a90ff00 100644
--- a/bip-0141.mediawiki
+++ b/bip-0141.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 141
+  Layer: Consensus (soft fork)
   Title: Segregated Witness (Consensus layer)
   Author: Eric Lombrozo <elombrozo@gmail.com>
           Johnson Lau <jl2012@xbt.hk>
diff --git a/bip-0142.mediawiki b/bip-0142.mediawiki
index bb602653..87134548 100644
--- a/bip-0142.mediawiki
+++ b/bip-0142.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 142
+  Layer: Applications
   Title: Address Format for Segregated Witness
   Author: Johnson Lau <jl2012@xbt.hk>
   Status: Deferred
diff --git a/bip-0143.mediawiki b/bip-0143.mediawiki
index 766fd9f2..dc6fbfef 100644
--- a/bip-0143.mediawiki
+++ b/bip-0143.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 143
+  Layer: Consensus (soft fork)
   Title: Transaction Signature Verification for Version 0 Witness Program
   Author: Johnson Lau <jl2012@xbt.hk>
           Pieter Wuille <pieter.wuille@gmail.com>
diff --git a/bip-0144.mediawiki b/bip-0144.mediawiki
index f10fe0cd..4e428238 100644
--- a/bip-0144.mediawiki
+++ b/bip-0144.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 144
+  Layer: Peer Services
   Title: Segregated Witness (Peer Services)
   Author: Eric Lombrozo <elombrozo@gmail.com>
           Pieter Wuille <pieter.wuille@gmail.com>
diff --git a/bip-0145.mediawiki b/bip-0145.mediawiki
index cac838df..d26b6464 100644
--- a/bip-0145.mediawiki
+++ b/bip-0145.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 145
+  Layer: API/RPC
   Title: getblocktemplate Updates for Segregated Witness
   Author: Luke Dashjr <luke+bip22@dashjr.org>
   Status: Draft
diff --git a/bip-0146.mediawiki b/bip-0146.mediawiki
index 5358411a..635c015a 100644
--- a/bip-0146.mediawiki
+++ b/bip-0146.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 146
+  Layer: Consensus (soft fork)
   Title: Dealing with signature encoding malleability
   Author: Johnson Lau <jl2012@xbt.hk>
           Pieter Wuille <pieter.wuille@gmail.com>
diff --git a/bip-0147.mediawiki b/bip-0147.mediawiki
index 001abc65..4a1aa87d 100644
--- a/bip-0147.mediawiki
+++ b/bip-0147.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 147
+  Layer: Consensus (soft fork)
   Title: Dealing with dummy stack element malleability
   Author: Johnson Lau <jl2012@xbt.hk>
   Status: Draft
diff --git a/bip-0150.mediawiki b/bip-0150.mediawiki
index b1d46c1b..161a6615 100644
--- a/bip-0150.mediawiki
+++ b/bip-0150.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 150
+  Layer: Peer Services
   Title: Peer Authentication
   Author: Jonas Schnelli <dev@jonasschnelli.ch>
   Status: Draft
diff --git a/bip-0151.mediawiki b/bip-0151.mediawiki
index cf221f24..19ac196c 100644
--- a/bip-0151.mediawiki
+++ b/bip-0151.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 151
+  Layer: Peer Services
   Title: Peer-to-Peer Communication Encryption
   Author: Jonas Schnelli <dev@jonasschnelli.ch>
   Status: Draft
diff --git a/bip-0152.mediawiki b/bip-0152.mediawiki
index e05cc2ac..169cb6be 100644
--- a/bip-0152.mediawiki
+++ b/bip-0152.mediawiki
@@ -1,5 +1,6 @@
 <pre>
   BIP: 152
+  Layer: Peer Services
   Title: Compact Block Relay
   Author: Matt Corallo <bip152@bluematt.me>
   Status: Draft
diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl
index d8f52f2a..dbd42d9c 100755
--- a/scripts/buildtable.pl
+++ b/scripts/buildtable.pl
@@ -3,6 +3,7 @@ use strict;
 use warnings;
 
 my $topbip = 9999;
+my $include_layer = 0;
 
 my %RequiredFields = (
 	BIP => undef,
@@ -31,6 +32,13 @@ my %MiscField = (
 	'Resolution' => undef,
 );
 
+my %ValidLayer = (
+	'Consensus (soft fork)' => undef,
+	'Consensus (hard fork)' => undef,
+	'Peer Services' => undef,
+	'API/RPC' => undef,
+	'Applications' => undef,
+);
 my %ValidStatus = (
 	Draft => undef,
 	Deferred => undef,
@@ -58,7 +66,7 @@ while (++$bipnum <= $topbip) {
 			die "No <pre> in $fn" if eof $F;
 	}
 	my %found;
-	my ($title, $author, $status, $type);
+	my ($title, $author, $status, $type, $layer);
 	my ($field, $val);
 	while (<$F>) {
 		m[^</pre>$] && last;
@@ -103,6 +111,9 @@ while (++$bipnum <= $topbip) {
 			} else {
 				$type = $val;
 			}
+		} elsif ($field eq 'Layer') {  # BIP 123
+			die "Invalid layer $val in $fn" unless exists $ValidLayer{$val};
+			$layer = $val;
 		} elsif (exists $DateField{$field}) {
 			die "Invalid date format in $fn" unless $val =~ /^20\d{2}\-(?:0\d|1[012])\-(?:[012]\d|30|31)$/;
 		} elsif (exists $EmailField{$field}) {
@@ -120,6 +131,13 @@ while (++$bipnum <= $topbip) {
 	}
 	print "\n";
 	print "| [[${fn}|${bipnum}]]\n";
+	if ($include_layer) {
+		if (defined $layer) {
+			print "| ${layer}\n";
+		} else {
+			print "|\n";
+		}
+	}
 	print "| ${title}\n";
 	print "| ${author}\n";
 	print "| ${type}\n";