[#83303294] etc theme
[#83303294] fixes for etc theme
[#83303294] list etc theme
Merge pull request #64 from BrandyMint/feature/etc-theme-rebase

Feature/etc theme rebase