From 1a43d8c50192838652604f87f8156e67a6187187 Mon Sep 17 00:00:00 2001
From: adi1090x <adi1090x@gmail.com>
Date: Wed, 29 Jul 2020 23:40:16 +0530
Subject: [PATCH] Fixed Conflicts

---
 README.md                                     |  33 ++++++++----------
 pack_2/{glow => glowing}/LICENSE              |   0
 .../glowing.plymouth}                         |   6 ++--
 .../glow.script => glowing/glowing.script}    |   0
 pack_2/{glow => glowing}/progress-0.png       | Bin
 pack_2/{glow => glowing}/progress-1.png       | Bin
 pack_2/{glow => glowing}/progress-10.png      | Bin
 pack_2/{glow => glowing}/progress-11.png      | Bin
 pack_2/{glow => glowing}/progress-12.png      | Bin
 pack_2/{glow => glowing}/progress-13.png      | Bin
 pack_2/{glow => glowing}/progress-14.png      | Bin
 pack_2/{glow => glowing}/progress-15.png      | Bin
 pack_2/{glow => glowing}/progress-16.png      | Bin
 pack_2/{glow => glowing}/progress-17.png      | Bin
 pack_2/{glow => glowing}/progress-18.png      | Bin
 pack_2/{glow => glowing}/progress-19.png      | Bin
 pack_2/{glow => glowing}/progress-2.png       | Bin
 pack_2/{glow => glowing}/progress-20.png      | Bin
 pack_2/{glow => glowing}/progress-21.png      | Bin
 pack_2/{glow => glowing}/progress-22.png      | Bin
 pack_2/{glow => glowing}/progress-23.png      | Bin
 pack_2/{glow => glowing}/progress-24.png      | Bin
 pack_2/{glow => glowing}/progress-25.png      | Bin
 pack_2/{glow => glowing}/progress-26.png      | Bin
 pack_2/{glow => glowing}/progress-27.png      | Bin
 pack_2/{glow => glowing}/progress-28.png      | Bin
 pack_2/{glow => glowing}/progress-29.png      | Bin
 pack_2/{glow => glowing}/progress-3.png       | Bin
 pack_2/{glow => glowing}/progress-30.png      | Bin
 pack_2/{glow => glowing}/progress-31.png      | Bin
 pack_2/{glow => glowing}/progress-32.png      | Bin
 pack_2/{glow => glowing}/progress-33.png      | Bin
 pack_2/{glow => glowing}/progress-34.png      | Bin
 pack_2/{glow => glowing}/progress-35.png      | Bin
 pack_2/{glow => glowing}/progress-36.png      | Bin
 pack_2/{glow => glowing}/progress-37.png      | Bin
 pack_2/{glow => glowing}/progress-4.png       | Bin
 pack_2/{glow => glowing}/progress-5.png       | Bin
 pack_2/{glow => glowing}/progress-6.png       | Bin
 pack_2/{glow => glowing}/progress-7.png       | Bin
 pack_2/{glow => glowing}/progress-8.png       | Bin
 pack_2/{glow => glowing}/progress-9.png       | Bin
 42 files changed, 18 insertions(+), 21 deletions(-)
 rename pack_2/{glow => glowing}/LICENSE (100%)
 rename pack_2/{glow/glow.plymouth => glowing/glowing.plymouth} (53%)
 rename pack_2/{glow/glow.script => glowing/glowing.script} (100%)
 rename pack_2/{glow => glowing}/progress-0.png (100%)
 rename pack_2/{glow => glowing}/progress-1.png (100%)
 rename pack_2/{glow => glowing}/progress-10.png (100%)
 rename pack_2/{glow => glowing}/progress-11.png (100%)
 rename pack_2/{glow => glowing}/progress-12.png (100%)
 rename pack_2/{glow => glowing}/progress-13.png (100%)
 rename pack_2/{glow => glowing}/progress-14.png (100%)
 rename pack_2/{glow => glowing}/progress-15.png (100%)
 rename pack_2/{glow => glowing}/progress-16.png (100%)
 rename pack_2/{glow => glowing}/progress-17.png (100%)
 rename pack_2/{glow => glowing}/progress-18.png (100%)
 rename pack_2/{glow => glowing}/progress-19.png (100%)
 rename pack_2/{glow => glowing}/progress-2.png (100%)
 rename pack_2/{glow => glowing}/progress-20.png (100%)
 rename pack_2/{glow => glowing}/progress-21.png (100%)
 rename pack_2/{glow => glowing}/progress-22.png (100%)
 rename pack_2/{glow => glowing}/progress-23.png (100%)
 rename pack_2/{glow => glowing}/progress-24.png (100%)
 rename pack_2/{glow => glowing}/progress-25.png (100%)
 rename pack_2/{glow => glowing}/progress-26.png (100%)
 rename pack_2/{glow => glowing}/progress-27.png (100%)
 rename pack_2/{glow => glowing}/progress-28.png (100%)
 rename pack_2/{glow => glowing}/progress-29.png (100%)
 rename pack_2/{glow => glowing}/progress-3.png (100%)
 rename pack_2/{glow => glowing}/progress-30.png (100%)
 rename pack_2/{glow => glowing}/progress-31.png (100%)
 rename pack_2/{glow => glowing}/progress-32.png (100%)
 rename pack_2/{glow => glowing}/progress-33.png (100%)
 rename pack_2/{glow => glowing}/progress-34.png (100%)
 rename pack_2/{glow => glowing}/progress-35.png (100%)
 rename pack_2/{glow => glowing}/progress-36.png (100%)
 rename pack_2/{glow => glowing}/progress-37.png (100%)
 rename pack_2/{glow => glowing}/progress-4.png (100%)
 rename pack_2/{glow => glowing}/progress-5.png (100%)
 rename pack_2/{glow => glowing}/progress-6.png (100%)
 rename pack_2/{glow => glowing}/progress-7.png (100%)
 rename pack_2/{glow => glowing}/progress-8.png (100%)
 rename pack_2/{glow => glowing}/progress-9.png (100%)

diff --git a/README.md b/README.md
index c08ebab..941e895 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,23 @@
-# plymouth-themes
+<h1 align="center">Plymouth Themes</h1>
 
-<p align="left">
-  <img src="https://img.shields.io/badge/Maintained%3F-Yes-blueviolet?style=flat-square">
-  <img src="https://img.shields.io/github/license/adi1090x/plymouth-themes?style=flat-square">
-  <img src="https://img.shields.io/github/stars/adi1090x/plymouth-themes?color=red&style=flat-square">
-  <img src="https://img.shields.io/github/forks/adi1090x/plymouth-themes?style=flat-square">
-  <img src="https://img.shields.io/github/issues/adi1090x/plymouth-themes?style=flat-square">
+<p align="center">
+  <img src="https://img.shields.io/badge/Maintained%3F-Yes-green?style=for-the-badge">
+  <img src="https://img.shields.io/github/license/adi1090x/plymouth-themes?style=for-the-badge">
+  <img src="https://img.shields.io/github/stars/adi1090x/plymouth-themes?style=for-the-badge">
+  <img src="https://img.shields.io/github/forks/adi1090x/plymouth-themes?color=teal&style=for-the-badge">
+  <img src="https://img.shields.io/github/issues/adi1090x/plymouth-themes?color=violet&style=for-the-badge">
 </p>
 
-<p align="left">
-<a href="https://www.buymeacoffee.com/adi1090x"><img src="https://raw.githubusercontent.com/adi1090x/files/master/other/bmac.png" alt="Buy Me A Coffee"></a>
-<a href="https://ko-fi.com/adi1090x"><img src="https://raw.githubusercontent.com/adi1090x/files/master/other/kofi.png" alt="Support me on ko-fi"></a>
+<p align="center">
+<a href="https://www.buymeacoffee.com/adi1090x"><img src="https://raw.githubusercontent.com/adi1090x/files/master/other/1.png" alt="Buy Me A Coffee"></a>
+<a href="https://ko-fi.com/adi1090x"><img src="https://raw.githubusercontent.com/adi1090x/files/master/other/2.png" alt="Support me on ko-fi"></a>
+<a href="https://www.paypal.me/adi1090x"><img src="https://raw.githubusercontent.com/adi1090x/files/master/other/3.png" alt="Support me on Paypal"></a>
+<a href="https://www.patreon.com/adi1090x"><img src="https://raw.githubusercontent.com/adi1090x/files/master/other/4.png" alt="Support me on Patreon"></a>
 </p>
 
-A big collection of plymouth themes, ported from *android bootanimation* from [here](https://forum.xda-developers.com/android/themes/alienware-t3721978).
+<p align="center">
+A big collection of plymouth themes, ported from <i>android bootanimation</i> from <a href="https://forum.xda-developers.com/android/themes/alienware-t3721978">here.</a>
+</p>
 
 ![gif](https://raw.githubusercontent.com/adi1090x/files/master/plymouth-themes/previews/53.gif)
 
@@ -212,13 +216,6 @@ Red Loader|Splash
 
 </details>
 
-### Support This Project
-<p align="left">
-<a href="https://www.paypal.me/adi1090x" target="_blank"><img alt="undefined" src="https://img.shields.io/badge/paypal-adi1090x-blue?style=for-the-badge&logo=paypal"></a>
-<a href="https://www.buymeacoffee.com/adi1090x" target="_blank"><img alt="undefined" src="https://img.shields.io/badge/BuyMeAcoffee-adi1090x-orange?style=for-the-badge&logo=buy-me-a-coffee"></a>  
-<a href="https://ko-fi.com/adi1090x" target="_blank"><img alt="undefined" src="https://img.shields.io/badge/KoFi-adi1090x-red?style=for-the-badge&logo=ko-fi"></a>  
-</p>
-
 ### FYI
 + Created and tested on machine with 1366x768 resolution.
 + Yeah, that's how *quarantine* going on :grin:.
diff --git a/pack_2/glow/LICENSE b/pack_2/glowing/LICENSE
similarity index 100%
rename from pack_2/glow/LICENSE
rename to pack_2/glowing/LICENSE
diff --git a/pack_2/glow/glow.plymouth b/pack_2/glowing/glowing.plymouth
similarity index 53%
rename from pack_2/glow/glow.plymouth
rename to pack_2/glowing/glowing.plymouth
index 8f445de..ab4143d 100755
--- a/pack_2/glow/glow.plymouth
+++ b/pack_2/glowing/glowing.plymouth
@@ -1,9 +1,9 @@
 [Plymouth Theme]
-Name=glow
+Name=glowing
 Description=display a sci-fi glowing sphere
 Comment=created By Aditya Shakya (@adi1090x)
 ModuleName=script
 
 [script]
-ImageDir=/usr/share/plymouth/themes/glow
-ScriptFile=/usr/share/plymouth/themes/glow/glow.script
+ImageDir=/usr/share/plymouth/themes/glowing
+ScriptFile=/usr/share/plymouth/themes/glowing/glowing.script
diff --git a/pack_2/glow/glow.script b/pack_2/glowing/glowing.script
similarity index 100%
rename from pack_2/glow/glow.script
rename to pack_2/glowing/glowing.script
diff --git a/pack_2/glow/progress-0.png b/pack_2/glowing/progress-0.png
similarity index 100%
rename from pack_2/glow/progress-0.png
rename to pack_2/glowing/progress-0.png
diff --git a/pack_2/glow/progress-1.png b/pack_2/glowing/progress-1.png
similarity index 100%
rename from pack_2/glow/progress-1.png
rename to pack_2/glowing/progress-1.png
diff --git a/pack_2/glow/progress-10.png b/pack_2/glowing/progress-10.png
similarity index 100%
rename from pack_2/glow/progress-10.png
rename to pack_2/glowing/progress-10.png
diff --git a/pack_2/glow/progress-11.png b/pack_2/glowing/progress-11.png
similarity index 100%
rename from pack_2/glow/progress-11.png
rename to pack_2/glowing/progress-11.png
diff --git a/pack_2/glow/progress-12.png b/pack_2/glowing/progress-12.png
similarity index 100%
rename from pack_2/glow/progress-12.png
rename to pack_2/glowing/progress-12.png
diff --git a/pack_2/glow/progress-13.png b/pack_2/glowing/progress-13.png
similarity index 100%
rename from pack_2/glow/progress-13.png
rename to pack_2/glowing/progress-13.png
diff --git a/pack_2/glow/progress-14.png b/pack_2/glowing/progress-14.png
similarity index 100%
rename from pack_2/glow/progress-14.png
rename to pack_2/glowing/progress-14.png
diff --git a/pack_2/glow/progress-15.png b/pack_2/glowing/progress-15.png
similarity index 100%
rename from pack_2/glow/progress-15.png
rename to pack_2/glowing/progress-15.png
diff --git a/pack_2/glow/progress-16.png b/pack_2/glowing/progress-16.png
similarity index 100%
rename from pack_2/glow/progress-16.png
rename to pack_2/glowing/progress-16.png
diff --git a/pack_2/glow/progress-17.png b/pack_2/glowing/progress-17.png
similarity index 100%
rename from pack_2/glow/progress-17.png
rename to pack_2/glowing/progress-17.png
diff --git a/pack_2/glow/progress-18.png b/pack_2/glowing/progress-18.png
similarity index 100%
rename from pack_2/glow/progress-18.png
rename to pack_2/glowing/progress-18.png
diff --git a/pack_2/glow/progress-19.png b/pack_2/glowing/progress-19.png
similarity index 100%
rename from pack_2/glow/progress-19.png
rename to pack_2/glowing/progress-19.png
diff --git a/pack_2/glow/progress-2.png b/pack_2/glowing/progress-2.png
similarity index 100%
rename from pack_2/glow/progress-2.png
rename to pack_2/glowing/progress-2.png
diff --git a/pack_2/glow/progress-20.png b/pack_2/glowing/progress-20.png
similarity index 100%
rename from pack_2/glow/progress-20.png
rename to pack_2/glowing/progress-20.png
diff --git a/pack_2/glow/progress-21.png b/pack_2/glowing/progress-21.png
similarity index 100%
rename from pack_2/glow/progress-21.png
rename to pack_2/glowing/progress-21.png
diff --git a/pack_2/glow/progress-22.png b/pack_2/glowing/progress-22.png
similarity index 100%
rename from pack_2/glow/progress-22.png
rename to pack_2/glowing/progress-22.png
diff --git a/pack_2/glow/progress-23.png b/pack_2/glowing/progress-23.png
similarity index 100%
rename from pack_2/glow/progress-23.png
rename to pack_2/glowing/progress-23.png
diff --git a/pack_2/glow/progress-24.png b/pack_2/glowing/progress-24.png
similarity index 100%
rename from pack_2/glow/progress-24.png
rename to pack_2/glowing/progress-24.png
diff --git a/pack_2/glow/progress-25.png b/pack_2/glowing/progress-25.png
similarity index 100%
rename from pack_2/glow/progress-25.png
rename to pack_2/glowing/progress-25.png
diff --git a/pack_2/glow/progress-26.png b/pack_2/glowing/progress-26.png
similarity index 100%
rename from pack_2/glow/progress-26.png
rename to pack_2/glowing/progress-26.png
diff --git a/pack_2/glow/progress-27.png b/pack_2/glowing/progress-27.png
similarity index 100%
rename from pack_2/glow/progress-27.png
rename to pack_2/glowing/progress-27.png
diff --git a/pack_2/glow/progress-28.png b/pack_2/glowing/progress-28.png
similarity index 100%
rename from pack_2/glow/progress-28.png
rename to pack_2/glowing/progress-28.png
diff --git a/pack_2/glow/progress-29.png b/pack_2/glowing/progress-29.png
similarity index 100%
rename from pack_2/glow/progress-29.png
rename to pack_2/glowing/progress-29.png
diff --git a/pack_2/glow/progress-3.png b/pack_2/glowing/progress-3.png
similarity index 100%
rename from pack_2/glow/progress-3.png
rename to pack_2/glowing/progress-3.png
diff --git a/pack_2/glow/progress-30.png b/pack_2/glowing/progress-30.png
similarity index 100%
rename from pack_2/glow/progress-30.png
rename to pack_2/glowing/progress-30.png
diff --git a/pack_2/glow/progress-31.png b/pack_2/glowing/progress-31.png
similarity index 100%
rename from pack_2/glow/progress-31.png
rename to pack_2/glowing/progress-31.png
diff --git a/pack_2/glow/progress-32.png b/pack_2/glowing/progress-32.png
similarity index 100%
rename from pack_2/glow/progress-32.png
rename to pack_2/glowing/progress-32.png
diff --git a/pack_2/glow/progress-33.png b/pack_2/glowing/progress-33.png
similarity index 100%
rename from pack_2/glow/progress-33.png
rename to pack_2/glowing/progress-33.png
diff --git a/pack_2/glow/progress-34.png b/pack_2/glowing/progress-34.png
similarity index 100%
rename from pack_2/glow/progress-34.png
rename to pack_2/glowing/progress-34.png
diff --git a/pack_2/glow/progress-35.png b/pack_2/glowing/progress-35.png
similarity index 100%
rename from pack_2/glow/progress-35.png
rename to pack_2/glowing/progress-35.png
diff --git a/pack_2/glow/progress-36.png b/pack_2/glowing/progress-36.png
similarity index 100%
rename from pack_2/glow/progress-36.png
rename to pack_2/glowing/progress-36.png
diff --git a/pack_2/glow/progress-37.png b/pack_2/glowing/progress-37.png
similarity index 100%
rename from pack_2/glow/progress-37.png
rename to pack_2/glowing/progress-37.png
diff --git a/pack_2/glow/progress-4.png b/pack_2/glowing/progress-4.png
similarity index 100%
rename from pack_2/glow/progress-4.png
rename to pack_2/glowing/progress-4.png
diff --git a/pack_2/glow/progress-5.png b/pack_2/glowing/progress-5.png
similarity index 100%
rename from pack_2/glow/progress-5.png
rename to pack_2/glowing/progress-5.png
diff --git a/pack_2/glow/progress-6.png b/pack_2/glowing/progress-6.png
similarity index 100%
rename from pack_2/glow/progress-6.png
rename to pack_2/glowing/progress-6.png
diff --git a/pack_2/glow/progress-7.png b/pack_2/glowing/progress-7.png
similarity index 100%
rename from pack_2/glow/progress-7.png
rename to pack_2/glowing/progress-7.png
diff --git a/pack_2/glow/progress-8.png b/pack_2/glowing/progress-8.png
similarity index 100%
rename from pack_2/glow/progress-8.png
rename to pack_2/glowing/progress-8.png
diff --git a/pack_2/glow/progress-9.png b/pack_2/glowing/progress-9.png
similarity index 100%
rename from pack_2/glow/progress-9.png
rename to pack_2/glowing/progress-9.png