[1/2] Theming of Gallery

Cleanup, fixes for theming from before
the second commit will come before the release to either revert it back to black temporary or it will finish the theming for Gallery2

Based on Dean Jordan concept

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>