diff --git a/events/adopting-bitcoin-2025/assets/thumbnail.webp b/events/adopting-bitcoin-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..618dfd138a
Binary files /dev/null and b/events/adopting-bitcoin-2025/assets/thumbnail.webp differ
diff --git a/events/adopting-bitcoin-2025/event.yml b/events/adopting-bitcoin-2025/event.yml
new file mode 100644
index 0000000000..8e63ce424c
--- /dev/null
+++ b/events/adopting-bitcoin-2025/event.yml
@@ -0,0 +1,24 @@
+- start_date: 2025-11-14 16:00:00
+  end_date: 2025-11-15 23:00:00
+  timezone: America/El_Salvador
+  address_line_1: Antiguo Cuscatlan, El Salvador
+  address_line_2:
+  address_line_3:
+  name: Adopting Bitcoin 2025
+  builder: Adopting Bitcoin
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: El Salvador is the first country to adopt Bitcoin, making it the ground-zero for global Bitcoin adoption.
+  language:
+    - en
+    - es
+  links:
+    website: https://sv24.adoptingbitcoin.org/
+    replay_url:
+    live_url:
+  tags:
+    - adoption
+    - innovation
+    - case-studies
diff --git a/events/adopting-bitcoin-cape-town-2025/assets/thumbnail.webp b/events/adopting-bitcoin-cape-town-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..7de8f51942
Binary files /dev/null and b/events/adopting-bitcoin-cape-town-2025/assets/thumbnail.webp differ
diff --git a/events/adopting-bitcoin-cape-town-2025/event.yml b/events/adopting-bitcoin-cape-town-2025/event.yml
new file mode 100644
index 0000000000..2d940982fd
--- /dev/null
+++ b/events/adopting-bitcoin-cape-town-2025/event.yml
@@ -0,0 +1,21 @@
+- start_date: 2025-01-24
+  end_date: 2025-01-25
+  address_line_1: Cape town, South Africa
+  address_line_2: Workshop17 Watershed
+  address_line_3:
+  name: Adopting Bitcoin Cape Town 2025
+  builder: Adopting Bitcoin
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: you are curious to learn how Bitcoin fits into the process of reshaping the financial system
+  language:
+    - en
+  links:
+    website: https://za25.adoptingbitcoin.org/
+    replay_url:
+    live_url:
+  tags:
+    - adoption
+    - regulation
diff --git a/events/bea-scotland-2025/assets/thumbnail.webp b/events/bea-scotland-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..bbc259c9a6
Binary files /dev/null and b/events/bea-scotland-2025/assets/thumbnail.webp differ
diff --git a/events/bea-scotland-2025/event.yml b/events/bea-scotland-2025/event.yml
new file mode 100644
index 0000000000..aa11bf895c
--- /dev/null
+++ b/events/bea-scotland-2025/event.yml
@@ -0,0 +1,16 @@
+- start_date: 2025-01-09 09:00:00
+  end_date: 2025-01-12 17:00:00
+  timezone: Europe/London
+  address_line_1: Edinburgh, Scotland
+  name: Bitcoin Educators Academy Scotland 2025
+  builder: Amity Age
+  type: course
+  description: Experience 3 intense days of learning how to communicate and educate Bitcoin in a simple and efficient way!
+  language:
+    - en
+  links:
+    website: https://www.amityage.com/bea
+  tags:
+    - proof-of-work
+    - DIY
+    - deep-dive
diff --git a/events/bea-women-milan-2025/assets/thumbnail.webp b/events/bea-women-milan-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..6a3851291d
Binary files /dev/null and b/events/bea-women-milan-2025/assets/thumbnail.webp differ
diff --git a/events/bea-women-milan-2025/event.yml b/events/bea-women-milan-2025/event.yml
new file mode 100644
index 0000000000..b31496f554
--- /dev/null
+++ b/events/bea-women-milan-2025/event.yml
@@ -0,0 +1,16 @@
+- start_date: 2025-01-17 08:00:00
+  end_date: 2025-01-19 16:00:00
+  timezone: Europe/Rome
+  address_line_1: Milan, Italy
+  name: Bitcoin Educators Academy For Women Italy 2025
+  builder: Amity Age
+  type: course
+  description: Experience 3 intense days of learning how to communicate and educate Bitcoin in a simple and efficient way!
+  language:
+    - en
+  links:
+    website: https://www.amityage.com/bea
+  tags:
+    - adoption
+    - DIY
+    - proof-of-work
diff --git a/events/bitblockboom-2025/assets/thumbnail.webp b/events/bitblockboom-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..243c9195eb
Binary files /dev/null and b/events/bitblockboom-2025/assets/thumbnail.webp differ
diff --git a/events/bitblockboom-2025/event.yml b/events/bitblockboom-2025/event.yml
new file mode 100644
index 0000000000..1582cc870b
--- /dev/null
+++ b/events/bitblockboom-2025/event.yml
@@ -0,0 +1,16 @@
+- start_date: 2025-04-03 16:00:00
+  end_date: 2025-04-06 23:00:00
+  timezone: US/Mountain
+  address_line_1: Dallas, Texas, USA
+  name: BitBlockBoom 2025
+  builder: BitBlockBoom
+  type: conference
+  description: The worlds oldest bitcoin conference celebrating its 8th year.
+  language:
+    - en
+  links:
+    website: https://bitblockboom.com/
+  tags:
+    - decentralization
+    - consensus
+    - network-security
diff --git a/events/bitcoin-alive-2025/assets/thumbnail.webp b/events/bitcoin-alive-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..1bed43306f
Binary files /dev/null and b/events/bitcoin-alive-2025/assets/thumbnail.webp differ
diff --git a/events/bitcoin-alive-2025/event.yml b/events/bitcoin-alive-2025/event.yml
new file mode 100644
index 0000000000..080dcaec9b
--- /dev/null
+++ b/events/bitcoin-alive-2025/event.yml
@@ -0,0 +1,17 @@
+- start_date: 2025-03-07 21:00:00
+  end_date: 2025-03-08 05:00:00
+  timezone: Australia/Sydney
+  address_line_1: Sydney, Australia
+  address_line_2: The Roundhouse
+  name: Bitcoin Alive 2025
+  builder: Bitcoin Alive
+  type: conference
+  description: Bitcoin Alive brings together Australia’s Bitcoin community for a day of the highest quality Bitcoin content - featuring the best Bitcoin minds from Australia and the world.
+  language:
+    - en
+  links:
+    website: https://bitcoinalive.io/
+  tags:
+    - adoption
+    - software
+    - decentralization
diff --git a/events/bitcoin-film-fest-2025/assets/thumbnail.webp b/events/bitcoin-film-fest-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..e7d540c252
Binary files /dev/null and b/events/bitcoin-film-fest-2025/assets/thumbnail.webp differ
diff --git a/events/bitcoin-film-fest-2025/event.yml b/events/bitcoin-film-fest-2025/event.yml
new file mode 100644
index 0000000000..03a37c11da
--- /dev/null
+++ b/events/bitcoin-film-fest-2025/event.yml
@@ -0,0 +1,16 @@
+- start_date: 2025-05-23 17:00:00
+  end_date: 2025-05-25 21:00:00
+  timezone: Europe/Warsaw
+  address_line_1: Warsaw, Poland
+  name: The Heart of Bitcoin Cinema
+  builder: bitcoin film fest
+  type: conference
+  description: Bitcoin FilmFest is a Bitcoin-Only project that made its debut in March 2023 by running the world’s first large-scale Bitcoin film festival (aka BFF) in Warsaw, Poland.
+  language:
+    - en
+  links:
+    website: https://bitcoinfilmfest.com/
+  tags:
+    - proof-of-work
+    - innovation
+    - use-case
diff --git a/events/bitcoin-las-vegas-2025/assets/thumbnail.webp b/events/bitcoin-las-vegas-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..4e0c562718
Binary files /dev/null and b/events/bitcoin-las-vegas-2025/assets/thumbnail.webp differ
diff --git a/events/bitcoin-las-vegas-2025/event.yml b/events/bitcoin-las-vegas-2025/event.yml
new file mode 100644
index 0000000000..c17d041a56
--- /dev/null
+++ b/events/bitcoin-las-vegas-2025/event.yml
@@ -0,0 +1,23 @@
+- start_date: 2025-05-27 17:00:00
+  end_date: 2025-05-30 01:00:00
+  timezone: America/Los_Angeles
+  address_line_1: Las Vegas, USA
+  address_line_2:
+  address_line_3:
+  name: Bitcoin Las Vegas 2025
+  builder: bitcoin conference
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: Embrace the game theory
+  language:
+    - en
+  links:
+    website: https://b.tc/conference/2025
+    replay_url:
+    live_url:
+  tags:
+    - software
+    - investment
+    - innovation
diff --git a/events/bitcoin-mena-2024/event.yml b/events/bitcoin-mena-2024/event.yml
index 6b0c26241e..3c73416500 100644
--- a/events/bitcoin-mena-2024/event.yml
+++ b/events/bitcoin-mena-2024/event.yml
@@ -1,8 +1,9 @@
-- start_date: 2024-12-09 
-  end_date: 2024-12-10
+- start_date: 2024-12-09 06:00:00
+  end_date: 2024-12-10 14:00:00
+  timezone: Asia/Dubai
   address_line_1: Abu Dhabi, United Arab Emirates
-  address_line_2: 
-  address_line_3: 
+  address_line_2:
+  address_line_3:
   name: Bitcoin Mena 2024
   builder: The Bitcoin Conference
   type: conference
@@ -10,14 +11,12 @@
   book_in_person: false
   price_dollars: 0
   description: The bitcoin Conference is coming to Abu dhabi
-  language: 
+  language:
     - en
   links:
     website: https://b.tc/conference/mena
     replay_url:
-    live_url :
-  tags: 
+    live_url:
+  tags:
     - bitcoiner
     - General
-
-
diff --git a/events/btc-prague-2025/assets/thumbnail.webp b/events/btc-prague-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..257fe758b5
Binary files /dev/null and b/events/btc-prague-2025/assets/thumbnail.webp differ
diff --git a/events/btc-prague-2025/event.yml b/events/btc-prague-2025/event.yml
new file mode 100644
index 0000000000..6c4a020e48
--- /dev/null
+++ b/events/btc-prague-2025/event.yml
@@ -0,0 +1,24 @@
+- start_date: 2025-06-19 08:00:00
+  end_date: 2025-06-21 17:00:00
+  timezone: Europe/Prague
+  address_line_1: Prague, Czech Republic
+  address_line_2:
+  address_line_3:
+  name: BTC Prague 2025
+  builder: BTCprague
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: The biggest, most influential bitcoin event in Europe ever, again!
+  language:
+    - en
+    - cs
+  links:
+    website: https://www.btcprague.com/#
+    replay_url:
+    live_url:
+  tags:
+    - decentralization
+    - finance
+    - protocols
diff --git a/events/learning-bitcoin-2025/assets/thumbnail.webp b/events/learning-bitcoin-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..a09902bb24
Binary files /dev/null and b/events/learning-bitcoin-2025/assets/thumbnail.webp differ
diff --git a/events/learning-bitcoin-2025/event.yml b/events/learning-bitcoin-2025/event.yml
new file mode 100644
index 0000000000..87fc0b6461
--- /dev/null
+++ b/events/learning-bitcoin-2025/event.yml
@@ -0,0 +1,23 @@
+- start_date: 2025-08-16 17:00:00
+  end_date: 2025-08-18 01:00:00
+  timezone: America/Vancouver
+  address_line_1: Vancouver, Canada
+  address_line_2: Vancouver Convention Centre
+  address_line_3:
+  name: Learning Bitcoin 2025
+  builder: Bull Bitcoin
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: A Bitcoin Education Event presented by our inclusive approach ensures that everyone, regardless of their background or experience level, can embark on a journey of discovery and empowerment
+  language:
+    - en
+  links:
+    website: https://www.learningbitcoin.ca/
+    replay_url:
+    live_url:
+  tags:
+    - adoption
+    - guides
+    - proof-of-work
diff --git a/events/plan-b-lugano-forum-2025/assets/thumbnail.webp b/events/plan-b-lugano-forum-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..2aa095c138
Binary files /dev/null and b/events/plan-b-lugano-forum-2025/assets/thumbnail.webp differ
diff --git a/events/plan-b-lugano-forum-2025/event.yml b/events/plan-b-lugano-forum-2025/event.yml
new file mode 100644
index 0000000000..0c03b36605
--- /dev/null
+++ b/events/plan-b-lugano-forum-2025/event.yml
@@ -0,0 +1,24 @@
+- start_date: 2025-10-24 08:00:00
+  end_date: 2025-10-25 16:00:00
+  timezone: Europe/Zurich
+  address_line_1: Lugano, switzerland
+  address_line_2:
+  address_line_3:
+  name: Plan ₿ Lugano Forum 2025
+  builder: Lugano's Plan ₿
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: Lugano's Plan ₿ Forum is the premier Bitcoin conference bringing together world leaders, technologists, and entrepreneurs to discuss Bitcoin adoption, economics, financial freedom, and freedom of speech.
+  language:
+    - en
+    - it
+  links:
+    website: https://planb.lugano.ch/planb-forum/
+    replay_url:
+    live_url:
+  tags:
+    - finance
+    - investment
+    - adoption
diff --git a/events/planb-forum-elsalvador-2025/event.yml b/events/planb-forum-elsalvador-2025/event.yml
index b86e35f598..0192b257ff 100644
--- a/events/planb-forum-elsalvador-2025/event.yml
+++ b/events/planb-forum-elsalvador-2025/event.yml
@@ -1,23 +1,24 @@
-- start_date: 2025-01-31
-  end_date: 2025-02-01
+- start_date: 2025-01-30 16:00:00
+  end_date: 2025-02-31 23:00:00
+  timezone: America/El_Salvador
   address_line_1: San Salvador, El Salvador
   address_line_2: Colonia San Benito, Avenida De La Revolución
-  address_line_3: 
+  address_line_3:
   name: Plan ₿ Forum El Salvador 2025
-  builder: 
+  builder:
   type: conference
   book_online: false
   book_in_person: false
   price_dollars: 0
   description: Central America's premier Bitcoin conference, uniting global leaders, technologists, and entrepreneurs to discuss Bitcoin adoption, economics, financial freedom, and freedom of speech.
-  language: 
+  language:
     - en
     - es
   links:
     website: https://planb.sv/
     replay_url:
-    live_url :
-  tags: 
+    live_url:
+  tags:
     - International
     - Bitcoiner
-    - General
\ No newline at end of file
+    - General
diff --git a/events/tab-conf-2025/assets/thumbnail.webp b/events/tab-conf-2025/assets/thumbnail.webp
new file mode 100644
index 0000000000..941ba67883
Binary files /dev/null and b/events/tab-conf-2025/assets/thumbnail.webp differ
diff --git a/events/tab-conf-2025/event.yml b/events/tab-conf-2025/event.yml
new file mode 100644
index 0000000000..4beb2fff85
--- /dev/null
+++ b/events/tab-conf-2025/event.yml
@@ -0,0 +1,21 @@
+- start_date: 2025-10-13
+  end_date: 2025-10-16
+  address_line_1: Atalanta, USA
+  address_line_2:
+  address_line_3:
+  name: A Technical Bitcoin Conference
+  builder: TABConf
+  type: conference
+  book_online: false
+  book_in_person: false
+  price_dollars: 0
+  description: TABConf's mission is to create a forum for protocol and application developers to collaborate, debate, and innovate on Bitcoin.
+  language:
+    - en
+  links:
+    website: https://6.tabconf.com/
+    replay_url:
+    live_url:
+  tags:
+    - bitcoiner
+    - development
diff --git a/resources/builders/4nk-academy/assets/logo.webp b/resources/builders/4nk-academy/assets/logo.webp
new file mode 100644
index 0000000000..166a7a383e
Binary files /dev/null and b/resources/builders/4nk-academy/assets/logo.webp differ
diff --git a/resources/builders/4nk-academy/builder.yml b/resources/builders/4nk-academy/builder.yml
new file mode 100644
index 0000000000..6fc79be0a4
--- /dev/null
+++ b/resources/builders/4nk-academy/builder.yml
@@ -0,0 +1,25 @@
+name: 4NK Academy
+category: communities
+address_line_1: Bois-Guillaume, Rouen, France
+address_line_2: 75 allée Paul Langevin 76230 Bois-Guillaume
+address_line_3:
+language:
+  - fr
+
+links:
+  website: https://4nk.academy/
+  twitter: https://x.com/4NKACADEMY
+
+tags:
+  - adoption
+  - software
+  - proof-of-work
+
+original_language: en
+proofreading:
+  - language: en
+    last_contribution_date: 2024-12-02
+    urgency: 1
+    contributors_id:
+      - another-satoshi
+    reward: 0
diff --git a/resources/builders/4nk-academy/en.yml b/resources/builders/4nk-academy/en.yml
new file mode 100644
index 0000000000..42330f132f
--- /dev/null
+++ b/resources/builders/4nk-academy/en.yml
@@ -0,0 +1,9 @@
+description: |
+  4NK Academy is a leading educational initiative based in Rouen, France, dedicated to bridging the gap between Bitcoin and professional development. As the operational hub for the Normandie Bitcoin association, 4NK Academy focuses on preparing individuals for careers in Bitcoin and decentralized systems. Our programs offer in-depth technical knowledge and practical applications tailored to real-world professional scenarios.
+
+  We proudly host a Bitcoin-friendly coworking space, complete with a specialized library designed for Bitcoiners to study, collaborate, and innovate. Our mission extends beyond education—we aim to foster a community that aligns with Bitcoin’s ethos of freedom, privacy, and open-source principles.
+
+  4NK Academy actively contributes to the growth of the Bitcoin ecosystem through educational courses, public events, and partnerships with industry leaders.
+
+contributors:
+  - en
diff --git a/resources/builders/area-bitcoin/assets/logo.webp b/resources/builders/area-bitcoin/assets/logo.webp
new file mode 100644
index 0000000000..3bd1b42c22
Binary files /dev/null and b/resources/builders/area-bitcoin/assets/logo.webp differ
diff --git a/resources/builders/area-bitcoin/builder.yml b/resources/builders/area-bitcoin/builder.yml
new file mode 100644
index 0000000000..631a47c925
--- /dev/null
+++ b/resources/builders/area-bitcoin/builder.yml
@@ -0,0 +1,12 @@
+name: Area Bitcoin
+links:
+  website: https://www.areabitcoin.co/
+  twitter: https://x.com/areabitcoin
+  nost: https://primal.net/p/npub13zpemj05wvgadhgyyv4e0captmkd64p8kz323pfq87ffahrws0ms9yp5ww
+tags:
+  - education
+  - bitcoin-only
+
+category: education
+
+original_language: en
diff --git a/resources/builders/area-bitcoin/en.yml b/resources/builders/area-bitcoin/en.yml
new file mode 100644
index 0000000000..3f8adcf36f
--- /dev/null
+++ b/resources/builders/area-bitcoin/en.yml
@@ -0,0 +1,4 @@
+description: |
+  Area Bitcoin's mission is to elevate the knowledge of our students, our community and bitcoiners around the world to the highest levels of financial, intellectual and technological freedom.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/braiins/assets/logo.webp b/resources/builders/braiins/assets/logo.webp
new file mode 100644
index 0000000000..074e0d8fd7
Binary files /dev/null and b/resources/builders/braiins/assets/logo.webp differ
diff --git a/resources/builders/braiins/builder.yml b/resources/builders/braiins/builder.yml
new file mode 100644
index 0000000000..817f3b4282
--- /dev/null
+++ b/resources/builders/braiins/builder.yml
@@ -0,0 +1,11 @@
+name: Braiins
+links:
+  website: https://braiins.com/
+  twitter: https://x.com/BraiinsMining
+tags:
+  - hardware
+  - mining
+
+category: mining
+
+original_language: en
diff --git a/resources/builders/braiins/en.yml b/resources/builders/braiins/en.yml
new file mode 100644
index 0000000000..748e21dfd7
--- /dev/null
+++ b/resources/builders/braiins/en.yml
@@ -0,0 +1,6 @@
+description: |
+  Braiins is a leader in the Bitcoin mining industry, offering tools and services to optimize mining operations. As the operator of the world's longest-running Bitcoin mining pool (since 2010), Braiins provides predictable rewards with its FPPS model, ensuring miners benefit from transaction fees. Their custom Braiins OS firmware enhances ASIC performance, prolongs hardware lifespan, and enables efficient power usage, making it a vital tool for miners seeking maximum profitability.
+
+  Beyond software, Braiins delivers hardware solutions tailored for demanding mining environments and management tools for streamlined operations. The company also shares educational resources to advance industry knowledge. With a focus on transparency and innovation, Braiins has become a cornerstone of Bitcoin mining, responsible for mining over 1.25 million BTC to date.
+contributors:
+  - another-satoshi
diff --git a/resources/builders/btrust-builders/assets/logo.webp b/resources/builders/btrust-builders/assets/logo.webp
new file mode 100644
index 0000000000..5cb5e403c1
Binary files /dev/null and b/resources/builders/btrust-builders/assets/logo.webp differ
diff --git a/resources/builders/qala/builder.yml b/resources/builders/btrust-builders/builder.yml
similarity index 93%
rename from resources/builders/qala/builder.yml
rename to resources/builders/btrust-builders/builder.yml
index 343bdabf66..9585ee6650 100644
--- a/resources/builders/qala/builder.yml
+++ b/resources/builders/btrust-builders/builder.yml
@@ -1,8 +1,7 @@
-name: Qala
+name: Btrust Builders
 links:
-  website: https://qala.dev/
-  twitter: https://twitter.com/QalaAfrica
-
+  website: https://www.btrust.tech/builders
+  twitter: https://x.com/btrust_builders
 
 tags:
   - education
diff --git a/resources/builders/btrust-builders/cs.yml b/resources/builders/btrust-builders/cs.yml
new file mode 100644
index 0000000000..1042b8aa59
--- /dev/null
+++ b/resources/builders/btrust-builders/cs.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin pro Afriku, od Afričanů.
+
+  Btrust Builders je program navržený k výcviku další generace afrických vývojářů pro Bitcoin a Lightning. Naším cílem je vytvořit cestu pro africké softwarové vývojáře, aby se mohli přeorientovali na vývoj pro Bitcoin a Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/de.yml b/resources/builders/btrust-builders/de.yml
new file mode 100644
index 0000000000..668fe1d411
--- /dev/null
+++ b/resources/builders/btrust-builders/de.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin für Afrika, von Afrikanern.
+
+  Btrust Builders ist ein Programm, das darauf abzielt, die nächste Generation afrikanischer Bitcoin- und Lightning-Entwickler auszubilden. Unser Ziel ist es, einen Weg für afrikanische Softwareentwickler zu schaffen, um in der Bitcoin- und Lightning-Entwicklung tätig zu werden.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/en.yml b/resources/builders/btrust-builders/en.yml
new file mode 100644
index 0000000000..6545ac5392
--- /dev/null
+++ b/resources/builders/btrust-builders/en.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin for Africa, by Africans.
+
+  Btrust Builders is a program designed to train the next generation of African Bitcoin and Lightning developers. Our goal is to create a pathway for African software developers to transition into building for Bitcoin and Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/es.yml b/resources/builders/btrust-builders/es.yml
new file mode 100644
index 0000000000..aa4a6149bb
--- /dev/null
+++ b/resources/builders/btrust-builders/es.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin para África, por africanos.
+
+  Btrust Builders es un programa diseñado para capacitar a la próxima generación de desarrolladores africanos de Bitcoin y Lightning. Nuestro objetivo es crear un camino para que los desarrolladores de software africanos se adentren en la construcción de Bitcoin y Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/et.yml b/resources/builders/btrust-builders/et.yml
new file mode 100644
index 0000000000..e1a96a72a3
--- /dev/null
+++ b/resources/builders/btrust-builders/et.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin Aafrika jaoks, aafriklaste poolt.
+
+  Btrust Builders on programm, mille eesmärk on koolitada järgmise põlvkonna Aafrika Bitcoin'i ja Lightning'i arendajaid. Meie eesmärk on luua tee Aafrika tarkvaraarendajatele, et liikuda Bitcoin'i ja Lightning'i arendamise juurde.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/fi.yml b/resources/builders/btrust-builders/fi.yml
new file mode 100644
index 0000000000..860576b093
--- /dev/null
+++ b/resources/builders/btrust-builders/fi.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin Afrikalle, afrikkalaisten toimesta.
+
+  Btrust Builders on ohjelma, jonka tarkoituksena on kouluttaa seuraava sukupolvi afrikkalaisia Bitcoin- ja Lightning-kehittäjiä. Tavoitteenamme on luoda polku afrikkalaisille ohjelmistokehittäjille siirtyä rakentamaan Bitcoinille ja Lightningille.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/fr.yml b/resources/builders/btrust-builders/fr.yml
new file mode 100644
index 0000000000..91aeb0bd92
--- /dev/null
+++ b/resources/builders/btrust-builders/fr.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin pour l'Afrique, par les Africains.
+
+  Btrust Builders est un programme conçu pour former la prochaine génération de développeurs africains de Bitcoin et de Lightning. Notre objectif est de créer une voie pour les développeurs de logiciels africains afin qu'ils puissent se tourner vers la construction pour Bitcoin et Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/id.yml b/resources/builders/btrust-builders/id.yml
new file mode 100644
index 0000000000..384395297c
--- /dev/null
+++ b/resources/builders/btrust-builders/id.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin untuk Afrika, oleh orang Afrika.
+
+  Btrust Builders adalah program yang dirancang untuk melatih generasi berikutnya dari pengembang Bitcoin dan Lightning Afrika. Tujuan kami adalah menciptakan jalur bagi pengembang perangkat lunak Afrika untuk beralih ke pembangunan untuk Bitcoin dan Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/it.yml b/resources/builders/btrust-builders/it.yml
new file mode 100644
index 0000000000..7609812188
--- /dev/null
+++ b/resources/builders/btrust-builders/it.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin per l'Africa, dagli africani.
+
+  Btrust Builders è un programma progettato per formare la prossima generazione di sviluppatori africani di Bitcoin e Lightning. Il nostro obiettivo è creare un percorso per gli sviluppatori software africani per passare alla creazione di soluzioni per Bitcoin e Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/ja.yml b/resources/builders/btrust-builders/ja.yml
new file mode 100755
index 0000000000..2d6bfe465f
--- /dev/null
+++ b/resources/builders/btrust-builders/ja.yml
@@ -0,0 +1,6 @@
+description: |
+  アフリカのためのビットコイン、アフリカ人によるビットコイン。
+
+  Btrust Buildersは、次世代のアフリカのビットコインおよびライトニング開発者を育成するために設計されたプログラムです。私たちの目標は、アフリカのソフトウェア開発者がビットコインおよびライトニングの開発に移行するための道を作ることです。
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/nb-NO.yml b/resources/builders/btrust-builders/nb-NO.yml
new file mode 100644
index 0000000000..7ee0f71193
--- /dev/null
+++ b/resources/builders/btrust-builders/nb-NO.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin for Afrika, av afrikanere.
+
+  Btrust Builders er et program designet for å trene neste generasjon av afrikanske Bitcoin- og Lightning-utviklere. Målet vårt er å skape en vei for afrikanske programvareutviklere til å overgå til å bygge for Bitcoin og Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/pt.yml b/resources/builders/btrust-builders/pt.yml
new file mode 100644
index 0000000000..28df36a7c4
--- /dev/null
+++ b/resources/builders/btrust-builders/pt.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin para a África, por africanos.
+
+  Btrust Builders é um programa projetado para treinar a próxima geração de desenvolvedores africanos de Bitcoin e Lightning. Nosso objetivo é criar um caminho para que os desenvolvedores de software africanos possam fazer a transição para a construção de soluções para Bitcoin e Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/ru.yml b/resources/builders/btrust-builders/ru.yml
new file mode 100644
index 0000000000..bbc849fdb5
--- /dev/null
+++ b/resources/builders/btrust-builders/ru.yml
@@ -0,0 +1,6 @@
+description: |
+  Биткойн для Африки, африканцами.
+
+  Btrust Builders — это программа, созданная для обучения следующего поколения африканских разработчиков Биткойна и Lightning. Наша цель — создать путь для африканских программистов к переходу к разработке для Биткойна и Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/vi.yml b/resources/builders/btrust-builders/vi.yml
new file mode 100644
index 0000000000..ebe5cd7ad1
--- /dev/null
+++ b/resources/builders/btrust-builders/vi.yml
@@ -0,0 +1,6 @@
+description: |
+  Bitcoin cho người Africa, bởi người Africa.
+
+  Btrust Builders là một chương trình được thiết kế để đào tạo thế hệ tiếp theo của các nhà phát triển Bitcoin và Lightning tại Africa. Mục tiêu của chúng tôi là tạo ra một lộ trình cho các nhà phát triển phần mềm tại Africa chuyển đổi sang xây dựng cho Bitcoin và Lightning.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/btrust-builders/zh-Hans.yml b/resources/builders/btrust-builders/zh-Hans.yml
new file mode 100644
index 0000000000..3af18fb199
--- /dev/null
+++ b/resources/builders/btrust-builders/zh-Hans.yml
@@ -0,0 +1,6 @@
+description: |
+  为非洲人设计的比特币项目。
+
+  Btrust Builders 是一个旨在培养下一代非洲比特币和闪电网络开发者的计划。我们的目标是为非洲软件开发者提供一个过渡到比特币和闪电网络构建领域的途径。
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/entropy/assets/logo.webp b/resources/builders/entropy/assets/logo.webp
new file mode 100644
index 0000000000..84ae0fbabf
Binary files /dev/null and b/resources/builders/entropy/assets/logo.webp differ
diff --git a/resources/builders/entropy/builder.yml b/resources/builders/entropy/builder.yml
new file mode 100644
index 0000000000..152030a273
--- /dev/null
+++ b/resources/builders/entropy/builder.yml
@@ -0,0 +1,12 @@
+name: Entropy
+links:
+  website: https://entropy.page/pow.html
+  twitter: https://x.com/d_plus__plus
+  nost: https://primal.net/d++
+tags:
+  - bitcoin-only
+  - infrastructure
+
+category: education
+
+original_language: en
diff --git a/resources/builders/entropy/en.yml b/resources/builders/entropy/en.yml
new file mode 100644
index 0000000000..e6fdcfa608
--- /dev/null
+++ b/resources/builders/entropy/en.yml
@@ -0,0 +1,5 @@
+description: |
+  Here you'll find a collection of bitcoin workshops, projects, hackathons, and software, made with love by D++. All are open source and freely available to anyone interested in learning, teaching, or just having fun!
+
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/qala/assets/logo.webp b/resources/builders/qala/assets/logo.webp
deleted file mode 100644
index 9368be71d8..0000000000
Binary files a/resources/builders/qala/assets/logo.webp and /dev/null differ
diff --git a/resources/builders/qala/cs.yml b/resources/builders/qala/cs.yml
deleted file mode 100644
index f5aa604322..0000000000
--- a/resources/builders/qala/cs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin pro Afriku, od Afričanů.
-   
-   Qala je program navržený k výcviku další generace afrických vývojářů pro Bitcoin a Lightning. Naším cílem je vytvořit cestu pro africké softwarové vývojáře, aby se mohli přeorientovali na vývoj pro Bitcoin a Lightning.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/de.yml b/resources/builders/qala/de.yml
deleted file mode 100644
index a1cf712a13..0000000000
--- a/resources/builders/qala/de.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-  Bitcoin für Afrika, von Afrikanern.
-  
-  Qala ist ein Programm, das darauf abzielt, die nächste Generation afrikanischer Bitcoin- und Lightning-Entwickler auszubilden. Unser Ziel ist es, einen Weg für afrikanische Softwareentwickler zu schaffen, um in der Bitcoin- und Lightning-Entwicklung tätig zu werden.
-contributors:
-  - rabbit-hole
diff --git a/resources/builders/qala/en.yml b/resources/builders/qala/en.yml
deleted file mode 100644
index 5041118da9..0000000000
--- a/resources/builders/qala/en.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin for Africa, by Africans.
-   
-   Qala is a program designed to train the next generation of African Bitcoin and Lightning developers. Our goal is to create a pathway for African software developers to transition into building for Bitcoin and Lightning.
-contributors:
-  - rabbit-hole
diff --git a/resources/builders/qala/es.yml b/resources/builders/qala/es.yml
deleted file mode 100644
index 52f43cfe94..0000000000
--- a/resources/builders/qala/es.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-  Bitcoin para África, por africanos.
-  
-  Qala es un programa diseñado para capacitar a la próxima generación de desarrolladores africanos de Bitcoin y Lightning. Nuestro objetivo es crear un camino para que los desarrolladores de software africanos se adentren en la construcción de Bitcoin y Lightning.
-contributors:
-  - rabbit-hole
diff --git a/resources/builders/qala/et.yml b/resources/builders/qala/et.yml
deleted file mode 100644
index d23a5cde57..0000000000
--- a/resources/builders/qala/et.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin Aafrika jaoks, aafriklaste poolt.
-   
-   Qala on programm, mille eesmärk on koolitada järgmise põlvkonna Aafrika Bitcoin'i ja Lightning'i arendajaid. Meie eesmärk on luua tee Aafrika tarkvaraarendajatele, et liikuda Bitcoin'i ja Lightning'i arendamise juurde.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/fi.yml b/resources/builders/qala/fi.yml
deleted file mode 100644
index fcfc3665bc..0000000000
--- a/resources/builders/qala/fi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin Afrikalle, afrikkalaisten toimesta.
-   
-   Qala on ohjelma, jonka tarkoituksena on kouluttaa seuraava sukupolvi afrikkalaisia Bitcoin- ja Lightning-kehittäjiä. Tavoitteenamme on luoda polku afrikkalaisille ohjelmistokehittäjille siirtyä rakentamaan Bitcoinille ja Lightningille.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/fr.yml b/resources/builders/qala/fr.yml
deleted file mode 100644
index 9897ee9b98..0000000000
--- a/resources/builders/qala/fr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-  Bitcoin pour l'Afrique, par les Africains.
-  
-  Qala est un programme conçu pour former la prochaine génération de développeurs africains de Bitcoin et de Lightning. Notre objectif est de créer une voie pour les développeurs de logiciels africains afin qu'ils puissent se tourner vers la construction pour Bitcoin et Lightning.
-contributors:
-  - rabbit-hole
diff --git a/resources/builders/qala/id.yml b/resources/builders/qala/id.yml
deleted file mode 100644
index ac11f199ab..0000000000
--- a/resources/builders/qala/id.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin untuk Afrika, oleh orang Afrika.
-   
-   Qala adalah program yang dirancang untuk melatih generasi berikutnya dari pengembang Bitcoin dan Lightning Afrika. Tujuan kami adalah menciptakan jalur bagi pengembang perangkat lunak Afrika untuk beralih ke pembangunan untuk Bitcoin dan Lightning.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/it.yml b/resources/builders/qala/it.yml
deleted file mode 100644
index 1baa05ab9e..0000000000
--- a/resources/builders/qala/it.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-  Bitcoin per l'Africa, dagli africani.
-  
-  Qala è un programma progettato per formare la prossima generazione di sviluppatori africani di Bitcoin e Lightning. Il nostro obiettivo è creare un percorso per gli sviluppatori software africani per passare alla creazione di soluzioni per Bitcoin e Lightning.
-contributors:
-  - rabbit-hole
diff --git a/resources/builders/qala/ja.yml b/resources/builders/qala/ja.yml
deleted file mode 100755
index ed216f07c4..0000000000
--- a/resources/builders/qala/ja.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   アフリカのためのビットコイン、アフリカ人によるビットコイン。
-   
-   Qalaは、次世代のアフリカのビットコインおよびライトニング開発者を育成するために設計されたプログラムです。私たちの目標は、アフリカのソフトウェア開発者がビットコインおよびライトニングの開発に移行するための道を作ることです。
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/nb-NO.yml b/resources/builders/qala/nb-NO.yml
deleted file mode 100644
index c261117599..0000000000
--- a/resources/builders/qala/nb-NO.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin for Afrika, av afrikanere.
-   
-   Qala er et program designet for å trene neste generasjon av afrikanske Bitcoin- og Lightning-utviklere. Målet vårt er å skape en vei for afrikanske programvareutviklere til å overgå til å bygge for Bitcoin og Lightning.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/pt.yml b/resources/builders/qala/pt.yml
deleted file mode 100644
index 18bca24995..0000000000
--- a/resources/builders/qala/pt.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-  Bitcoin para a África, por africanos.
-  
-  Qala é um programa projetado para treinar a próxima geração de desenvolvedores africanos de Bitcoin e Lightning. Nosso objetivo é criar um caminho para que os desenvolvedores de software africanos possam fazer a transição para a construção de soluções para Bitcoin e Lightning.
-contributors:
-  - rabbit-hole
diff --git a/resources/builders/qala/ru.yml b/resources/builders/qala/ru.yml
deleted file mode 100644
index a82088b144..0000000000
--- a/resources/builders/qala/ru.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Биткойн для Африки, африканцами.
-   
-   Qala — это программа, созданная для обучения следующего поколения африканских разработчиков Биткойна и Lightning. Наша цель — создать путь для африканских программистов к переходу к разработке для Биткойна и Lightning.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/vi.yml b/resources/builders/qala/vi.yml
deleted file mode 100644
index 73dc826d2f..0000000000
--- a/resources/builders/qala/vi.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   Bitcoin cho người Africa, bởi người Africa.
-   
-   Qala là một chương trình được thiết kế để đào tạo thế hệ tiếp theo của các nhà phát triển Bitcoin và Lightning tại Africa. Mục tiêu của chúng tôi là tạo ra một lộ trình cho các nhà phát triển phần mềm tại Africa chuyển đổi sang xây dựng cho Bitcoin và Lightning.
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/qala/zh-Hans.yml b/resources/builders/qala/zh-Hans.yml
deleted file mode 100644
index e828901cb0..0000000000
--- a/resources/builders/qala/zh-Hans.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-description: |
-   为非洲人设计的比特币项目。
-   
-   Qala 是一个旨在培养下一代非洲比特币和闪电网络开发者的计划。我们的目标是为非洲软件开发者提供一个过渡到比特币和闪电网络构建领域的途径。
-contributors:
-  - rabbit-hole
\ No newline at end of file
diff --git a/resources/builders/speed-wallet/assets/logo.webp b/resources/builders/speed-wallet/assets/logo.webp
new file mode 100644
index 0000000000..9be2157e85
Binary files /dev/null and b/resources/builders/speed-wallet/assets/logo.webp differ
diff --git a/resources/builders/speed-wallet/builder.yml b/resources/builders/speed-wallet/builder.yml
new file mode 100644
index 0000000000..3a49a09fff
--- /dev/null
+++ b/resources/builders/speed-wallet/builder.yml
@@ -0,0 +1,11 @@
+name: Speed Wallet
+links:
+  website: https://www.speed.app/
+  twitter: https://x.com/speedwallet
+tags:
+  - infrastructure
+  - layer-2
+
+category: wallet
+
+original_language: en
diff --git a/resources/builders/speed-wallet/en.yml b/resources/builders/speed-wallet/en.yml
new file mode 100644
index 0000000000..ab7901502a
--- /dev/null
+++ b/resources/builders/speed-wallet/en.yml
@@ -0,0 +1,7 @@
+description: |
+  Speed Bitcoin Lightning Wallet is a Bitcoin wallet that allows users to send and receive Bitcoin and stablecoins securely: 
+
+  Users can send and receive Bitcoin on any website that supports Bitcoin payments, make payments using LNurl, LN invoice, or LN address, and secure their account with two-factor authentication. 
+  Integrating USDT stablecoin and bitrefill.
+contributors:
+  - rabbit-hole
diff --git a/resources/builders/taipei-taiwan/assets/logo.webp b/resources/builders/taipei-taiwan/assets/logo.webp
index 3e580f7f05..63ffd59ea8 100644
Binary files a/resources/builders/taipei-taiwan/assets/logo.webp and b/resources/builders/taipei-taiwan/assets/logo.webp differ
diff --git a/resources/builders/taipei-taiwan/builder.yml b/resources/builders/taipei-taiwan/builder.yml
index b132b3f5e5..ea5de43e6c 100644
--- a/resources/builders/taipei-taiwan/builder.yml
+++ b/resources/builders/taipei-taiwan/builder.yml
@@ -1,4 +1,4 @@
-name: Taipei Taiwan
+name: PlanB network Taipei
 category: communities
 address_line_1: Taipei, Taiwan
 address_line_2:
@@ -7,7 +7,7 @@ language:
   - zh-tw
   - en
 links:
-  youtube: https://www.youtube.com/@PlanBSummerSchoolTaiwan
+  twitter: https://x.com/PlanBTaiwanNode
 
 tags:
   - bitcoin-only
diff --git a/resources/conferences/bitcoin-atlantis-2024/conference.yml b/resources/conferences/bitcoin-atlantis-2024/conference.yml
index 9e39d4fb1c..832c76a57d 100644
--- a/resources/conferences/bitcoin-atlantis-2024/conference.yml
+++ b/resources/conferences/bitcoin-atlantis-2024/conference.yml
@@ -8,9 +8,9 @@ links:
   twitter: https://twitter.com/BitcoinAtlantis
   website: https://bitcoinatlantis.com/
 tags:
-  - Bitcoiner
-  - General
-
+  - adoption
+  - proof-of-work
+  - decentralization
 
 # Proofreading metadata
 original_language: en
@@ -19,5 +19,5 @@ proofreading:
     last_contribution_date: 2024-09-01
     urgency: 0
     contributors_id:
-      - Asi0Flammeus
+      - jramos0
     reward: 1250
diff --git a/resources/conferences/bitcoin-atlantis-2024/en.md b/resources/conferences/bitcoin-atlantis-2024/en.md
index 2e36738510..2083bec2be 100644
--- a/resources/conferences/bitcoin-atlantis-2024/en.md
+++ b/resources/conferences/bitcoin-atlantis-2024/en.md
@@ -1,32 +1,388 @@
---- 
+---
 name: Bitcoin Atlantis 2024
 description: Bitcoin empowers individuals and businesses around the world, giving them financial freedom. Bitcoin Atlantis gathers the main leading voices in Bitcoin for a three-day conference in Madeira, in the middle of the Atlantic.
---- 
+---
 
-# Satoshi stage by NYDIG
+# Satoshi Stage
 
-## Day 1
+## Jack Mallers "Intro to Bitcoin" at Bitcoin Atlantis 2024
 
-![video](https://www.youtube.com/live/SKAHlCpwsLc?si=qlcm1GE_I8IOcItC)
+![video](https://youtu.be/d7ID3fKAFQM)
 
-## Day 2
+## Ben Perrin "The Technology of Bitcoin" at Bitcoin Atlantis 2024
 
-![video](https://www.youtube.com/live/bikLdxCKQjc?si=fcEv_uj25xWJLcPF)
+![video](https://youtu.be/NO_ZkmYrwTk)
 
-## Day 3 
+## James Lavish "Bitcoin as an investment" at Bitcoin Atlantis 2024
 
-![video](https://www.youtube.com/live/h2ljazAVDUE?si=og8Qi5sIE1vGY0kX)
+![video](https://youtu.be/VrZZ5tbslVg)
+
+## Marce / Samson Mow at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/iBK9UM_w88A)
+
+## John Dennehy / D++ / Dusan Matuska / Seb Bunney / Ella Hough at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/domhMNYZ5wI)
+
+## D++ "Lightning Pratical Exercise" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/iP5LHHVqc3s)
+
+## Michael Saylor at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/fCkABdwjxtE)
+
+## Natalie Brunell / Jeff Booth / Alex Gladstein / Jack Dorsey at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/_rnp3_f-zKE)
+
+## Filip Karađorđević / John Vallis / Rune Østgård / Erik Cason / Luke Broyles at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/jDcm3BfXlBg)
+
+## Joe Hall / Giacomo Zucco / Max K / Julian Liniger / Jack Mallers at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/ZS7pYwe_C2Q)
+
+## Lyn Alden / Preston Pysh / Lawrence Lepard / Michael Saylor at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/TndYql2joY8)
+
+## Troy Cross "Bitcoin's Second Revolution" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/rJ8GYS3ci4w)
+
+## Daniel Batten "Bitcoin Solving The Methane Problem" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/lXCIzwIWmYc)
+
+## Mark Morton / Erik Hersman / Ali Chehresaz / Jesse Pielke / Nuno Barbosa at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/_pGVclxapNc)
+
+## Jelmer ten Wolde/Bert deGroot/Willem von Royen/Kent Halliburton/Lauri Pispa at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/LbqFab9OXtA)
+
+## Harald Rauter/ Susie Ward/ Daniel Jonsson/ Margot Paez/ Kristian Kläger at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/KV7lBDYZcCM)
+
+## Farida Nabourema / Lyn Alden / Alex Gladstein / Jack Dorsey at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/GmZalQuQoIM)
+
+## Ben Perrin / Jhanisse Daza / Anna Chekhovich at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/p5f6Vm3iZOQ)
+
+## NiftyNei / Femi / Carol Souza / Roya Mahboob at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/oYfd8XB8jqQ)
+
+## Abubakar Nur Khalil / Obi / Ojoma Ochai / Jack Dorsey at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/1WoWFkNuRLw)
+
+## Sarah Kreps / Alex Gladstein at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/tR8tmKp1zCk)
+
+## Daniel Prince "Madeira Is Embracing Bitcoin" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/LUMdg41Fr3k)
+
+## Rahim Taghizadegan "Madeira, Austria and Bitcoin" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/4SSb11fp_Pk)
+
+## Daniel Prince / James Lavish / Lyn Alden / Jeff Booth and Preston Pysh at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/rAHqmxqtufw)
+
+## Pablo Fernandez / Troy Cross / Jeff Booth / Knut Svanholm and André Loja at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/hcIUxwGEPKM)
+
+## Seb Bunney "The Hidden Cost of Fiat Money" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/5R8U9ZxQaQ4)
+
+## Giacomo Zucco "Madeira's Bitcoin Strategy" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/_7xBLzAn0Lo)
+
+## Tip NZ live act at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/uUbbqWcRgdE)
+
+## Dj Valerie B Love "Bitcoin is a tool for peace" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/hk7g_DiZSCw)
+
+## Jeff Booth "The honest path forward - a journey to hope and abundance" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/PxlHCO1nSzM)
+
+## Roy Sheinfeld / Peter McCormack / Natalie Brunell and Aleksandar Svetski at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/ePbPLXFG1-E)
+
+## John Vallis / Tomer Strolight / Ella Hough & Erik Cason at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/1fXh4FFbD5Q)
+
+## The Fermie Paradox at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/mBxm07F6n6M)
+
+## Giacomo Zucco / Knut Svanholm / Niko Jilch and Dhruv Bansal at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/B3svBZPo9aQ)
 
 # Open Source Stage
 
-## Day 1
+## Rockstar Dev "Why Open Source?" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/aq-ooR67Wm4)
+
+## Thunder / Martell Fox / Vivian Cheng / Rune Østgård at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/GEP2yqnHSi8)
+
+## Francis Mars "Chain Duel" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/NAprhS2aw-U)
+
+## Kukks / John Magill / Nadia at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/ecHKXRUQ16g)
+
+## Enrique Berrios "Bitcoin Smiles" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/NmTDZqjtpoI)
+
+## Dj Valerie B Love / Tim James / Theo Katzman / Joe Martin / TipNZ at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/63fpljWDLpM)
+
+## Kristian Csepcsar / Tankred Hase / Timo Steipe and Leo at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/bzLYDSto1aA)
+
+## Ioni Appelberg "Bitcoin is K1 Money" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/UOzE0jGoyDM)
+
+## Miljan "Monetizing Nostr" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/8lInFCoMG9k)
+
+## Alex Mann / Metamick / Andi Pitt / Nicholas Safford / Eric Yakes at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/pB6KpYXjQS0)
+
+## Max Hillebrand / ediTwentyOne / Kukks & Tbk at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/l_vxDzTokM4)
+
+## Joe Hall / Daniel Wingen / Nathan Day / Jhanisse Vaca Daza / Renato at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/acW0U10wu0U)
+
+## Vivian Cheng / Kristian Csepcsar / Samson Mow / Sam Wouters at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/dHlRIx365xU)
+
+## NiftyNei / Salvatore / Reyna Chicas / Ella Hough and Giorgio at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/0QpN7lFLn4Q)
+
+## Jeff Gardner "Portable, interoperable & open" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/ZO8pS02SCRw)
+
+## George Manolov "Uniting football and Bitcoin in the pursuit of freedom" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/2zZ2PPjfHQg)
+
+## Ella Hough / Arsh Molu at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/mKhOrIkNdYo)
+
+## Hodlonaut / Lunaticoin / Rockstar Dev / Reckless Satoshi at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/o3Y3tvytH_E)
+
+## Alekos Filini / NVK / Josef Tětek / Lunaticoin / Douglas Bakkum at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/o29IomPTiuQ)
+
+## Enrique Berrios / Farida Nabourema / Javier Bastardo / Napoleon Osorio at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/K8YzmCmMWyU)
+
+## Alekos Filini "Announcing the portal hardware wallet" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/xGsZTREm0OQ)
+
+## John Vallis / Nico Moran / Natalie Brunell / Efrat Fenigson at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/xtPzLB5-RHY)
+
+## Paco de la India / Francis Pouliot / Tom Chojnacki / Laura at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/NAzu4XzokvY)
+
+## Max de Marco / Metamick / Avi Burra / Oscar Merry / actionslave at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/ID49sHwTGyM)
+
+## Marce / Max K / Pablo Fernandez / Sylvia Brinded-Püls / André Loja at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/VC9Lxjyw0TM)
+
+## Max de Marco / Parker Worthington / Tomek / Mike Bitcoin Shooter / Pierre Corbin at Bitcoin Atlantis
+
+![video](https://youtu.be/9piKhiGYPN0)
+
+## Avi Burra / Niko Laamanen / Lyn Alden / Knut Svanholm at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/3rkgQf4L1rU)
+
+## Paco de la India / Marce / Napoleon Osorio / Plamen Andonovs / FractalEncrypt at Bitcoin Atlantis
+
+![video](https://youtu.be/5TJasIq5axA)
+
+## Roy Sheinfeld/ John Carvalho/ Ben Perrin/ Peter Todd/ Paul Miller/ Steven Roose at Bitcoin Atlantis
+
+![video](https://youtu.be/s40Dlx-snu8)
+
+## Jesse Pielke / Kristian Kläger / Christian Naef and Maximilian Obwexer at Bitcoin Altantis 2024
+
+![video](https://youtu.be/OmcLOKQLJt8)
+
+## Daniel Prince / Pablo Fernandez / Sylvia Brinded-Püls / Alex Kons / Rogzy at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/EiH2AbqM-IA)
+
+## Ben Price / NiftyNei / Stephan Livera / NVK / Dread at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/rZQpx_JFZh8)
+
+## Rahim Taghizadegan / Ben Arc / Peter Young / Aleksandar Svetski at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/U_QsC8xHH8Q)
+
+## Matěj Žák "Hardware wallets from sketch to reality" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/a4smG2bm7UE)
+
+## Max Hillebrand / Roy Sheinfeld / John Carvalho / Kemal / Tony Giorgio at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/9fxwpnbSMYA)
+
+## Max K / Hubertus Hofkirchner / Preston Pysh / Maurício at Bitcoin Altantis 2024
+
+![video](https://youtu.be/mgNfhxIfDXk)
+
+## Francis Poulliot / Anna / Mir Liponi / NVK / Erik Cason at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/s9Hs4O85Nb4)
+
+## Javier Bastardo / Leo / Lunaticoin / Reckless Satoshi / Adem Bilican at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/HVJDAPMAIlg)
+
+## WizardofAus "The beautiful chaos of Bitcoin" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/G0fCHWeaNqE)
+
+## Aleksandar Svetski "Satlantis" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/AiVSFTCOZcE)
+
+## Pablo Fernandez & Tony Giorgio "SEC presentation" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/Yj_NRq_mzOw)
+
+## Tony Klausing "Stable Chanels" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/yZel3OGUyhg)
+
+## Jeff Gardner / Antoine Poinsot / Peter Todd / Will / Ben Carman at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/V26MKjROL3Q)
+
+## Bota Jardemalie / Lyudmyla Kozlovska / Rachel Geyer / Sven Hildebrandt at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/U7fmDlOWVd0)
+
+## Pedro G "What does Bitcoin look like?" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/WGC-768KC9o)
+
+## Fernando Motolese "How I built a Bitcoin community bank as a lsp" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/XCB-WyOkGHk)
+
+## Becca Rubenfeld "Custody without coverage" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/qTKd-2EEMmo)
+
+## Marce / Ben Arc / Pablo Fernandez / NVK / Miljan at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/z0lFr8BEbAk)
+
+## Derek Ross "The purple pill helps the orange pill go down" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/Ah7OsLEuBwU)
+
+## NVK / Miljan / Will / Elsat / GSovereignty at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/DBMo4rVg6o8)
+
+## Rikki and Laura "Bitcoin Travelers" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/k-LD9o6xLmI)
+
+## Rikki / Laura & Elie Azoury at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/GWJEUZ8CuUw)
+
+## Eric Stacks "Using Bitcoin to survive and benefit" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/feS67CErpOY)
+
+## Jordan Walker "Bitcoin is a new language" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/SpIESKj8Sls)
+
+## Max K / Sam Callahan / Hong Kim / Nico Moran / Eric Weiss at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/Ji45IHYSYAs)
+
+## Luca Infeld & Timo Steipe at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/PNNcdN1u79o)
+
+## Pierre Corbin "Flash announcement" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/uKoMaAqq-nY)
+
+## Francis Pouilot "Scaling the non-custodial Bitcoin experience" at Bitcoin Atlantis 2024
+
+![video](https://youtu.be/suAfwx69030)
+
+## Kevin Loaec "Liana Lite" at Bitcoin Atlantis 2024
 
-![video](https://www.youtube.com/live/lRAM6bwS8mU?si=NPi1gzrHXvHY39PT)
+![video](https://youtu.be/gF6lJM_Gl24)
 
-## Day 2
+## Javier Bastardo / Izzy McCoy / Angelo Morgan-Somers / Erik Cason at Bitcoin Atlantis 2024
 
-![video](https://www.youtube.com/live/Z7YWlXAS6Uw?si=KVQ5q-xmb4l7DelS)
+![video](https://youtu.be/P1QVNudeosQ)
 
-## Day 3
+## Grafton Clark & Lunaticoin at Bitcoin Atlantis 2024
 
-![video](https://www.youtube.com/live/miwg-o_78zs?si=7jHoo-LwayHnqXtv)
+![video](https://youtu.be/1S-u1MrI_r4)
diff --git a/tutorials/merchant/btcpay-server/en.md b/tutorials/merchant/btcpay-server/en.md
index 71b062568c..9b9a7dd2ad 100644
--- a/tutorials/merchant/btcpay-server/en.md
+++ b/tutorials/merchant/btcpay-server/en.md
@@ -2,18 +2,17 @@
 name: BTCpay Server
 
 description: Guide to set up your BTCPay server and manage it
-
 ---
 
 ![cover](assets/cover.webp)
 
 BTCpay server (https://btcpayserver.org/) is the best way to accept #Bitcoin. No fees, no intermediary. Free, open source & self-hosted Bitcoin payment processor for self-sovereign individuals and businesses.
 
-![video](https://youtu.be/KqsM-n-e4aY)
+![video](https://youtu.be/-GJr4XjRCPo?si=UIZNonwJqa9r7Lpj)
 BTCpay Server - Accept Bitcoin Payments In Minutes by BTCSession
 
-## Guide
+## Course on BTCPay Server
 
-We are currently working with the BTCPayserver team to propose an easy, step-by-step, simplified guide. Meanwhile, a LOT of documentation is available there.
+We have a complete course about BTCPay Server, You are welcome to view the complete course for free so you can expand your knowledge of this amazing tool.
 
-https://docs.btcpayserver.org/Guide/
+[**-> Learn more about BTCPay Server and their utility in our couse**](https://planb.network/courses/btc305)
diff --git a/tutorials/privacy/payjoin-sparrow-wallet/en.md b/tutorials/privacy/payjoin-sparrow-wallet/en.md
index 4c4a397890..c132e4c5c4 100644
--- a/tutorials/privacy/payjoin-sparrow-wallet/en.md
+++ b/tutorials/privacy/payjoin-sparrow-wallet/en.md
@@ -2,6 +2,7 @@
 name: Payjoin - Sparrow Wallet
 description: How to make a Payjoin transaction on Sparrow Wallet?
 ---
+
 ![tutorial cover image sparrow payjoin](assets/cover.webp)
 
 _**WARNING:** Following the arrest of the founders of Samourai Wallet and the seizure of their servers on April 24, Payjoins Stowaway on Samourai Wallet now only work by manually exchanging PSBT between the involved parties, provided both users are connected to their own Dojo. As for Sparrow, Payjoins via BIP78 still work. However, these tools may be restarted in the coming weeks. In the meantime, you can always read this article to understand the theoretical functioning of payjoins._
@@ -12,7 +13,7 @@ _This tutorial is provided for educational and informational purposes only. We d
 
 ---
 
-> *"Force blockchain spies to rethink everything they think they know."*
+> _"Force blockchain spies to rethink everything they think they know."_
 
 Payjoin is a specific Bitcoin transaction structure that enhances user privacy during spending by collaborating with the payment recipient. There are several implementations that facilitate the setup and automation of PayJoin. Among these implementations, the most well-known is Stowaway developed by the Samourai Wallet team. This tutorial aims to guide you through the process of making a Stowaway Payjoin transaction using the Sparrow Wallet software.
 
@@ -30,11 +31,13 @@ These encrypted exchanges require establishing a connection and authentication b
 To put it simply, a Paynym is a unique identifier linked to your wallet that allows for various functionalities, including encrypted messaging. The Paynym is presented in the form of an identifier and an illustration representing a robot. Here is an example of mine on the Testnet: ![Paynym Sparrow](assets/en/1.webp)
 
 **In summary:**
-- *Payjoin* = Specific structure of collaborative transaction;
-- *Stowaway* = Payjoin implementation available on Samourai and Sparrow Wallet;
-- *Cahoots* = Name given by Samourai to all their types of collaborative transactions, including Payjoin Stowaway;
-- *Soroban* = Encrypted communication protocol established on Tor, allowing collaboration with other users in the context of a Cahoots transaction.
-- *Paynym* = Unique identifier of a wallet allowing communication with another user on Soroban, in order to carry out a Cahoots transaction.
+
+- _Payjoin_ = Specific structure of collaborative transaction;
+- _Stowaway_ = Payjoin implementation available on Samourai and Sparrow Wallet;
+- _Cahoots_ = Name given by Samourai to all their types of collaborative transactions, including Payjoin Stowaway;
+- _Soroban_ = Encrypted communication protocol established on Tor, allowing collaboration with other users in the context of a Cahoots transaction.
+- _Paynym_ = Unique identifier of a wallet allowing communication with another user on Soroban, in order to
+  carry out a Cahoots transaction.
 
 [**-> Learn more about Payjoin transactions and their utility**](https://planb.network/tutorials/privacy/payjoin)
 
@@ -56,9 +59,11 @@ The software will then offer you a `Link Contact` button. It is not necessary to
 Once the recipient's Paynym is followed by your Paynym, repeat this operation in the opposite direction so that your recipient also follows you. You can then perform a Payjoin.
 
 ## How to perform a Payjoin on Sparrow Wallet?
+
 If you have completed these few preliminary steps, you are finally ready to perform the Payjoin transaction! To do this, follow our video tutorial:
 ![Payjoin Tutorial - Sparrow Wallet](https://youtu.be/ZQxKod3e0Mg)
 
 **External resources:**
+
 - https://docs.samourai.io/en/spend-tools#stowaway ;
 - https://sparrowwallet.com/docs/spending-privately.html.
diff --git a/tutorials/wallet/braiin-mini-miner/assets/cover.webp b/tutorials/wallet/braiin-mini-miner/assets/cover.webp
new file mode 100644
index 0000000000..a7988e3197
Binary files /dev/null and b/tutorials/wallet/braiin-mini-miner/assets/cover.webp differ
diff --git a/tutorials/wallet/braiin-mini-miner/en.md b/tutorials/wallet/braiin-mini-miner/en.md
new file mode 100644
index 0000000000..a599721290
--- /dev/null
+++ b/tutorials/wallet/braiin-mini-miner/en.md
@@ -0,0 +1,13 @@
+---
+name: Braiins Mini Miner
+
+description: Mine Bitcoin Easily at home.
+---
+
+![cover](assets/cover.webp)
+
+To find all the importante information please refer to their extensive guide: https://braiins.com/hardware/mini-miner-bmm-100
+
+![ Mini Miner From Braiins - Become a pleb miner  ](https://youtu.be/QXonFfguymw?si=_bq5pd_85xmUBZiw)
+
+Small, silent, and simple – plug it in anywhere in your house and forget about it. With a sleek design, the Mini Miner makes your house a home.
diff --git a/tutorials/wallet/braiin-mini-miner/tutorial.yml b/tutorials/wallet/braiin-mini-miner/tutorial.yml
new file mode 100644
index 0000000000..6563fef763
--- /dev/null
+++ b/tutorials/wallet/braiin-mini-miner/tutorial.yml
@@ -0,0 +1,13 @@
+id: b4c5cb2c-e7ee-4521-a750-edefb0747db3
+builder: Braiins
+
+category: hardware
+
+tags:
+  - mining
+  - Hardware
+
+level: advanced
+
+# Proofreading metadata
+original_language: en
diff --git a/tutorials/wallet/speed-wallet/assets/cover.webp b/tutorials/wallet/speed-wallet/assets/cover.webp
new file mode 100644
index 0000000000..ba9325bc4e
Binary files /dev/null and b/tutorials/wallet/speed-wallet/assets/cover.webp differ
diff --git a/tutorials/wallet/speed-wallet/en.md b/tutorials/wallet/speed-wallet/en.md
new file mode 100644
index 0000000000..8c7f099db5
--- /dev/null
+++ b/tutorials/wallet/speed-wallet/en.md
@@ -0,0 +1,11 @@
+---
+name: Speed Wallet
+
+description: A powerfull lightning wallet integrating USDT and Bitrefill
+---
+
+![cover](assets/cover.webp)
+
+To find all the importante information please refer to their extensive guide: https://www.speed.app/
+
+![ Speed Wallet - Simple BTC Wallet Tutorial ](https://youtu.be/2o8gH-D89HI?si=7dDRBIZiIW4Tp4ka)
diff --git a/tutorials/wallet/speed-wallet/tutorial.yml b/tutorials/wallet/speed-wallet/tutorial.yml
new file mode 100644
index 0000000000..aa9ed94a8f
--- /dev/null
+++ b/tutorials/wallet/speed-wallet/tutorial.yml
@@ -0,0 +1,13 @@
+id: 8715e454-1720-4a7f-8c1d-3da02cf67312
+builder: Speed Wallet
+
+level: beginner
+
+category: mobile
+
+tags:
+  - lightning
+  - custodial
+
+# Proofreading metadata
+original_language: en