diff --git a/docs/api/runtime-events.md b/docs/api/runtime-events.md
index 33e2b4f7912042b0cac877e83d37d310f7c03dd9..23975913768043782d37b27cab0a469c91a0ef93 100644
--- a/docs/api/runtime-events.md
+++ b/docs/api/runtime-events.md
@@ -6,23 +6,20 @@ There are **130** events from **37** pallets.
 <li>System - 0
 <ul>
 <li>
-<code>ExtrinsicSuccess(dispatch_info)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ExtrinsicSuccess(dispatch_info)</code> - 0</summary>
 
 ```rust
 dispatch_info: DispatchInfo
 ```
 
 </details>
-
 </li>
 <li>
-<code>ExtrinsicFailed(dispatch_error, dispatch_info)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ExtrinsicFailed(dispatch_error, dispatch_info)</code> - 1</summary>
 
 ```rust
 dispatch_error: DispatchError
@@ -30,43 +27,44 @@ dispatch_info: DispatchInfo
 ```
 
 </details>
-
 </li>
 <li>
-<code>CodeUpdated()</code> - 2
+<details>
+<summary>
+<code>CodeUpdated()</code> - 2</summary>
 
+```rust
+no args
+```
+
+</details>
 </li>
 <li>
-<code>NewAccount(account)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewAccount(account)</code> - 3</summary>
 
 ```rust
 account: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>KilledAccount(account)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>KilledAccount(account)</code> - 4</summary>
 
 ```rust
 account: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>Remarked(sender, hash)</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Remarked(sender, hash)</code> - 5</summary>
 
 ```rust
 sender: T::AccountId
@@ -74,17 +72,15 @@ hash: T::Hash
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Account - 1
 <ul>
 <li>
-<code>ForceDestroy(who, balance)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ForceDestroy(who, balance)</code> - 0</summary>
 
 ```rust
 who: T::AccountId
@@ -92,13 +88,11 @@ balance: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>RandomIdAssigned(who, random_id)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RandomIdAssigned(who, random_id)</code> - 1</summary>
 
 ```rust
 who: T::AccountId
@@ -106,13 +100,11 @@ random_id: H256
 ```
 
 </details>
-
 </li>
 <li>
-<code>AccountLinked(who, identity)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>AccountLinked(who, identity)</code> - 2</summary>
 
 ```rust
 who: T::AccountId
@@ -120,30 +112,26 @@ identity: IdtyIdOf<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>AccountUnlinked()</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>AccountUnlinked()</code> - 3</summary>
 
 ```rust
 : T::AccountId
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Scheduler - 2
 <ul>
 <li>
-<code>Scheduled(when, index)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Scheduled(when, index)</code> - 0</summary>
 
 ```rust
 when: T::BlockNumber
@@ -151,13 +139,11 @@ index: u32
 ```
 
 </details>
-
 </li>
 <li>
-<code>Canceled(when, index)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Canceled(when, index)</code> - 1</summary>
 
 ```rust
 when: T::BlockNumber
@@ -165,13 +151,11 @@ index: u32
 ```
 
 </details>
-
 </li>
 <li>
-<code>Dispatched(task, id, result)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Dispatched(task, id, result)</code> - 2</summary>
 
 ```rust
 task: TaskAddress<T::BlockNumber>
@@ -180,13 +164,11 @@ result: DispatchResult
 ```
 
 </details>
-
 </li>
 <li>
-<code>CallUnavailable(task, id)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>CallUnavailable(task, id)</code> - 3</summary>
 
 ```rust
 task: TaskAddress<T::BlockNumber>
@@ -194,13 +176,11 @@ id: Option<TaskName>
 ```
 
 </details>
-
 </li>
 <li>
-<code>PeriodicFailed(task, id)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>PeriodicFailed(task, id)</code> - 4</summary>
 
 ```rust
 task: TaskAddress<T::BlockNumber>
@@ -208,13 +188,11 @@ id: Option<TaskName>
 ```
 
 </details>
-
 </li>
 <li>
-<code>PermanentlyOverweight(task, id)</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>PermanentlyOverweight(task, id)</code> - 5</summary>
 
 ```rust
 task: TaskAddress<T::BlockNumber>
@@ -222,7 +200,6 @@ id: Option<TaskName>
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
@@ -241,10 +218,9 @@ id: Option<TaskName>
 <li>Balances - 6
 <ul>
 <li>
-<code>Endowed(account, free_balance)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Endowed(account, free_balance)</code> - 0</summary>
 
 ```rust
 account: T::AccountId
@@ -252,13 +228,11 @@ free_balance: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>DustLost(account, amount)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>DustLost(account, amount)</code> - 1</summary>
 
 ```rust
 account: T::AccountId
@@ -266,13 +240,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Transfer(from, to, amount)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Transfer(from, to, amount)</code> - 2</summary>
 
 ```rust
 from: T::AccountId
@@ -281,13 +253,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>BalanceSet(who, free)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>BalanceSet(who, free)</code> - 3</summary>
 
 ```rust
 who: T::AccountId
@@ -295,13 +265,11 @@ free: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Reserved(who, amount)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Reserved(who, amount)</code> - 4</summary>
 
 ```rust
 who: T::AccountId
@@ -309,13 +277,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Unreserved(who, amount)</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Unreserved(who, amount)</code> - 5</summary>
 
 ```rust
 who: T::AccountId
@@ -323,13 +289,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>ReserveRepatriated(from, to, amount, destination_status)</code> - 6
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ReserveRepatriated(from, to, amount, destination_status)</code> - 6</summary>
 
 ```rust
 from: T::AccountId
@@ -339,13 +303,11 @@ destination_status: Status
 ```
 
 </details>
-
 </li>
 <li>
-<code>Deposit(who, amount)</code> - 7
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Deposit(who, amount)</code> - 7</summary>
 
 ```rust
 who: T::AccountId
@@ -353,13 +315,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Withdraw(who, amount)</code> - 8
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Withdraw(who, amount)</code> - 8</summary>
 
 ```rust
 who: T::AccountId
@@ -367,13 +327,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Slashed(who, amount)</code> - 9
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Slashed(who, amount)</code> - 9</summary>
 
 ```rust
 who: T::AccountId
@@ -381,13 +339,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Minted(who, amount)</code> - 10
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Minted(who, amount)</code> - 10</summary>
 
 ```rust
 who: T::AccountId
@@ -395,13 +351,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Burned(who, amount)</code> - 11
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Burned(who, amount)</code> - 11</summary>
 
 ```rust
 who: T::AccountId
@@ -409,13 +363,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Suspended(who, amount)</code> - 12
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Suspended(who, amount)</code> - 12</summary>
 
 ```rust
 who: T::AccountId
@@ -423,13 +375,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Restored(who, amount)</code> - 13
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Restored(who, amount)</code> - 13</summary>
 
 ```rust
 who: T::AccountId
@@ -437,52 +387,44 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Upgraded(who)</code> - 14
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Upgraded(who)</code> - 14</summary>
 
 ```rust
 who: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>Issued(amount)</code> - 15
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Issued(amount)</code> - 15</summary>
 
 ```rust
 amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Rescinded(amount)</code> - 16
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Rescinded(amount)</code> - 16</summary>
 
 ```rust
 amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Locked(who, amount)</code> - 17
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Locked(who, amount)</code> - 17</summary>
 
 ```rust
 who: T::AccountId
@@ -490,13 +432,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Unlocked(who, amount)</code> - 18
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Unlocked(who, amount)</code> - 18</summary>
 
 ```rust
 who: T::AccountId
@@ -504,13 +444,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Frozen(who, amount)</code> - 19
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Frozen(who, amount)</code> - 19</summary>
 
 ```rust
 who: T::AccountId
@@ -518,13 +456,11 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 <li>
-<code>Thawed(who, amount)</code> - 20
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Thawed(who, amount)</code> - 20</summary>
 
 ```rust
 who: T::AccountId
@@ -532,17 +468,15 @@ amount: T::Balance
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>TransactionPayment - 32
 <ul>
 <li>
-<code>TransactionFeePaid(who, actual_fee, tip)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>TransactionFeePaid(who, actual_fee, tip)</code> - 0</summary>
 
 ```rust
 who: T::AccountId
@@ -551,17 +485,15 @@ tip: BalanceOf<T>
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>OneshotAccount - 7
 <ul>
 <li>
-<code>OneshotAccountCreated(account, balance, creator)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>OneshotAccountCreated(account, balance, creator)</code> - 0</summary>
 
 ```rust
 account: T::AccountId
@@ -570,13 +502,11 @@ creator: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>OneshotAccountConsumed(account, dest1, dest2)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>OneshotAccountConsumed(account, dest1, dest2)</code> - 1</summary>
 
 ```rust
 account: T::AccountId
@@ -587,13 +517,11 @@ dest2: Option<
 ```
 
 </details>
-
 </li>
 <li>
-<code>Withdraw(account, balance)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Withdraw(account, balance)</code> - 2</summary>
 
 ```rust
 account: T::AccountId
@@ -601,17 +529,15 @@ balance: <T::Currency as Currency<T::AccountId>>::Balance
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Quota - 66
 <ul>
 <li>
-<code>Refunded(who, identity, amount)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Refunded(who, identity, amount)</code> - 0</summary>
 
 ```rust
 who: T::AccountId
@@ -620,123 +546,120 @@ amount: BalanceOf<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>NoQuotaForIdty()</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NoQuotaForIdty()</code> - 1</summary>
 
 ```rust
 : IdtyId<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>NoMoreCurrencyForRefund()</code> - 2
+<details>
+<summary>
+<code>NoMoreCurrencyForRefund()</code> - 2</summary>
 
+```rust
+no args
+```
+
+</details>
 </li>
 <li>
-<code>RefundFailed()</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RefundFailed()</code> - 3</summary>
 
 ```rust
 : T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>RefundQueueFull()</code> - 4
+<details>
+<summary>
+<code>RefundQueueFull()</code> - 4</summary>
+
+```rust
+no args
+```
 
+</details>
 </li>
 </ul>
 </li>
 <li>AuthorityMembers - 10
 <ul>
 <li>
-<code>IncomingAuthorities()</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>IncomingAuthorities()</code> - 0</summary>
 
 ```rust
 : Vec<T::MemberId>
 ```
 
 </details>
-
 </li>
 <li>
-<code>OutgoingAuthorities()</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>OutgoingAuthorities()</code> - 1</summary>
 
 ```rust
 : Vec<T::MemberId>
 ```
 
 </details>
-
 </li>
 <li>
-<code>MemberGoOffline()</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MemberGoOffline()</code> - 2</summary>
 
 ```rust
 : T::MemberId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MemberGoOnline()</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MemberGoOnline()</code> - 3</summary>
 
 ```rust
 : T::MemberId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MemberRemoved()</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MemberRemoved()</code> - 4</summary>
 
 ```rust
 : T::MemberId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MemberRemovedFromBlackList()</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MemberRemovedFromBlackList()</code> - 5</summary>
 
 ```rust
 : T::MemberId
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
@@ -747,10 +670,9 @@ amount: BalanceOf<T>
 <li>Offences - 12
 <ul>
 <li>
-<code>Offence(kind, timeslot)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Offence(kind, timeslot)</code> - 0</summary>
 
 ```rust
 kind: Kind
@@ -758,7 +680,6 @@ timeslot: OpaqueTimeSlot
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
@@ -769,76 +690,89 @@ timeslot: OpaqueTimeSlot
 <li>Session - 14
 <ul>
 <li>
-<code>NewSession(session_index)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewSession(session_index)</code> - 0</summary>
 
 ```rust
 session_index: SessionIndex
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Grandpa - 15
 <ul>
 <li>
-<code>NewAuthorities(authority_set)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewAuthorities(authority_set)</code> - 0</summary>
 
 ```rust
 authority_set: AuthorityList
 ```
 
 </details>
-
 </li>
 <li>
-<code>Paused()</code> - 1
+<details>
+<summary>
+<code>Paused()</code> - 1</summary>
 
+```rust
+no args
+```
+
+</details>
 </li>
 <li>
-<code>Resumed()</code> - 2
+<details>
+<summary>
+<code>Resumed()</code> - 2</summary>
+
+```rust
+no args
+```
 
+</details>
 </li>
 </ul>
 </li>
 <li>ImOnline - 16
 <ul>
 <li>
-<code>HeartbeatReceived(authority_id)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>HeartbeatReceived(authority_id)</code> - 0</summary>
 
 ```rust
 authority_id: T::AuthorityId
 ```
 
 </details>
-
 </li>
 <li>
-<code>AllGood()</code> - 1
+<details>
+<summary>
+<code>AllGood()</code> - 1</summary>
+
+```rust
+no args
+```
 
+</details>
 </li>
 <li>
-<code>SomeOffline(offline)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>SomeOffline(offline)</code> - 2</summary>
 
 ```rust
 offline: Vec<IdentificationTuple<T>>
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
@@ -849,113 +783,98 @@ offline: Vec<IdentificationTuple<T>>
 <li>Sudo - 20
 <ul>
 <li>
-<code>Sudid(sudo_result)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Sudid(sudo_result)</code> - 0</summary>
 
 ```rust
 sudo_result: DispatchResult
 ```
 
 </details>
-
 </li>
 <li>
-<code>KeyChanged(old_sudoer)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>KeyChanged(old_sudoer)</code> - 1</summary>
 
 ```rust
 old_sudoer: Option<T::AccountId>
 ```
 
 </details>
-
 </li>
 <li>
-<code>SudoAsDone(sudo_result)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>SudoAsDone(sudo_result)</code> - 2</summary>
 
 ```rust
 sudo_result: DispatchResult
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>UpgradeOrigin - 21
 <ul>
 <li>
-<code>DispatchedAsRoot(result)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>DispatchedAsRoot(result)</code> - 0</summary>
 
 ```rust
 result: DispatchResult
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Preimage - 22
 <ul>
 <li>
-<code>Noted(hash)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Noted(hash)</code> - 0</summary>
 
 ```rust
 hash: T::Hash
 ```
 
 </details>
-
 </li>
 <li>
-<code>Requested(hash)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Requested(hash)</code> - 1</summary>
 
 ```rust
 hash: T::Hash
 ```
 
 </details>
-
 </li>
 <li>
-<code>Cleared(hash)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Cleared(hash)</code> - 2</summary>
 
 ```rust
 hash: T::Hash
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>TechnicalCommittee - 23
 <ul>
 <li>
-<code>Proposed(account, proposal_index, proposal_hash, threshold)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Proposed(account, proposal_index, proposal_hash, threshold)</code> - 0</summary>
 
 ```rust
 account: T::AccountId
@@ -965,13 +884,11 @@ threshold: MemberCount
 ```
 
 </details>
-
 </li>
 <li>
-<code>Voted(account, proposal_hash, voted, yes, no)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Voted(account, proposal_hash, voted, yes, no)</code> - 1</summary>
 
 ```rust
 account: T::AccountId
@@ -982,39 +899,33 @@ no: MemberCount
 ```
 
 </details>
-
 </li>
 <li>
-<code>Approved(proposal_hash)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Approved(proposal_hash)</code> - 2</summary>
 
 ```rust
 proposal_hash: T::Hash
 ```
 
 </details>
-
 </li>
 <li>
-<code>Disapproved(proposal_hash)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Disapproved(proposal_hash)</code> - 3</summary>
 
 ```rust
 proposal_hash: T::Hash
 ```
 
 </details>
-
 </li>
 <li>
-<code>Executed(proposal_hash, result)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Executed(proposal_hash, result)</code> - 4</summary>
 
 ```rust
 proposal_hash: T::Hash
@@ -1022,13 +933,11 @@ result: DispatchResult
 ```
 
 </details>
-
 </li>
 <li>
-<code>MemberExecuted(proposal_hash, result)</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MemberExecuted(proposal_hash, result)</code> - 5</summary>
 
 ```rust
 proposal_hash: T::Hash
@@ -1036,13 +945,11 @@ result: DispatchResult
 ```
 
 </details>
-
 </li>
 <li>
-<code>Closed(proposal_hash, yes, no)</code> - 6
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Closed(proposal_hash, yes, no)</code> - 6</summary>
 
 ```rust
 proposal_hash: T::Hash
@@ -1051,17 +958,15 @@ no: MemberCount
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>UniversalDividend - 30
 <ul>
 <li>
-<code>NewUdCreated(amount, index, monetary_mass, members_count)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewUdCreated(amount, index, monetary_mass, members_count)</code> - 0</summary>
 
 ```rust
 amount: BalanceOf<T>
@@ -1071,13 +976,11 @@ members_count: BalanceOf<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>UdReevalued(new_ud_amount, monetary_mass, members_count)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>UdReevalued(new_ud_amount, monetary_mass, members_count)</code> - 1</summary>
 
 ```rust
 new_ud_amount: BalanceOf<T>
@@ -1086,13 +989,11 @@ members_count: BalanceOf<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>UdsAutoPaidAtRemoval(count, total, who)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>UdsAutoPaidAtRemoval(count, total, who)</code> - 2</summary>
 
 ```rust
 count: UdIndex
@@ -1101,13 +1002,11 @@ who: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>UdsClaimed(count, total, who)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>UdsClaimed(count, total, who)</code> - 3</summary>
 
 ```rust
 count: UdIndex
@@ -1116,7 +1015,6 @@ who: T::AccountId
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
@@ -1127,10 +1025,9 @@ who: T::AccountId
 <li>Identity - 41
 <ul>
 <li>
-<code>IdtyCreated(idty_index, owner_key)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>IdtyCreated(idty_index, owner_key)</code> - 0</summary>
 
 ```rust
 idty_index: T::IdtyIndex
@@ -1138,13 +1035,11 @@ owner_key: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>IdtyConfirmed(idty_index, owner_key, name)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>IdtyConfirmed(idty_index, owner_key, name)</code> - 1</summary>
 
 ```rust
 idty_index: T::IdtyIndex
@@ -1153,26 +1048,22 @@ name: IdtyName
 ```
 
 </details>
-
 </li>
 <li>
-<code>IdtyValidated(idty_index)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>IdtyValidated(idty_index)</code> - 2</summary>
 
 ```rust
 idty_index: T::IdtyIndex
 ```
 
 </details>
-
 </li>
 <li>
-<code>IdtyChangedOwnerKey(idty_index, new_owner_key)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>IdtyChangedOwnerKey(idty_index, new_owner_key)</code> - 3</summary>
 
 ```rust
 idty_index: T::IdtyIndex
@@ -1180,13 +1071,11 @@ new_owner_key: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>IdtyRemoved(idty_index, reason)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>IdtyRemoved(idty_index, reason)</code> - 4</summary>
 
 ```rust
 idty_index: T::IdtyIndex
@@ -1194,99 +1083,85 @@ reason: IdtyRemovalReason<T::IdtyRemovalOtherReason>
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Membership - 42
 <ul>
 <li>
-<code>MembershipAcquired()</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipAcquired()</code> - 0</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipExpired()</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipExpired()</code> - 1</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipRenewed()</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipRenewed()</code> - 2</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipRequested()</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipRequested()</code> - 3</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipRevoked()</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipRevoked()</code> - 4</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>PendingMembershipExpired()</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>PendingMembershipExpired()</code> - 5</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Cert - 43
 <ul>
 <li>
-<code>NewCert(issuer, issuer_issued_count, receiver, receiver_received_count)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewCert(issuer, issuer_issued_count, receiver, receiver_received_count)</code> - 0</summary>
 
 ```rust
 issuer: T::IdtyIndex
@@ -1296,13 +1171,11 @@ receiver_received_count: u32
 ```
 
 </details>
-
 </li>
 <li>
-<code>RemovedCert(issuer, issuer_issued_count, receiver, receiver_received_count, expiration)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RemovedCert(issuer, issuer_issued_count, receiver, receiver_received_count, expiration)</code> - 1</summary>
 
 ```rust
 issuer: T::IdtyIndex
@@ -1313,13 +1186,11 @@ expiration: bool
 ```
 
 </details>
-
 </li>
 <li>
-<code>RenewedCert(issuer, receiver)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RenewedCert(issuer, receiver)</code> - 2</summary>
 
 ```rust
 issuer: T::IdtyIndex
@@ -1327,7 +1198,6 @@ receiver: T::IdtyIndex
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
@@ -1342,92 +1212,79 @@ receiver: T::IdtyIndex
 <li>SmithMembership - 52
 <ul>
 <li>
-<code>MembershipAcquired()</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipAcquired()</code> - 0</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipExpired()</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipExpired()</code> - 1</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipRenewed()</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipRenewed()</code> - 2</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipRequested()</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipRequested()</code> - 3</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>MembershipRevoked()</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MembershipRevoked()</code> - 4</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 <li>
-<code>PendingMembershipExpired()</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>PendingMembershipExpired()</code> - 5</summary>
 
 ```rust
 : T::IdtyId
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>SmithCert - 53
 <ul>
 <li>
-<code>NewCert(issuer, issuer_issued_count, receiver, receiver_received_count)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewCert(issuer, issuer_issued_count, receiver, receiver_received_count)</code> - 0</summary>
 
 ```rust
 issuer: T::IdtyIndex
@@ -1437,13 +1294,11 @@ receiver_received_count: u32
 ```
 
 </details>
-
 </li>
 <li>
-<code>RemovedCert(issuer, issuer_issued_count, receiver, receiver_received_count, expiration)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RemovedCert(issuer, issuer_issued_count, receiver, receiver_received_count, expiration)</code> - 1</summary>
 
 ```rust
 issuer: T::IdtyIndex
@@ -1454,13 +1309,11 @@ expiration: bool
 ```
 
 </details>
-
 </li>
 <li>
-<code>RenewedCert(issuer, receiver)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RenewedCert(issuer, receiver)</code> - 2</summary>
 
 ```rust
 issuer: T::IdtyIndex
@@ -1468,17 +1321,15 @@ receiver: T::IdtyIndex
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>AtomicSwap - 60
 <ul>
 <li>
-<code>NewSwap(account, proof, swap)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewSwap(account, proof, swap)</code> - 0</summary>
 
 ```rust
 account: T::AccountId
@@ -1487,13 +1338,11 @@ swap: PendingSwap<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>SwapClaimed(account, proof, success)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>SwapClaimed(account, proof, success)</code> - 1</summary>
 
 ```rust
 account: T::AccountId
@@ -1502,13 +1351,11 @@ success: bool
 ```
 
 </details>
-
 </li>
 <li>
-<code>SwapCancelled(account, proof)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>SwapCancelled(account, proof)</code> - 2</summary>
 
 ```rust
 account: T::AccountId
@@ -1516,17 +1363,15 @@ proof: HashedProof
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Multisig - 61
 <ul>
 <li>
-<code>NewMultisig(approving, multisig, call_hash)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>NewMultisig(approving, multisig, call_hash)</code> - 0</summary>
 
 ```rust
 approving: T::AccountId
@@ -1535,13 +1380,11 @@ call_hash: CallHash
 ```
 
 </details>
-
 </li>
 <li>
-<code>MultisigApproval(approving, timepoint, multisig, call_hash)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MultisigApproval(approving, timepoint, multisig, call_hash)</code> - 1</summary>
 
 ```rust
 approving: T::AccountId
@@ -1551,13 +1394,11 @@ call_hash: CallHash
 ```
 
 </details>
-
 </li>
 <li>
-<code>MultisigExecuted(approving, timepoint, multisig, call_hash, result)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MultisigExecuted(approving, timepoint, multisig, call_hash, result)</code> - 2</summary>
 
 ```rust
 approving: T::AccountId
@@ -1568,13 +1409,11 @@ result: DispatchResult
 ```
 
 </details>
-
 </li>
 <li>
-<code>MultisigCancelled(cancelling, timepoint, multisig, call_hash)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>MultisigCancelled(cancelling, timepoint, multisig, call_hash)</code> - 3</summary>
 
 ```rust
 cancelling: T::AccountId
@@ -1584,17 +1423,15 @@ call_hash: CallHash
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>ProvideRandomness - 62
 <ul>
 <li>
-<code>FilledRandomness(request_id, randomness)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>FilledRandomness(request_id, randomness)</code> - 0</summary>
 
 ```rust
 request_id: RequestId
@@ -1602,13 +1439,11 @@ randomness: H256
 ```
 
 </details>
-
 </li>
 <li>
-<code>RequestedRandomness(request_id, salt, r#type)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>RequestedRandomness(request_id, salt, r#type)</code> - 1</summary>
 
 ```rust
 request_id: RequestId
@@ -1617,30 +1452,26 @@ r#type: RandomnessType
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Proxy - 63
 <ul>
 <li>
-<code>ProxyExecuted(result)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ProxyExecuted(result)</code> - 0</summary>
 
 ```rust
 result: DispatchResult
 ```
 
 </details>
-
 </li>
 <li>
-<code>PureCreated(pure, who, proxy_type, disambiguation_index)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>PureCreated(pure, who, proxy_type, disambiguation_index)</code> - 1</summary>
 
 ```rust
 pure: T::AccountId
@@ -1650,13 +1481,11 @@ disambiguation_index: u16
 ```
 
 </details>
-
 </li>
 <li>
-<code>Announced(real, proxy, call_hash)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Announced(real, proxy, call_hash)</code> - 2</summary>
 
 ```rust
 real: T::AccountId
@@ -1665,13 +1494,11 @@ call_hash: CallHashOf<T>
 ```
 
 </details>
-
 </li>
 <li>
-<code>ProxyAdded(delegator, delegatee, proxy_type, delay)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ProxyAdded(delegator, delegatee, proxy_type, delay)</code> - 3</summary>
 
 ```rust
 delegator: T::AccountId
@@ -1681,13 +1508,11 @@ delay: T::BlockNumber
 ```
 
 </details>
-
 </li>
 <li>
-<code>ProxyRemoved(delegator, delegatee, proxy_type, delay)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ProxyRemoved(delegator, delegatee, proxy_type, delay)</code> - 4</summary>
 
 ```rust
 delegator: T::AccountId
@@ -1697,17 +1522,15 @@ delay: T::BlockNumber
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Utility - 64
 <ul>
 <li>
-<code>BatchInterrupted(index, error)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>BatchInterrupted(index, error)</code> - 0</summary>
 
 ```rust
 index: u32
@@ -1715,81 +1538,92 @@ error: DispatchError
 ```
 
 </details>
-
 </li>
 <li>
-<code>BatchCompleted()</code> - 1
+<details>
+<summary>
+<code>BatchCompleted()</code> - 1</summary>
 
+```rust
+no args
+```
+
+</details>
 </li>
 <li>
-<code>BatchCompletedWithErrors()</code> - 2
+<details>
+<summary>
+<code>BatchCompletedWithErrors()</code> - 2</summary>
 
+```rust
+no args
+```
+
+</details>
 </li>
 <li>
-<code>ItemCompleted()</code> - 3
+<details>
+<summary>
+<code>ItemCompleted()</code> - 3</summary>
 
+```rust
+no args
+```
+
+</details>
 </li>
 <li>
-<code>ItemFailed(error)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>ItemFailed(error)</code> - 4</summary>
 
 ```rust
 error: DispatchError
 ```
 
 </details>
-
 </li>
 <li>
-<code>DispatchedAs(result)</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>DispatchedAs(result)</code> - 5</summary>
 
 ```rust
 result: DispatchResult
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
 <li>Treasury - 65
 <ul>
 <li>
-<code>Proposed(proposal_index)</code> - 0
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Proposed(proposal_index)</code> - 0</summary>
 
 ```rust
 proposal_index: ProposalIndex
 ```
 
 </details>
-
 </li>
 <li>
-<code>Spending(budget_remaining)</code> - 1
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Spending(budget_remaining)</code> - 1</summary>
 
 ```rust
 budget_remaining: BalanceOf<T, I>
 ```
 
 </details>
-
 </li>
 <li>
-<code>Awarded(proposal_index, award, account)</code> - 2
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Awarded(proposal_index, award, account)</code> - 2</summary>
 
 ```rust
 proposal_index: ProposalIndex
@@ -1798,13 +1632,11 @@ account: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>Rejected(proposal_index, slashed)</code> - 3
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Rejected(proposal_index, slashed)</code> - 3</summary>
 
 ```rust
 proposal_index: ProposalIndex
@@ -1812,52 +1644,44 @@ slashed: BalanceOf<T, I>
 ```
 
 </details>
-
 </li>
 <li>
-<code>Burnt(burnt_funds)</code> - 4
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Burnt(burnt_funds)</code> - 4</summary>
 
 ```rust
 burnt_funds: BalanceOf<T, I>
 ```
 
 </details>
-
 </li>
 <li>
-<code>Rollover(rollover_balance)</code> - 5
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Rollover(rollover_balance)</code> - 5</summary>
 
 ```rust
 rollover_balance: BalanceOf<T, I>
 ```
 
 </details>
-
 </li>
 <li>
-<code>Deposit(value)</code> - 6
-
 <details>
-<summary>args</summary>
+<summary>
+<code>Deposit(value)</code> - 6</summary>
 
 ```rust
 value: BalanceOf<T, I>
 ```
 
 </details>
-
 </li>
 <li>
-<code>SpendApproved(proposal_index, amount, beneficiary)</code> - 7
-
 <details>
-<summary>args</summary>
+<summary>
+<code>SpendApproved(proposal_index, amount, beneficiary)</code> - 7</summary>
 
 ```rust
 proposal_index: ProposalIndex
@@ -1866,13 +1690,11 @@ beneficiary: T::AccountId
 ```
 
 </details>
-
 </li>
 <li>
-<code>UpdatedInactive(reactivated, deactivated)</code> - 8
-
 <details>
-<summary>args</summary>
+<summary>
+<code>UpdatedInactive(reactivated, deactivated)</code> - 8</summary>
 
 ```rust
 reactivated: BalanceOf<T, I>
@@ -1880,7 +1702,6 @@ deactivated: BalanceOf<T, I>
 ```
 
 </details>
-
 </li>
 </ul>
 </li>
diff --git a/xtask/res/templates/runtime-events.md b/xtask/res/templates/runtime-events.md
index 4f74c8e8d7fd6cf422bee0bf1c5a1c42fb56378b..d458e31db0a7685644b24de391296d4d4c179775 100644
--- a/xtask/res/templates/runtime-events.md
+++ b/xtask/res/templates/runtime-events.md
@@ -8,23 +8,22 @@ There are **{{event_counter}}** events from **{{ pallets | length }}** pallets.
 <ul>
 {% for event in pallet.events -%}
 <li>
+<details>
+<summary>
 <code>{{ event.name }}(
 {%- for param in event.params -%}
 {{ param.name }}{% if loop.last != true %}, {% endif %} 
 {%- endfor -%}
-)</code> - {{ event.index }}
-{% if event.params | length != 0 %}
-<details>
-<summary>args</summary>
+)</code> - {{ event.index }}</summary>
 
 ```rust
 {% for param in event.params -%}
 {{ param.name }}: {{ param.type_name }}
+{%- else -%}no args
 {% endfor -%}
 ```
 
 </details>
-{% endif %}
 </li>
 {% endfor -%}
 </ul>