diff --git a/_bq/bqaquarism8.markdown b/_bq/bqaquarism8.markdown
new file mode 100644
index 0000000..5419d04
--- /dev/null
+++ b/_bq/bqaquarism8.markdown
@@ -0,0 +1,24 @@
+---
+layout: device
+title:  "BQ Aquaris M8"
+codename: Aquaris_M8
+downloadfolder: Aquaris_M8
+supportstatus: Current
+maintainer: R0rt1z2
+oem: BQ
+devicetree: https://github.com/TeamWin/android_device_bq_Aquaris_M8
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include mtkinstall.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
diff --git a/_mobvoi/mobvoiticwatchpro4G.markdown b/_mobvoi/mobvoiticwatchpro4G.markdown
new file mode 100644
index 0000000..4606f84
--- /dev/null
+++ b/_mobvoi/mobvoiticwatchpro4G.markdown
@@ -0,0 +1,27 @@
+---
+layout: device
+title:  "Mobvoi TicWatch Pro 4G/LTE"
+codename: catshark
+downloadfolder: catshark
+supportstatus: Current
+maintainer: Ajmal Safi
+devicetree: https://github.com/TeamWin/android_device_mobvoi_catshark.git
+oem: Mobvoi
+ddof: "/dev/block/platform/soc/7824900.sdhci/by-name/recovery"
+xdathread: "https://forum.xda-developers.com/showpost.php?p=77164627&postcount=2"
+          
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include fastbootinstall.html %}
+
+{% include ddinstall.html %}
diff --git a/_motorola/motorolamotog7.markdown b/_motorola/motorolamotog7.markdown
new file mode 100644
index 0000000..1bcdc2c
--- /dev/null
+++ b/_motorola/motorolamotog7.markdown
@@ -0,0 +1,36 @@
+---
+layout: device
+title:  "Motorola Moto G7"
+codename: river
+downloadfolder: river
+devicetree: https://github.com/TeamWin/android_device_motorola_river
+supportstatus: Current
+maintainer: SyberHexen
+oem: Motorola
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+NOTE: Monthly security updates may (or may not) break decryption of /data in TWRP.
+Decryption of /data works only when installing TWRP permanently!
+
+{% include download.html %}
+
+<div class='page-heading'>Installation:</div>
+NOTE: Your bootloader MUST be UNLOCKED before booting or installing TWRP
+If you already have TWRP installed:
+Download the latest zip and install the zip using TWRP, or if you have Magisk installed, flash directly in Magisk Manager as a module.
+
+If you do not already have TWRP installed:
+Download both the img and the zip. Copy the zip to your device. You will need to have the latest fastboot binaries and the correct drivers installed. Power off your device completely. Hold volume down and turn on the device. Your device should now be in the bootloader menu. Connect the device to your PC. Open a command window and run the following command from the proper location:
+
+fastboot boot path/to/twrp.img
+
+This will temporarily boot TWRP on your device. Use ADB or MTP to push the zip onto your device:
+
+adb push path/to/twrp.zip /sdcard
+
+Go to install and browse to the zip and install the zip. The zip will install TWRP on boot partition of both slots.
+
+If you accidently flash TWRP to your device using fastboot instead of temporarily booting the image, you will need to download the latest firmware for your device and reflash the boot image.
diff --git a/_samsung/samsunggalaxys4internationalqualcomm.markdown b/_samsung/samsunggalaxys4internationalqualcomm.markdown
index f60376d..a7a377a 100644
--- a/_samsung/samsunggalaxys4internationalqualcomm.markdown
+++ b/_samsung/samsunggalaxys4internationalqualcomm.markdown
@@ -2,7 +2,7 @@
 layout: device
 title: "Samsung Galaxy S4 (Qualcomm)"
 codename: jflte
-downloadfolder: International, Americas & China|jflte, GT-I9295|jactivelte, GT-I9505|jfltexx, GT-I9505G|jgedlte, SCH-I545|jfltevzw, SCH-R970|jflteusc, SCH-R970C|jfltecri, SGH-I337|jflteatt, SGH-I337M|jfltecan, SGH-M919|jfltetmo, SPH-L720|jfltespr
+downloadfolder: International & Americas (SGH-I337/jflteatt, SGH-I337M/jfltecan, SCH-R970C/jfltecri, SCH-R970X/jfltecsp, SCH-I545L/jfltelra, SPH-L720/jfltespr, SGH-M919/jfltetmo, SCH-R970/jflteusc, SCH-I545/jfltevzw, GT-I9505/jfltexx, GT-I9505G/jgedlte)|jflte
 supportstatus: Current
 maintainer: ripee
 oem: Samsung
@@ -17,7 +17,7 @@
 
 {% include appinstall.html %}
 
-<p class="text">International, Americas & China:</p>
+<p class="text">International & Americas:</p>
 <ul>
 {% for mirror in site.data.mirrors %}
   <li>
@@ -27,106 +27,6 @@
   </li>
 {% endfor %}
 </ul>
-<p class="text">GT-I9295:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jactivelte">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">GT-I9505:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jfltexx">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">GT-I9505G:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jgedlte">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SCH-I545:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jfltevzw">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SCH-R970:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jflteusc">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SCH-R970C:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jfltecri">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SGH-I337:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jflteatt">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SGH-I337M:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jfltecan">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SGH-M919:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jfltetmo">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
-<p class="text">SPH-L720:</p>
-<ul>
-{% for mirror in site.data.mirrors %}
-  <li>
-    <a href="{{ mirror.baseurl }}jfltespr">
-      {{ mirror.description }}
-    </a>
-  </li>
-{% endfor %}
-</ul>
 
 {% include twrpinstall.html %}
 
diff --git a/_samsung/samsunggalaxytabs5ewifi.markdown b/_samsung/samsunggalaxytabs5ewifi.markdown
new file mode 100644
index 0000000..5726264
--- /dev/null
+++ b/_samsung/samsunggalaxytabs5ewifi.markdown
@@ -0,0 +1,28 @@
+---
+layout: device
+title: "Samsung Galaxy Tab S5e WiFi"
+codename: gts4lvwifi
+downloadfolder: gts4lvwifi
+supportstatus: Current
+maintainer: LuK1337
+oem: Samsung
+ddof: "/dev/block/bootdevice/by-name/recovery"
+devicetree: "https://github.com/TeamWin/android_device_samsung_gts4lvwifi"
+xdathread: ""
+---
+
+{% include disclaimer.html %}
+
+{% include supportstatus.html %}
+
+{% include samsungsystemasroot.html %}
+
+{% include appinstall.html %}
+
+{% include download.html %}
+
+{% include twrpinstall.html %}
+
+{% include odininstall.html %}
+
+{% include ddinstall.html %}