diff --git a/art/themes/luciano_blocktronics/2FAOTP.ans b/art/themes/luciano_blocktronics/2FAOTP.ans
new file mode 100644
index 00000000..7828fe6a
Binary files /dev/null and b/art/themes/luciano_blocktronics/2FAOTP.ans differ
diff --git a/docs/modding/user-2fa-otp-config.md b/docs/modding/user-2fa-otp-config.md
index 5b0f045d..7b41939f 100644
--- a/docs/modding/user-2fa-otp-config.md
+++ b/docs/modding/user-2fa-otp-config.md
@@ -51,3 +51,23 @@ The following MCI codes are available:
* MCI 3: (ie: `TM3`): Submit/cancel toggle.
* MCI 10...99: Custom entries with the following format members available:
* `{infoText}`: **Info Text** for current selection.
+
+### Web and Email Templates
+A template system is also available to customize registration emails and the landing page.
+
+#### Emails
+Multipart MIME emails are send built using template files pointed to by `users.twoFactorAuth.otp.registerEmailText` and `users.toFactorAuth.otp.registerEmailHtml` supporting the following variables:
+* `%BOARDNAME%`: BBS name.
+* `%USERNAME%`: Username receiving email.
+* `%TOKEN%`: Temporary registration token generally used in URL.
+* `%REGISTER_URL%`: Full registration URL.
+
+#### Landing Page
+The landing page template is pointed to by `users.twoFactorAuth.otp.registerPageTemplate` and supports the following variables:
+* `%BOARDNAME%`: BBS name.
+* `%USERNAME%`: Username receiving email.
+* `%TOKEN%`: Temporary registration token generally used in URL.
+* `%OTP_TYPE%`: OTP type such as `googleAuth`.
+* `%POST_URL%`: URL to POST form to.
+* `%QR_IMG_DATA%`: QR code in URL image data format. Not always available depending on OTP type and will be set to blank in these cases.
+* `%SECRET%`: Secret for manual entry.
diff --git a/misc/otp_register_email.template.html b/misc/otp_register_email.template.html
new file mode 100644
index 00000000..f9fcd65b
--- /dev/null
+++ b/misc/otp_register_email.template.html
@@ -0,0 +1,11 @@
+%USERNAME%:
+
+
+ You have requested to enable 2-Factor Authentication via One-Time-Password for your account on %BOARDNAME%.
+
+ If this was not you, please ignore this email and consider changing your password. Otherwise, please follow this link or copy and paste the link below:
+ %REGISTER_URL%
+
Your OTP secret: