Plugin rework

Hello there!

Just my 2 cents, some plugin rework for your consideration.