diff --git a/pywal/__main__.py b/pywal/__main__.py index 1322c5b..214466e 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -121,10 +121,7 @@ def parse_args_exit(parser): "--backend, --theme, -i or -R are required.") if args.theme == "list_themes": - themes = [theme.name.replace(".json", "") - for theme in theme.list_themes()] - print("\n - ".join(["\033[1;32mThemes\033[0m:", *sorted(themes)])) - print("\033[1;32mExtra\033[0m:\n - random (select a random theme)") + theme.list_out() sys.exit(0) if args.backend == "list_backends": @@ -150,7 +147,7 @@ def parse_args(parser): colors_plain = colors.get(image_file, args.l, args.backend) if args.theme: - colors_plain = theme.file(args.theme) + colors_plain = theme.file(args.theme, args.l) if args.R: colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) @@ -187,7 +184,8 @@ def parse_args(parser): def main(): """Main script function.""" util.create_dir(os.path.join(CONF_DIR, "templates")) - util.create_dir(os.path.join(CONF_DIR, "colorschemes")) + util.create_dir(os.path.join(CONF_DIR, "colorschemes/light/")) + util.create_dir(os.path.join(CONF_DIR, "colorschemes/dark/")) util.setup_logging() parser = get_args() diff --git a/pywal/colorschemes/base16-brushtrees.json b/pywal/colorschemes/base16-brushtrees.json deleted file mode 100644 index 45147b5..0000000 --- a/pywal/colorschemes/base16-brushtrees.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "special": { - "background": "#E3EFEF", - "foreground": "#6D828E", - "cursor": "#6D828E" - }, - "colors": { - "color0": "#E3EFEF", - "color1": "#b38686", - "color2": "#87b386", - "color3": "#aab386", - "color4": "#868cb3", - "color5": "#b386b2", - "color6": "#86b3b3", - "color7": "#6D828E", - "color8": "#98AFB5", - "color9": "#b38686", - "color10": "#87b386", - "color11": "#aab386", - "color12": "#868cb3", - "color13": "#b386b2", - "color14": "#86b3b3", - "color15": "#485867" - } -} diff --git a/pywal/colorschemes/3024-dark.json b/pywal/colorschemes/dark/3024.json similarity index 100% rename from pywal/colorschemes/3024-dark.json rename to pywal/colorschemes/dark/3024.json diff --git a/pywal/colorschemes/ashes-dark.json b/pywal/colorschemes/dark/ashes.json similarity index 100% rename from pywal/colorschemes/ashes-dark.json rename to pywal/colorschemes/dark/ashes.json diff --git a/pywal/colorschemes/base16-3024.json b/pywal/colorschemes/dark/base16-3024.json similarity index 100% rename from pywal/colorschemes/base16-3024.json rename to pywal/colorschemes/dark/base16-3024.json diff --git a/pywal/colorschemes/base16-apathy.json b/pywal/colorschemes/dark/base16-apathy.json similarity index 100% rename from pywal/colorschemes/base16-apathy.json rename to pywal/colorschemes/dark/base16-apathy.json diff --git a/pywal/colorschemes/base16-ashes.json b/pywal/colorschemes/dark/base16-ashes.json similarity index 100% rename from pywal/colorschemes/base16-ashes.json rename to pywal/colorschemes/dark/base16-ashes.json diff --git a/pywal/colorschemes/base16-atelier-cave.json b/pywal/colorschemes/dark/base16-atelier-cave.json similarity index 100% rename from pywal/colorschemes/base16-atelier-cave.json rename to pywal/colorschemes/dark/base16-atelier-cave.json diff --git a/pywal/colorschemes/base16-atelier-dune.json b/pywal/colorschemes/dark/base16-atelier-dune.json similarity index 100% rename from pywal/colorschemes/base16-atelier-dune.json rename to pywal/colorschemes/dark/base16-atelier-dune.json diff --git a/pywal/colorschemes/base16-atelier-estuary.json b/pywal/colorschemes/dark/base16-atelier-estuary.json similarity index 100% rename from pywal/colorschemes/base16-atelier-estuary.json rename to pywal/colorschemes/dark/base16-atelier-estuary.json diff --git a/pywal/colorschemes/base16-atelier-forest.json b/pywal/colorschemes/dark/base16-atelier-forest.json similarity index 100% rename from pywal/colorschemes/base16-atelier-forest.json rename to pywal/colorschemes/dark/base16-atelier-forest.json diff --git a/pywal/colorschemes/base16-atelier-heath.json b/pywal/colorschemes/dark/base16-atelier-heath.json similarity index 100% rename from pywal/colorschemes/base16-atelier-heath.json rename to pywal/colorschemes/dark/base16-atelier-heath.json diff --git a/pywal/colorschemes/base16-atelier-lakeside.json b/pywal/colorschemes/dark/base16-atelier-lakeside.json similarity index 100% rename from pywal/colorschemes/base16-atelier-lakeside.json rename to pywal/colorschemes/dark/base16-atelier-lakeside.json diff --git a/pywal/colorschemes/base16-atelier-plateau.json b/pywal/colorschemes/dark/base16-atelier-plateau.json similarity index 100% rename from pywal/colorschemes/base16-atelier-plateau.json rename to pywal/colorschemes/dark/base16-atelier-plateau.json diff --git a/pywal/colorschemes/base16-atelier-savanna.json b/pywal/colorschemes/dark/base16-atelier-savanna.json similarity index 100% rename from pywal/colorschemes/base16-atelier-savanna.json rename to pywal/colorschemes/dark/base16-atelier-savanna.json diff --git a/pywal/colorschemes/base16-atelier-seaside.json b/pywal/colorschemes/dark/base16-atelier-seaside.json similarity index 100% rename from pywal/colorschemes/base16-atelier-seaside.json rename to pywal/colorschemes/dark/base16-atelier-seaside.json diff --git a/pywal/colorschemes/base16-atelier-sulphurpool.json b/pywal/colorschemes/dark/base16-atelier-sulphurpool.json similarity index 100% rename from pywal/colorschemes/base16-atelier-sulphurpool.json rename to pywal/colorschemes/dark/base16-atelier-sulphurpool.json diff --git a/pywal/colorschemes/base16-bespin.json b/pywal/colorschemes/dark/base16-bespin.json similarity index 100% rename from pywal/colorschemes/base16-bespin.json rename to pywal/colorschemes/dark/base16-bespin.json diff --git a/pywal/colorschemes/base16-black-metal-bathory.json b/pywal/colorschemes/dark/base16-black-metal-bathory.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-bathory.json rename to pywal/colorschemes/dark/base16-black-metal-bathory.json diff --git a/pywal/colorschemes/base16-black-metal-burzum.json b/pywal/colorschemes/dark/base16-black-metal-burzum.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-burzum.json rename to pywal/colorschemes/dark/base16-black-metal-burzum.json diff --git a/pywal/colorschemes/base16-black-metal-dark-funeral.json b/pywal/colorschemes/dark/base16-black-metal-funeral.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-dark-funeral.json rename to pywal/colorschemes/dark/base16-black-metal-funeral.json diff --git a/pywal/colorschemes/base16-black-metal-gorgoroth.json b/pywal/colorschemes/dark/base16-black-metal-gorgoroth.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-gorgoroth.json rename to pywal/colorschemes/dark/base16-black-metal-gorgoroth.json diff --git a/pywal/colorschemes/base16-black-metal-immortal.json b/pywal/colorschemes/dark/base16-black-metal-immortal.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-immortal.json rename to pywal/colorschemes/dark/base16-black-metal-immortal.json diff --git a/pywal/colorschemes/base16-black-metal-khold.json b/pywal/colorschemes/dark/base16-black-metal-khold.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-khold.json rename to pywal/colorschemes/dark/base16-black-metal-khold.json diff --git a/pywal/colorschemes/base16-black-metal-marduk.json b/pywal/colorschemes/dark/base16-black-metal-marduk.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-marduk.json rename to pywal/colorschemes/dark/base16-black-metal-marduk.json diff --git a/pywal/colorschemes/base16-black-metal-mayhem.json b/pywal/colorschemes/dark/base16-black-metal-mayhem.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-mayhem.json rename to pywal/colorschemes/dark/base16-black-metal-mayhem.json diff --git a/pywal/colorschemes/base16-black-metal-nile.json b/pywal/colorschemes/dark/base16-black-metal-nile.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-nile.json rename to pywal/colorschemes/dark/base16-black-metal-nile.json diff --git a/pywal/colorschemes/base16-black-metal-venom.json b/pywal/colorschemes/dark/base16-black-metal-venom.json similarity index 100% rename from pywal/colorschemes/base16-black-metal-venom.json rename to pywal/colorschemes/dark/base16-black-metal-venom.json diff --git a/pywal/colorschemes/base16-black-metal.json b/pywal/colorschemes/dark/base16-black-metal.json similarity index 100% rename from pywal/colorschemes/base16-black-metal.json rename to pywal/colorschemes/dark/base16-black-metal.json diff --git a/pywal/colorschemes/base16-brewer.json b/pywal/colorschemes/dark/base16-brewer.json similarity index 100% rename from pywal/colorschemes/base16-brewer.json rename to pywal/colorschemes/dark/base16-brewer.json diff --git a/pywal/colorschemes/base16-bright.json b/pywal/colorschemes/dark/base16-bright.json similarity index 100% rename from pywal/colorschemes/base16-bright.json rename to pywal/colorschemes/dark/base16-bright.json diff --git a/pywal/colorschemes/base16-brushtrees-dark.json b/pywal/colorschemes/dark/base16-brushtrees.json similarity index 100% rename from pywal/colorschemes/base16-brushtrees-dark.json rename to pywal/colorschemes/dark/base16-brushtrees.json diff --git a/pywal/colorschemes/base16-chalk.json b/pywal/colorschemes/dark/base16-chalk.json similarity index 100% rename from pywal/colorschemes/base16-chalk.json rename to pywal/colorschemes/dark/base16-chalk.json diff --git a/pywal/colorschemes/base16-circus.json b/pywal/colorschemes/dark/base16-circus.json similarity index 100% rename from pywal/colorschemes/base16-circus.json rename to pywal/colorschemes/dark/base16-circus.json diff --git a/pywal/colorschemes/base16-classic-dark.json b/pywal/colorschemes/dark/base16-classic.json similarity index 100% rename from pywal/colorschemes/base16-classic-dark.json rename to pywal/colorschemes/dark/base16-classic.json diff --git a/pywal/colorschemes/base16-codeschool.json b/pywal/colorschemes/dark/base16-codeschool.json similarity index 100% rename from pywal/colorschemes/base16-codeschool.json rename to pywal/colorschemes/dark/base16-codeschool.json diff --git a/pywal/colorschemes/base16-default-dark.json b/pywal/colorschemes/dark/base16-default.json similarity index 100% rename from pywal/colorschemes/base16-default-dark.json rename to pywal/colorschemes/dark/base16-default.json diff --git a/pywal/colorschemes/base16-dracula.json b/pywal/colorschemes/dark/base16-dracula.json similarity index 100% rename from pywal/colorschemes/base16-dracula.json rename to pywal/colorschemes/dark/base16-dracula.json diff --git a/pywal/colorschemes/base16-eighties.json b/pywal/colorschemes/dark/base16-eighties.json similarity index 100% rename from pywal/colorschemes/base16-eighties.json rename to pywal/colorschemes/dark/base16-eighties.json diff --git a/pywal/colorschemes/base16-embers.json b/pywal/colorschemes/dark/base16-embers.json similarity index 100% rename from pywal/colorschemes/base16-embers.json rename to pywal/colorschemes/dark/base16-embers.json diff --git a/pywal/colorschemes/base16-flat.json b/pywal/colorschemes/dark/base16-flat.json similarity index 100% rename from pywal/colorschemes/base16-flat.json rename to pywal/colorschemes/dark/base16-flat.json diff --git a/pywal/colorschemes/base16-google-dark.json b/pywal/colorschemes/dark/base16-google.json similarity index 100% rename from pywal/colorschemes/base16-google-dark.json rename to pywal/colorschemes/dark/base16-google.json diff --git a/pywal/colorschemes/base16-grayscale-dark.json b/pywal/colorschemes/dark/base16-grayscale.json similarity index 100% rename from pywal/colorschemes/base16-grayscale-dark.json rename to pywal/colorschemes/dark/base16-grayscale.json diff --git a/pywal/colorschemes/base16-greenscreen.json b/pywal/colorschemes/dark/base16-greenscreen.json similarity index 100% rename from pywal/colorschemes/base16-greenscreen.json rename to pywal/colorschemes/dark/base16-greenscreen.json diff --git a/pywal/colorschemes/base16-gruvbox-dark-hard.json b/pywal/colorschemes/dark/base16-gruvbox-hard.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-dark-hard.json rename to pywal/colorschemes/dark/base16-gruvbox-hard.json diff --git a/pywal/colorschemes/base16-gruvbox-dark-medium.json b/pywal/colorschemes/dark/base16-gruvbox-medium.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-dark-medium.json rename to pywal/colorschemes/dark/base16-gruvbox-medium.json diff --git a/pywal/colorschemes/base16-gruvbox-dark-pale.json b/pywal/colorschemes/dark/base16-gruvbox-pale.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-dark-pale.json rename to pywal/colorschemes/dark/base16-gruvbox-pale.json diff --git a/pywal/colorschemes/base16-gruvbox-dark-soft.json b/pywal/colorschemes/dark/base16-gruvbox-soft.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-dark-soft.json rename to pywal/colorschemes/dark/base16-gruvbox-soft.json diff --git a/pywal/colorschemes/base16-harmonic-dark.json b/pywal/colorschemes/dark/base16-harmonic.json similarity index 100% rename from pywal/colorschemes/base16-harmonic-dark.json rename to pywal/colorschemes/dark/base16-harmonic.json diff --git a/pywal/colorschemes/base16-hopscotch.json b/pywal/colorschemes/dark/base16-hopscotch.json similarity index 100% rename from pywal/colorschemes/base16-hopscotch.json rename to pywal/colorschemes/dark/base16-hopscotch.json diff --git a/pywal/colorschemes/base16-icy.json b/pywal/colorschemes/dark/base16-icy.json similarity index 100% rename from pywal/colorschemes/base16-icy.json rename to pywal/colorschemes/dark/base16-icy.json diff --git a/pywal/colorschemes/base16-irblack.json b/pywal/colorschemes/dark/base16-irblack.json similarity index 100% rename from pywal/colorschemes/base16-irblack.json rename to pywal/colorschemes/dark/base16-irblack.json diff --git a/pywal/colorschemes/base16-isotope.json b/pywal/colorschemes/dark/base16-isotope.json similarity index 100% rename from pywal/colorschemes/base16-isotope.json rename to pywal/colorschemes/dark/base16-isotope.json diff --git a/pywal/colorschemes/base16-macintosh.json b/pywal/colorschemes/dark/base16-macintosh.json similarity index 100% rename from pywal/colorschemes/base16-macintosh.json rename to pywal/colorschemes/dark/base16-macintosh.json diff --git a/pywal/colorschemes/base16-marrakesh.json b/pywal/colorschemes/dark/base16-marrakesh.json similarity index 100% rename from pywal/colorschemes/base16-marrakesh.json rename to pywal/colorschemes/dark/base16-marrakesh.json diff --git a/pywal/colorschemes/base16-materia.json b/pywal/colorschemes/dark/base16-materia.json similarity index 100% rename from pywal/colorschemes/base16-materia.json rename to pywal/colorschemes/dark/base16-materia.json diff --git a/pywal/colorschemes/base16-material-palenight.json b/pywal/colorschemes/dark/base16-material-palenight.json similarity index 100% rename from pywal/colorschemes/base16-material-palenight.json rename to pywal/colorschemes/dark/base16-material-palenight.json diff --git a/pywal/colorschemes/base16-material.json b/pywal/colorschemes/dark/base16-material.json similarity index 100% rename from pywal/colorschemes/base16-material.json rename to pywal/colorschemes/dark/base16-material.json diff --git a/pywal/colorschemes/base16-material-darker.json b/pywal/colorschemes/dark/base16-materialer.json similarity index 100% rename from pywal/colorschemes/base16-material-darker.json rename to pywal/colorschemes/dark/base16-materialer.json diff --git a/pywal/colorschemes/base16-mellow-purple.json b/pywal/colorschemes/dark/base16-mellow-purple.json similarity index 100% rename from pywal/colorschemes/base16-mellow-purple.json rename to pywal/colorschemes/dark/base16-mellow-purple.json diff --git a/pywal/colorschemes/base16-mocha.json b/pywal/colorschemes/dark/base16-mocha.json similarity index 100% rename from pywal/colorschemes/base16-mocha.json rename to pywal/colorschemes/dark/base16-mocha.json diff --git a/pywal/colorschemes/base16-monokai.json b/pywal/colorschemes/dark/base16-monokai.json similarity index 100% rename from pywal/colorschemes/base16-monokai.json rename to pywal/colorschemes/dark/base16-monokai.json diff --git a/pywal/colorschemes/base16-nord.json b/pywal/colorschemes/dark/base16-nord.json similarity index 100% rename from pywal/colorschemes/base16-nord.json rename to pywal/colorschemes/dark/base16-nord.json diff --git a/pywal/colorschemes/base16-ocean.json b/pywal/colorschemes/dark/base16-ocean.json similarity index 100% rename from pywal/colorschemes/base16-ocean.json rename to pywal/colorschemes/dark/base16-ocean.json diff --git a/pywal/colorschemes/base16-oceanicnext.json b/pywal/colorschemes/dark/base16-oceanicnext.json similarity index 100% rename from pywal/colorschemes/base16-oceanicnext.json rename to pywal/colorschemes/dark/base16-oceanicnext.json diff --git a/pywal/colorschemes/base16-onedark.json b/pywal/colorschemes/dark/base16-onedark.json similarity index 100% rename from pywal/colorschemes/base16-onedark.json rename to pywal/colorschemes/dark/base16-onedark.json diff --git a/pywal/colorschemes/base16-outrun-dark.json b/pywal/colorschemes/dark/base16-outrun.json similarity index 100% rename from pywal/colorschemes/base16-outrun-dark.json rename to pywal/colorschemes/dark/base16-outrun.json diff --git a/pywal/colorschemes/base16-paraiso.json b/pywal/colorschemes/dark/base16-paraiso.json similarity index 100% rename from pywal/colorschemes/base16-paraiso.json rename to pywal/colorschemes/dark/base16-paraiso.json diff --git a/pywal/colorschemes/base16-phd.json b/pywal/colorschemes/dark/base16-phd.json similarity index 100% rename from pywal/colorschemes/base16-phd.json rename to pywal/colorschemes/dark/base16-phd.json diff --git a/pywal/colorschemes/base16-pico.json b/pywal/colorschemes/dark/base16-pico.json similarity index 100% rename from pywal/colorschemes/base16-pico.json rename to pywal/colorschemes/dark/base16-pico.json diff --git a/pywal/colorschemes/base16-pop.json b/pywal/colorschemes/dark/base16-pop.json similarity index 100% rename from pywal/colorschemes/base16-pop.json rename to pywal/colorschemes/dark/base16-pop.json diff --git a/pywal/colorschemes/base16-porple.json b/pywal/colorschemes/dark/base16-porple.json similarity index 100% rename from pywal/colorschemes/base16-porple.json rename to pywal/colorschemes/dark/base16-porple.json diff --git a/pywal/colorschemes/base16-railscasts.json b/pywal/colorschemes/dark/base16-railscasts.json similarity index 100% rename from pywal/colorschemes/base16-railscasts.json rename to pywal/colorschemes/dark/base16-railscasts.json diff --git a/pywal/colorschemes/base16-rebecca.json b/pywal/colorschemes/dark/base16-rebecca.json similarity index 100% rename from pywal/colorschemes/base16-rebecca.json rename to pywal/colorschemes/dark/base16-rebecca.json diff --git a/pywal/colorschemes/base16-seti.json b/pywal/colorschemes/dark/base16-seti.json similarity index 100% rename from pywal/colorschemes/base16-seti.json rename to pywal/colorschemes/dark/base16-seti.json diff --git a/pywal/colorschemes/base16-solarflare.json b/pywal/colorschemes/dark/base16-solarflare.json similarity index 100% rename from pywal/colorschemes/base16-solarflare.json rename to pywal/colorschemes/dark/base16-solarflare.json diff --git a/pywal/colorschemes/base16-solarized-dark.json b/pywal/colorschemes/dark/base16-solarized.json similarity index 100% rename from pywal/colorschemes/base16-solarized-dark.json rename to pywal/colorschemes/dark/base16-solarized.json diff --git a/pywal/colorschemes/base16-spacemacs.json b/pywal/colorschemes/dark/base16-spacemacs.json similarity index 100% rename from pywal/colorschemes/base16-spacemacs.json rename to pywal/colorschemes/dark/base16-spacemacs.json diff --git a/pywal/colorschemes/base16-summerfruit-dark.json b/pywal/colorschemes/dark/base16-summerfruit.json similarity index 100% rename from pywal/colorschemes/base16-summerfruit-dark.json rename to pywal/colorschemes/dark/base16-summerfruit.json diff --git a/pywal/colorschemes/base16-tomorrow-night.json b/pywal/colorschemes/dark/base16-tomorrow-night.json similarity index 100% rename from pywal/colorschemes/base16-tomorrow-night.json rename to pywal/colorschemes/dark/base16-tomorrow-night.json diff --git a/pywal/colorschemes/base16-tube.json b/pywal/colorschemes/dark/base16-tube.json similarity index 100% rename from pywal/colorschemes/base16-tube.json rename to pywal/colorschemes/dark/base16-tube.json diff --git a/pywal/colorschemes/base16-twilight.json b/pywal/colorschemes/dark/base16-twilight.json similarity index 100% rename from pywal/colorschemes/base16-twilight.json rename to pywal/colorschemes/dark/base16-twilight.json diff --git a/pywal/colorschemes/base16-unikitty-dark.json b/pywal/colorschemes/dark/base16-unikitty.json similarity index 100% rename from pywal/colorschemes/base16-unikitty-dark.json rename to pywal/colorschemes/dark/base16-unikitty.json diff --git a/pywal/colorschemes/base16-woodland.json b/pywal/colorschemes/dark/base16-woodland.json similarity index 100% rename from pywal/colorschemes/base16-woodland.json rename to pywal/colorschemes/dark/base16-woodland.json diff --git a/pywal/colorschemes/base16-xcode-dusk.json b/pywal/colorschemes/dark/base16-xcode-dusk.json similarity index 100% rename from pywal/colorschemes/base16-xcode-dusk.json rename to pywal/colorschemes/dark/base16-xcode-dusk.json diff --git a/pywal/colorschemes/base16-zenburn.json b/pywal/colorschemes/dark/base16-zenburn.json similarity index 100% rename from pywal/colorschemes/base16-zenburn.json rename to pywal/colorschemes/dark/base16-zenburn.json diff --git a/pywal/colorschemes/base16-darktooth.json b/pywal/colorschemes/dark/base16tooth.json similarity index 100% rename from pywal/colorschemes/base16-darktooth.json rename to pywal/colorschemes/dark/base16tooth.json diff --git a/pywal/colorschemes/darktooth.json b/pywal/colorschemes/dark/darktooth.json similarity index 100% rename from pywal/colorschemes/darktooth.json rename to pywal/colorschemes/dark/darktooth.json diff --git a/pywal/colorschemes/dkeg-5725.json b/pywal/colorschemes/dark/dkeg-5725.json similarity index 100% rename from pywal/colorschemes/dkeg-5725.json rename to pywal/colorschemes/dark/dkeg-5725.json diff --git a/pywal/colorschemes/dkeg-amiox.json b/pywal/colorschemes/dark/dkeg-amiox.json similarity index 100% rename from pywal/colorschemes/dkeg-amiox.json rename to pywal/colorschemes/dark/dkeg-amiox.json diff --git a/pywal/colorschemes/dkeg-bark.json b/pywal/colorschemes/dark/dkeg-bark.json similarity index 100% rename from pywal/colorschemes/dkeg-bark.json rename to pywal/colorschemes/dark/dkeg-bark.json diff --git a/pywal/colorschemes/dkeg-blend.json b/pywal/colorschemes/dark/dkeg-blend.json similarity index 100% rename from pywal/colorschemes/dkeg-blend.json rename to pywal/colorschemes/dark/dkeg-blend.json diff --git a/pywal/colorschemes/dkeg-blok.json b/pywal/colorschemes/dark/dkeg-blok.json similarity index 100% rename from pywal/colorschemes/dkeg-blok.json rename to pywal/colorschemes/dark/dkeg-blok.json diff --git a/pywal/colorschemes/dkeg-bluetype.json b/pywal/colorschemes/dark/dkeg-bluetype.json similarity index 100% rename from pywal/colorschemes/dkeg-bluetype.json rename to pywal/colorschemes/dark/dkeg-bluetype.json diff --git a/pywal/colorschemes/dkeg-blumune.json b/pywal/colorschemes/dark/dkeg-blumune.json similarity index 100% rename from pywal/colorschemes/dkeg-blumune.json rename to pywal/colorschemes/dark/dkeg-blumune.json diff --git a/pywal/colorschemes/dkeg-book.json b/pywal/colorschemes/dark/dkeg-book.json similarity index 100% rename from pywal/colorschemes/dkeg-book.json rename to pywal/colorschemes/dark/dkeg-book.json diff --git a/pywal/colorschemes/dkeg-branch.json b/pywal/colorschemes/dark/dkeg-branch.json similarity index 100% rename from pywal/colorschemes/dkeg-branch.json rename to pywal/colorschemes/dark/dkeg-branch.json diff --git a/pywal/colorschemes/dkeg-brownstone.json b/pywal/colorschemes/dark/dkeg-brownstone.json similarity index 100% rename from pywal/colorschemes/dkeg-brownstone.json rename to pywal/colorschemes/dark/dkeg-brownstone.json diff --git a/pywal/colorschemes/dkeg-bulb.json b/pywal/colorschemes/dark/dkeg-bulb.json similarity index 100% rename from pywal/colorschemes/dkeg-bulb.json rename to pywal/colorschemes/dark/dkeg-bulb.json diff --git a/pywal/colorschemes/dkeg-chaires.json b/pywal/colorschemes/dark/dkeg-chaires.json similarity index 100% rename from pywal/colorschemes/dkeg-chaires.json rename to pywal/colorschemes/dark/dkeg-chaires.json diff --git a/pywal/colorschemes/dkeg-coco.json b/pywal/colorschemes/dark/dkeg-coco.json similarity index 100% rename from pywal/colorschemes/dkeg-coco.json rename to pywal/colorschemes/dark/dkeg-coco.json diff --git a/pywal/colorschemes/dkeg-conv.sh.json b/pywal/colorschemes/dark/dkeg-conv.sh.json similarity index 100% rename from pywal/colorschemes/dkeg-conv.sh.json rename to pywal/colorschemes/dark/dkeg-conv.sh.json diff --git a/pywal/colorschemes/dkeg-corduroy.json b/pywal/colorschemes/dark/dkeg-corduroy.json similarity index 100% rename from pywal/colorschemes/dkeg-corduroy.json rename to pywal/colorschemes/dark/dkeg-corduroy.json diff --git a/pywal/colorschemes/dkeg-depth.json b/pywal/colorschemes/dark/dkeg-depth.json similarity index 100% rename from pywal/colorschemes/dkeg-depth.json rename to pywal/colorschemes/dark/dkeg-depth.json diff --git a/pywal/colorschemes/dkeg-designr.json b/pywal/colorschemes/dark/dkeg-designr.json similarity index 100% rename from pywal/colorschemes/dkeg-designr.json rename to pywal/colorschemes/dark/dkeg-designr.json diff --git a/pywal/colorschemes/dkeg-diner.json b/pywal/colorschemes/dark/dkeg-diner.json similarity index 100% rename from pywal/colorschemes/dkeg-diner.json rename to pywal/colorschemes/dark/dkeg-diner.json diff --git a/pywal/colorschemes/dkeg-escen.json b/pywal/colorschemes/dark/dkeg-escen.json similarity index 100% rename from pywal/colorschemes/dkeg-escen.json rename to pywal/colorschemes/dark/dkeg-escen.json diff --git a/pywal/colorschemes/dkeg-fendr.json b/pywal/colorschemes/dark/dkeg-fendr.json similarity index 100% rename from pywal/colorschemes/dkeg-fendr.json rename to pywal/colorschemes/dark/dkeg-fendr.json diff --git a/pywal/colorschemes/dkeg-flapr.json b/pywal/colorschemes/dark/dkeg-flapr.json similarity index 100% rename from pywal/colorschemes/dkeg-flapr.json rename to pywal/colorschemes/dark/dkeg-flapr.json diff --git a/pywal/colorschemes/dkeg-forst.json b/pywal/colorschemes/dark/dkeg-forst.json similarity index 100% rename from pywal/colorschemes/dkeg-forst.json rename to pywal/colorschemes/dark/dkeg-forst.json diff --git a/pywal/colorschemes/dkeg-fury.json b/pywal/colorschemes/dark/dkeg-fury.json similarity index 100% rename from pywal/colorschemes/dkeg-fury.json rename to pywal/colorschemes/dark/dkeg-fury.json diff --git a/pywal/colorschemes/dkeg-harbing.json b/pywal/colorschemes/dark/dkeg-harbing.json similarity index 100% rename from pywal/colorschemes/dkeg-harbing.json rename to pywal/colorschemes/dark/dkeg-harbing.json diff --git a/pywal/colorschemes/dkeg-kit.json b/pywal/colorschemes/dark/dkeg-kit.json similarity index 100% rename from pywal/colorschemes/dkeg-kit.json rename to pywal/colorschemes/dark/dkeg-kit.json diff --git a/pywal/colorschemes/dkeg-leaf.json b/pywal/colorschemes/dark/dkeg-leaf.json similarity index 100% rename from pywal/colorschemes/dkeg-leaf.json rename to pywal/colorschemes/dark/dkeg-leaf.json diff --git a/pywal/colorschemes/dkeg-link.json b/pywal/colorschemes/dark/dkeg-link.json similarity index 100% rename from pywal/colorschemes/dkeg-link.json rename to pywal/colorschemes/dark/dkeg-link.json diff --git a/pywal/colorschemes/dkeg-mattd.json b/pywal/colorschemes/dark/dkeg-mattd.json similarity index 100% rename from pywal/colorschemes/dkeg-mattd.json rename to pywal/colorschemes/dark/dkeg-mattd.json diff --git a/pywal/colorschemes/dkeg-novmbr.json b/pywal/colorschemes/dark/dkeg-novmbr.json similarity index 100% rename from pywal/colorschemes/dkeg-novmbr.json rename to pywal/colorschemes/dark/dkeg-novmbr.json diff --git a/pywal/colorschemes/dkeg-owl.json b/pywal/colorschemes/dark/dkeg-owl.json similarity index 100% rename from pywal/colorschemes/dkeg-owl.json rename to pywal/colorschemes/dark/dkeg-owl.json diff --git a/pywal/colorschemes/dkeg-paints.json b/pywal/colorschemes/dark/dkeg-paints.json similarity index 100% rename from pywal/colorschemes/dkeg-paints.json rename to pywal/colorschemes/dark/dkeg-paints.json diff --git a/pywal/colorschemes/dkeg-parkd.json b/pywal/colorschemes/dark/dkeg-parkd.json similarity index 100% rename from pywal/colorschemes/dkeg-parkd.json rename to pywal/colorschemes/dark/dkeg-parkd.json diff --git a/pywal/colorschemes/dkeg-pastely.json b/pywal/colorschemes/dark/dkeg-pastely.json similarity index 100% rename from pywal/colorschemes/dkeg-pastely.json rename to pywal/colorschemes/dark/dkeg-pastely.json diff --git a/pywal/colorschemes/dkeg-petal.json b/pywal/colorschemes/dark/dkeg-petal.json similarity index 100% rename from pywal/colorschemes/dkeg-petal.json rename to pywal/colorschemes/dark/dkeg-petal.json diff --git a/pywal/colorschemes/dkeg-poly.json b/pywal/colorschemes/dark/dkeg-poly.json similarity index 100% rename from pywal/colorschemes/dkeg-poly.json rename to pywal/colorschemes/dark/dkeg-poly.json diff --git a/pywal/colorschemes/dkeg-prevail.json b/pywal/colorschemes/dark/dkeg-prevail.json similarity index 100% rename from pywal/colorschemes/dkeg-prevail.json rename to pywal/colorschemes/dark/dkeg-prevail.json diff --git a/pywal/colorschemes/dkeg-provrb.json b/pywal/colorschemes/dark/dkeg-provrb.json similarity index 100% rename from pywal/colorschemes/dkeg-provrb.json rename to pywal/colorschemes/dark/dkeg-provrb.json diff --git a/pywal/colorschemes/dkeg-raild.json b/pywal/colorschemes/dark/dkeg-raild.json similarity index 100% rename from pywal/colorschemes/dkeg-raild.json rename to pywal/colorschemes/dark/dkeg-raild.json diff --git a/pywal/colorschemes/dkeg-relax.json b/pywal/colorschemes/dark/dkeg-relax.json similarity index 100% rename from pywal/colorschemes/dkeg-relax.json rename to pywal/colorschemes/dark/dkeg-relax.json diff --git a/pywal/colorschemes/dkeg-scag.json b/pywal/colorschemes/dark/dkeg-scag.json similarity index 100% rename from pywal/colorschemes/dkeg-scag.json rename to pywal/colorschemes/dark/dkeg-scag.json diff --git a/pywal/colorschemes/dkeg-scape.json b/pywal/colorschemes/dark/dkeg-scape.json similarity index 100% rename from pywal/colorschemes/dkeg-scape.json rename to pywal/colorschemes/dark/dkeg-scape.json diff --git a/pywal/colorschemes/dkeg-shade.json b/pywal/colorschemes/dark/dkeg-shade.json similarity index 100% rename from pywal/colorschemes/dkeg-shade.json rename to pywal/colorschemes/dark/dkeg-shade.json diff --git a/pywal/colorschemes/dkeg-simplicity.json b/pywal/colorschemes/dark/dkeg-simplicity.json similarity index 100% rename from pywal/colorschemes/dkeg-simplicity.json rename to pywal/colorschemes/dark/dkeg-simplicity.json diff --git a/pywal/colorschemes/dkeg-skigh.json b/pywal/colorschemes/dark/dkeg-skigh.json similarity index 100% rename from pywal/colorschemes/dkeg-skigh.json rename to pywal/colorschemes/dark/dkeg-skigh.json diff --git a/pywal/colorschemes/dkeg-slate.json b/pywal/colorschemes/dark/dkeg-slate.json similarity index 100% rename from pywal/colorschemes/dkeg-slate.json rename to pywal/colorschemes/dark/dkeg-slate.json diff --git a/pywal/colorschemes/dkeg-soundwave.json b/pywal/colorschemes/dark/dkeg-soundwave.json similarity index 100% rename from pywal/colorschemes/dkeg-soundwave.json rename to pywal/colorschemes/dark/dkeg-soundwave.json diff --git a/pywal/colorschemes/dkeg-spire.json b/pywal/colorschemes/dark/dkeg-spire.json similarity index 100% rename from pywal/colorschemes/dkeg-spire.json rename to pywal/colorschemes/dark/dkeg-spire.json diff --git a/pywal/colorschemes/dkeg-sprout.json b/pywal/colorschemes/dark/dkeg-sprout.json similarity index 100% rename from pywal/colorschemes/dkeg-sprout.json rename to pywal/colorschemes/dark/dkeg-sprout.json diff --git a/pywal/colorschemes/dkeg-squares.json b/pywal/colorschemes/dark/dkeg-squares.json similarity index 100% rename from pywal/colorschemes/dkeg-squares.json rename to pywal/colorschemes/dark/dkeg-squares.json diff --git a/pywal/colorschemes/dkeg-stv.json b/pywal/colorschemes/dark/dkeg-stv.json similarity index 100% rename from pywal/colorschemes/dkeg-stv.json rename to pywal/colorschemes/dark/dkeg-stv.json diff --git a/pywal/colorschemes/dkeg-subtle.json b/pywal/colorschemes/dark/dkeg-subtle.json similarity index 100% rename from pywal/colorschemes/dkeg-subtle.json rename to pywal/colorschemes/dark/dkeg-subtle.json diff --git a/pywal/colorschemes/dkeg-sundr.json b/pywal/colorschemes/dark/dkeg-sundr.json similarity index 100% rename from pywal/colorschemes/dkeg-sundr.json rename to pywal/colorschemes/dark/dkeg-sundr.json diff --git a/pywal/colorschemes/dkeg-tealights.json b/pywal/colorschemes/dark/dkeg-tealights.json similarity index 100% rename from pywal/colorschemes/dkeg-tealights.json rename to pywal/colorschemes/dark/dkeg-tealights.json diff --git a/pywal/colorschemes/dkeg-traffic.json b/pywal/colorschemes/dark/dkeg-traffic.json similarity index 100% rename from pywal/colorschemes/dkeg-traffic.json rename to pywal/colorschemes/dark/dkeg-traffic.json diff --git a/pywal/colorschemes/dkeg-transposet.json b/pywal/colorschemes/dark/dkeg-transposet.json similarity index 100% rename from pywal/colorschemes/dkeg-transposet.json rename to pywal/colorschemes/dark/dkeg-transposet.json diff --git a/pywal/colorschemes/dkeg-urban.json b/pywal/colorschemes/dark/dkeg-urban.json similarity index 100% rename from pywal/colorschemes/dkeg-urban.json rename to pywal/colorschemes/dark/dkeg-urban.json diff --git a/pywal/colorschemes/dkeg-vans.json b/pywal/colorschemes/dark/dkeg-vans.json similarity index 100% rename from pywal/colorschemes/dkeg-vans.json rename to pywal/colorschemes/dark/dkeg-vans.json diff --git a/pywal/colorschemes/dkeg-victory.json b/pywal/colorschemes/dark/dkeg-victory.json similarity index 100% rename from pywal/colorschemes/dkeg-victory.json rename to pywal/colorschemes/dark/dkeg-victory.json diff --git a/pywal/colorschemes/dkeg-view.json b/pywal/colorschemes/dark/dkeg-view.json similarity index 100% rename from pywal/colorschemes/dkeg-view.json rename to pywal/colorschemes/dark/dkeg-view.json diff --git a/pywal/colorschemes/dkeg-wintry.json b/pywal/colorschemes/dark/dkeg-wintry.json similarity index 100% rename from pywal/colorschemes/dkeg-wintry.json rename to pywal/colorschemes/dark/dkeg-wintry.json diff --git a/pywal/colorschemes/gruvbox.json b/pywal/colorschemes/dark/gruvbox.json similarity index 100% rename from pywal/colorschemes/gruvbox.json rename to pywal/colorschemes/dark/gruvbox.json diff --git a/pywal/colorschemes/hybrid-material.json b/pywal/colorschemes/dark/hybrid-material.json similarity index 100% rename from pywal/colorschemes/hybrid-material.json rename to pywal/colorschemes/dark/hybrid-material.json diff --git a/pywal/colorschemes/monokai-dark.json b/pywal/colorschemes/dark/monokai.json similarity index 100% rename from pywal/colorschemes/monokai-dark.json rename to pywal/colorschemes/dark/monokai.json diff --git a/pywal/colorschemes/sexy-astromouse.json b/pywal/colorschemes/dark/sexy-astromouse.json similarity index 100% rename from pywal/colorschemes/sexy-astromouse.json rename to pywal/colorschemes/dark/sexy-astromouse.json diff --git a/pywal/colorschemes/sexy-belge.json b/pywal/colorschemes/dark/sexy-belge.json similarity index 100% rename from pywal/colorschemes/sexy-belge.json rename to pywal/colorschemes/dark/sexy-belge.json diff --git a/pywal/colorschemes/sexy-bitmute.json b/pywal/colorschemes/dark/sexy-bitmute.json similarity index 100% rename from pywal/colorschemes/sexy-bitmute.json rename to pywal/colorschemes/dark/sexy-bitmute.json diff --git a/pywal/colorschemes/sexy-cloud.json b/pywal/colorschemes/dark/sexy-cloud.json similarity index 100% rename from pywal/colorschemes/sexy-cloud.json rename to pywal/colorschemes/dark/sexy-cloud.json diff --git a/pywal/colorschemes/sexy-colorfulcolors.json b/pywal/colorschemes/dark/sexy-colorfulcolors.json similarity index 100% rename from pywal/colorschemes/sexy-colorfulcolors.json rename to pywal/colorschemes/dark/sexy-colorfulcolors.json diff --git a/pywal/colorschemes/sexy-dawn.json b/pywal/colorschemes/dark/sexy-dawn.json similarity index 100% rename from pywal/colorschemes/sexy-dawn.json rename to pywal/colorschemes/dark/sexy-dawn.json diff --git a/pywal/colorschemes/sexy-deafened.json b/pywal/colorschemes/dark/sexy-deafened.json similarity index 100% rename from pywal/colorschemes/sexy-deafened.json rename to pywal/colorschemes/dark/sexy-deafened.json diff --git a/pywal/colorschemes/sexy-derp.json b/pywal/colorschemes/dark/sexy-derp.json similarity index 100% rename from pywal/colorschemes/sexy-derp.json rename to pywal/colorschemes/dark/sexy-derp.json diff --git a/pywal/colorschemes/sexy-digerati.json b/pywal/colorschemes/dark/sexy-digerati.json similarity index 100% rename from pywal/colorschemes/sexy-digerati.json rename to pywal/colorschemes/dark/sexy-digerati.json diff --git a/pywal/colorschemes/sexy-doomicide-darkocean.json b/pywal/colorschemes/dark/sexy-doomicideocean.json similarity index 100% rename from pywal/colorschemes/sexy-doomicide-darkocean.json rename to pywal/colorschemes/dark/sexy-doomicideocean.json diff --git a/pywal/colorschemes/sexy-dotshare.json b/pywal/colorschemes/dark/sexy-dotshare.json similarity index 100% rename from pywal/colorschemes/sexy-dotshare.json rename to pywal/colorschemes/dark/sexy-dotshare.json diff --git a/pywal/colorschemes/sexy-dwmrob.json b/pywal/colorschemes/dark/sexy-dwmrob.json similarity index 100% rename from pywal/colorschemes/sexy-dwmrob.json rename to pywal/colorschemes/dark/sexy-dwmrob.json diff --git a/pywal/colorschemes/sexy-eqie6.json b/pywal/colorschemes/dark/sexy-eqie6.json similarity index 100% rename from pywal/colorschemes/sexy-eqie6.json rename to pywal/colorschemes/dark/sexy-eqie6.json diff --git a/pywal/colorschemes/sexy-euphrasia.json b/pywal/colorschemes/dark/sexy-euphrasia.json similarity index 100% rename from pywal/colorschemes/sexy-euphrasia.json rename to pywal/colorschemes/dark/sexy-euphrasia.json diff --git a/pywal/colorschemes/sexy-gjm.json b/pywal/colorschemes/dark/sexy-gjm.json similarity index 100% rename from pywal/colorschemes/sexy-gjm.json rename to pywal/colorschemes/dark/sexy-gjm.json diff --git a/pywal/colorschemes/sexy-gnometerm.json b/pywal/colorschemes/dark/sexy-gnometerm.json similarity index 100% rename from pywal/colorschemes/sexy-gnometerm.json rename to pywal/colorschemes/dark/sexy-gnometerm.json diff --git a/pywal/colorschemes/sexy-gotham.json b/pywal/colorschemes/dark/sexy-gotham.json similarity index 100% rename from pywal/colorschemes/sexy-gotham.json rename to pywal/colorschemes/dark/sexy-gotham.json diff --git a/pywal/colorschemes/sexy-gslob-nature-suede.json b/pywal/colorschemes/dark/sexy-gslob-nature-suede.json similarity index 100% rename from pywal/colorschemes/sexy-gslob-nature-suede.json rename to pywal/colorschemes/dark/sexy-gslob-nature-suede.json diff --git a/pywal/colorschemes/sexy-hund.json b/pywal/colorschemes/dark/sexy-hund.json similarity index 100% rename from pywal/colorschemes/sexy-hund.json rename to pywal/colorschemes/dark/sexy-hund.json diff --git a/pywal/colorschemes/sexy-hybrid.json b/pywal/colorschemes/dark/sexy-hybrid.json similarity index 100% rename from pywal/colorschemes/sexy-hybrid.json rename to pywal/colorschemes/dark/sexy-hybrid.json diff --git a/pywal/colorschemes/sexy-insignificato.json b/pywal/colorschemes/dark/sexy-insignificato.json similarity index 100% rename from pywal/colorschemes/sexy-insignificato.json rename to pywal/colorschemes/dark/sexy-insignificato.json diff --git a/pywal/colorschemes/sexy-invisibone.json b/pywal/colorschemes/dark/sexy-invisibone.json similarity index 100% rename from pywal/colorschemes/sexy-invisibone.json rename to pywal/colorschemes/dark/sexy-invisibone.json diff --git a/pywal/colorschemes/sexy-jasonwryan.json b/pywal/colorschemes/dark/sexy-jasonwryan.json similarity index 100% rename from pywal/colorschemes/sexy-jasonwryan.json rename to pywal/colorschemes/dark/sexy-jasonwryan.json diff --git a/pywal/colorschemes/sexy-kasugano.json b/pywal/colorschemes/dark/sexy-kasugano.json similarity index 100% rename from pywal/colorschemes/sexy-kasugano.json rename to pywal/colorschemes/dark/sexy-kasugano.json diff --git a/pywal/colorschemes/sexy-material.json b/pywal/colorschemes/dark/sexy-material.json similarity index 100% rename from pywal/colorschemes/sexy-material.json rename to pywal/colorschemes/dark/sexy-material.json diff --git a/pywal/colorschemes/sexy-mikado.json b/pywal/colorschemes/dark/sexy-mikado.json similarity index 100% rename from pywal/colorschemes/sexy-mikado.json rename to pywal/colorschemes/dark/sexy-mikado.json diff --git a/pywal/colorschemes/sexy-mikazuki.json b/pywal/colorschemes/dark/sexy-mikazuki.json similarity index 100% rename from pywal/colorschemes/sexy-mikazuki.json rename to pywal/colorschemes/dark/sexy-mikazuki.json diff --git a/pywal/colorschemes/sexy-monokai.json b/pywal/colorschemes/dark/sexy-monokai.json similarity index 100% rename from pywal/colorschemes/sexy-monokai.json rename to pywal/colorschemes/dark/sexy-monokai.json diff --git a/pywal/colorschemes/sexy-muse.json b/pywal/colorschemes/dark/sexy-muse.json similarity index 100% rename from pywal/colorschemes/sexy-muse.json rename to pywal/colorschemes/dark/sexy-muse.json diff --git a/pywal/colorschemes/sexy-nancy.json b/pywal/colorschemes/dark/sexy-nancy.json similarity index 100% rename from pywal/colorschemes/sexy-nancy.json rename to pywal/colorschemes/dark/sexy-nancy.json diff --git a/pywal/colorschemes/sexy-navy-and-ivory.json b/pywal/colorschemes/dark/sexy-navy-and-ivory.json similarity index 100% rename from pywal/colorschemes/sexy-navy-and-ivory.json rename to pywal/colorschemes/dark/sexy-navy-and-ivory.json diff --git a/pywal/colorschemes/sexy-neon.json b/pywal/colorschemes/dark/sexy-neon.json similarity index 100% rename from pywal/colorschemes/sexy-neon.json rename to pywal/colorschemes/dark/sexy-neon.json diff --git a/pywal/colorschemes/sexy-numixdarkest.json b/pywal/colorschemes/dark/sexy-numixdarkest.json similarity index 100% rename from pywal/colorschemes/sexy-numixdarkest.json rename to pywal/colorschemes/dark/sexy-numixdarkest.json diff --git a/pywal/colorschemes/sexy-orangish.json b/pywal/colorschemes/dark/sexy-orangish.json similarity index 100% rename from pywal/colorschemes/sexy-orangish.json rename to pywal/colorschemes/dark/sexy-orangish.json diff --git a/pywal/colorschemes/sexy-parker_brothers.json b/pywal/colorschemes/dark/sexy-parker_brothers.json similarity index 100% rename from pywal/colorschemes/sexy-parker_brothers.json rename to pywal/colorschemes/dark/sexy-parker_brothers.json diff --git a/pywal/colorschemes/sexy-phrak1.json b/pywal/colorschemes/dark/sexy-phrak1.json similarity index 100% rename from pywal/colorschemes/sexy-phrak1.json rename to pywal/colorschemes/dark/sexy-phrak1.json diff --git a/pywal/colorschemes/sexy-pretty-and-pastel.json b/pywal/colorschemes/dark/sexy-pretty-and-pastel.json similarity index 100% rename from pywal/colorschemes/sexy-pretty-and-pastel.json rename to pywal/colorschemes/dark/sexy-pretty-and-pastel.json diff --git a/pywal/colorschemes/sexy-rasi.json b/pywal/colorschemes/dark/sexy-rasi.json similarity index 100% rename from pywal/colorschemes/sexy-rasi.json rename to pywal/colorschemes/dark/sexy-rasi.json diff --git a/pywal/colorschemes/sexy-rezza.json b/pywal/colorschemes/dark/sexy-rezza.json similarity index 100% rename from pywal/colorschemes/sexy-rezza.json rename to pywal/colorschemes/dark/sexy-rezza.json diff --git a/pywal/colorschemes/sexy-rydgel.json b/pywal/colorschemes/dark/sexy-rydgel.json similarity index 100% rename from pywal/colorschemes/sexy-rydgel.json rename to pywal/colorschemes/dark/sexy-rydgel.json diff --git a/pywal/colorschemes/sexy-s3r0-modified.json b/pywal/colorschemes/dark/sexy-s3r0-modified.json similarity index 100% rename from pywal/colorschemes/sexy-s3r0-modified.json rename to pywal/colorschemes/dark/sexy-s3r0-modified.json diff --git a/pywal/colorschemes/sexy-sexcolors.json b/pywal/colorschemes/dark/sexy-sexcolors.json similarity index 100% rename from pywal/colorschemes/sexy-sexcolors.json rename to pywal/colorschemes/dark/sexy-sexcolors.json diff --git a/pywal/colorschemes/sexy-simple_rainbow.json b/pywal/colorschemes/dark/sexy-simple_rainbow.json similarity index 100% rename from pywal/colorschemes/sexy-simple_rainbow.json rename to pywal/colorschemes/dark/sexy-simple_rainbow.json diff --git a/pywal/colorschemes/sexy-splurge.json b/pywal/colorschemes/dark/sexy-splurge.json similarity index 100% rename from pywal/colorschemes/sexy-splurge.json rename to pywal/colorschemes/dark/sexy-splurge.json diff --git a/pywal/colorschemes/sexy-swayr.json b/pywal/colorschemes/dark/sexy-swayr.json similarity index 100% rename from pywal/colorschemes/sexy-swayr.json rename to pywal/colorschemes/dark/sexy-swayr.json diff --git a/pywal/colorschemes/sexy-sweetlove.json b/pywal/colorschemes/dark/sexy-sweetlove.json similarity index 100% rename from pywal/colorschemes/sexy-sweetlove.json rename to pywal/colorschemes/dark/sexy-sweetlove.json diff --git a/pywal/colorschemes/sexy-tango.json b/pywal/colorschemes/dark/sexy-tango.json similarity index 100% rename from pywal/colorschemes/sexy-tango.json rename to pywal/colorschemes/dark/sexy-tango.json diff --git a/pywal/colorschemes/sexy-tangoesque.json b/pywal/colorschemes/dark/sexy-tangoesque.json similarity index 100% rename from pywal/colorschemes/sexy-tangoesque.json rename to pywal/colorschemes/dark/sexy-tangoesque.json diff --git a/pywal/colorschemes/sexy-tartan.json b/pywal/colorschemes/dark/sexy-tartan.json similarity index 100% rename from pywal/colorschemes/sexy-tartan.json rename to pywal/colorschemes/dark/sexy-tartan.json diff --git a/pywal/colorschemes/sexy-theme2.json b/pywal/colorschemes/dark/sexy-theme2.json similarity index 100% rename from pywal/colorschemes/sexy-theme2.json rename to pywal/colorschemes/dark/sexy-theme2.json diff --git a/pywal/colorschemes/sexy-thwump.json b/pywal/colorschemes/dark/sexy-thwump.json similarity index 100% rename from pywal/colorschemes/sexy-thwump.json rename to pywal/colorschemes/dark/sexy-thwump.json diff --git a/pywal/colorschemes/sexy-tlh.json b/pywal/colorschemes/dark/sexy-tlh.json similarity index 100% rename from pywal/colorschemes/sexy-tlh.json rename to pywal/colorschemes/dark/sexy-tlh.json diff --git a/pywal/colorschemes/sexy-trim-yer-beard.json b/pywal/colorschemes/dark/sexy-trim-yer-beard.json similarity index 100% rename from pywal/colorschemes/sexy-trim-yer-beard.json rename to pywal/colorschemes/dark/sexy-trim-yer-beard.json diff --git a/pywal/colorschemes/sexy-user-77-mashup-colors.json b/pywal/colorschemes/dark/sexy-user-77-mashup-colors.json similarity index 100% rename from pywal/colorschemes/sexy-user-77-mashup-colors.json rename to pywal/colorschemes/dark/sexy-user-77-mashup-colors.json diff --git a/pywal/colorschemes/sexy-vacuous2.json b/pywal/colorschemes/dark/sexy-vacuous2.json similarity index 100% rename from pywal/colorschemes/sexy-vacuous2.json rename to pywal/colorschemes/dark/sexy-vacuous2.json diff --git a/pywal/colorschemes/sexy-visibone-alt-2.json b/pywal/colorschemes/dark/sexy-visibone-alt-2.json similarity index 100% rename from pywal/colorschemes/sexy-visibone-alt-2.json rename to pywal/colorschemes/dark/sexy-visibone-alt-2.json diff --git a/pywal/colorschemes/sexy-visibone.json b/pywal/colorschemes/dark/sexy-visibone.json similarity index 100% rename from pywal/colorschemes/sexy-visibone.json rename to pywal/colorschemes/dark/sexy-visibone.json diff --git a/pywal/colorschemes/sexy-x-dotshare.json b/pywal/colorschemes/dark/sexy-x-dotshare.json similarity index 100% rename from pywal/colorschemes/sexy-x-dotshare.json rename to pywal/colorschemes/dark/sexy-x-dotshare.json diff --git a/pywal/colorschemes/sexy-zenburn.json b/pywal/colorschemes/dark/sexy-zenburn.json similarity index 100% rename from pywal/colorschemes/sexy-zenburn.json rename to pywal/colorschemes/dark/sexy-zenburn.json diff --git a/pywal/colorschemes/solarized-dark.json b/pywal/colorschemes/dark/solarized.json similarity index 100% rename from pywal/colorschemes/solarized-dark.json rename to pywal/colorschemes/dark/solarized.json diff --git a/pywal/colorschemes/vscode-dark.json b/pywal/colorschemes/dark/vscode.json similarity index 100% rename from pywal/colorschemes/vscode-dark.json rename to pywal/colorschemes/dark/vscode.json diff --git a/pywal/colorschemes/zenburn.json b/pywal/colorschemes/dark/zenburn.json similarity index 100% rename from pywal/colorschemes/zenburn.json rename to pywal/colorschemes/dark/zenburn.json diff --git a/pywal/colorschemes/3024-light.json b/pywal/colorschemes/light/3024.json similarity index 100% rename from pywal/colorschemes/3024-light.json rename to pywal/colorschemes/light/3024.json diff --git a/pywal/colorschemes/ashes-light.json b/pywal/colorschemes/light/ashes-light.json similarity index 100% rename from pywal/colorschemes/ashes-light.json rename to pywal/colorschemes/light/ashes-light.json diff --git a/pywal/colorschemes/base16-atelier-cave-light.json b/pywal/colorschemes/light/base16-atelier-cave.json similarity index 100% rename from pywal/colorschemes/base16-atelier-cave-light.json rename to pywal/colorschemes/light/base16-atelier-cave.json diff --git a/pywal/colorschemes/base16-atelier-dune-light.json b/pywal/colorschemes/light/base16-atelier-dune.json similarity index 100% rename from pywal/colorschemes/base16-atelier-dune-light.json rename to pywal/colorschemes/light/base16-atelier-dune.json diff --git a/pywal/colorschemes/base16-atelier-estuary-light.json b/pywal/colorschemes/light/base16-atelier-estuary.json similarity index 100% rename from pywal/colorschemes/base16-atelier-estuary-light.json rename to pywal/colorschemes/light/base16-atelier-estuary.json diff --git a/pywal/colorschemes/base16-atelier-forest-light.json b/pywal/colorschemes/light/base16-atelier-forest.json similarity index 100% rename from pywal/colorschemes/base16-atelier-forest-light.json rename to pywal/colorschemes/light/base16-atelier-forest.json diff --git a/pywal/colorschemes/base16-atelier-heath-light.json b/pywal/colorschemes/light/base16-atelier-heath.json similarity index 100% rename from pywal/colorschemes/base16-atelier-heath-light.json rename to pywal/colorschemes/light/base16-atelier-heath.json diff --git a/pywal/colorschemes/base16-atelier-lakeside-light.json b/pywal/colorschemes/light/base16-atelier-lakeside.json similarity index 100% rename from pywal/colorschemes/base16-atelier-lakeside-light.json rename to pywal/colorschemes/light/base16-atelier-lakeside.json diff --git a/pywal/colorschemes/base16-atelier-plateau-light.json b/pywal/colorschemes/light/base16-atelier-plateau.json similarity index 100% rename from pywal/colorschemes/base16-atelier-plateau-light.json rename to pywal/colorschemes/light/base16-atelier-plateau.json diff --git a/pywal/colorschemes/base16-atelier-savanna-light.json b/pywal/colorschemes/light/base16-atelier-savanna.json similarity index 100% rename from pywal/colorschemes/base16-atelier-savanna-light.json rename to pywal/colorschemes/light/base16-atelier-savanna.json diff --git a/pywal/colorschemes/base16-atelier-seaside-light.json b/pywal/colorschemes/light/base16-atelier-seaside.json similarity index 100% rename from pywal/colorschemes/base16-atelier-seaside-light.json rename to pywal/colorschemes/light/base16-atelier-seaside.json diff --git a/pywal/colorschemes/base16-atelier-sulphurpool-light.json b/pywal/colorschemes/light/base16-atelier-sulphurpool.json similarity index 100% rename from pywal/colorschemes/base16-atelier-sulphurpool-light.json rename to pywal/colorschemes/light/base16-atelier-sulphurpool.json diff --git a/pywal/colorschemes/base16-classic-light.json b/pywal/colorschemes/light/base16-classic.json similarity index 100% rename from pywal/colorschemes/base16-classic-light.json rename to pywal/colorschemes/light/base16-classic.json diff --git a/pywal/colorschemes/base16-cupcake.json b/pywal/colorschemes/light/base16-cupcake.json similarity index 100% rename from pywal/colorschemes/base16-cupcake.json rename to pywal/colorschemes/light/base16-cupcake.json diff --git a/pywal/colorschemes/base16-cupertino.json b/pywal/colorschemes/light/base16-cupertino.json similarity index 100% rename from pywal/colorschemes/base16-cupertino.json rename to pywal/colorschemes/light/base16-cupertino.json diff --git a/pywal/colorschemes/base16-default-light.json b/pywal/colorschemes/light/base16-default.json similarity index 100% rename from pywal/colorschemes/base16-default-light.json rename to pywal/colorschemes/light/base16-default.json diff --git a/pywal/colorschemes/base16-github.json b/pywal/colorschemes/light/base16-github.json similarity index 95% rename from pywal/colorschemes/base16-github.json rename to pywal/colorschemes/light/base16-github.json index 2921b5a..c48074b 100644 --- a/pywal/colorschemes/base16-github.json +++ b/pywal/colorschemes/light/base16-github.json @@ -20,6 +20,6 @@ "color12": "#795da3", "color13": "#a71d5d", "color14": "#183691", - "color15": "#ffffff" + "color15": "#333333" } } diff --git a/pywal/colorschemes/base16-google-light.json b/pywal/colorschemes/light/base16-google.json similarity index 100% rename from pywal/colorschemes/base16-google-light.json rename to pywal/colorschemes/light/base16-google.json diff --git a/pywal/colorschemes/base16-grayscale-light.json b/pywal/colorschemes/light/base16-grayscale.json similarity index 100% rename from pywal/colorschemes/base16-grayscale-light.json rename to pywal/colorschemes/light/base16-grayscale.json diff --git a/pywal/colorschemes/base16-gruvbox-light-hard.json b/pywal/colorschemes/light/base16-gruvbox-hard.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-light-hard.json rename to pywal/colorschemes/light/base16-gruvbox-hard.json diff --git a/pywal/colorschemes/base16-gruvbox-light-medium.json b/pywal/colorschemes/light/base16-gruvbox-medium.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-light-medium.json rename to pywal/colorschemes/light/base16-gruvbox-medium.json diff --git a/pywal/colorschemes/base16-gruvbox-light-soft.json b/pywal/colorschemes/light/base16-gruvbox-soft.json similarity index 100% rename from pywal/colorschemes/base16-gruvbox-light-soft.json rename to pywal/colorschemes/light/base16-gruvbox-soft.json diff --git a/pywal/colorschemes/base16-harmonic-light.json b/pywal/colorschemes/light/base16-harmonic.json similarity index 100% rename from pywal/colorschemes/base16-harmonic-light.json rename to pywal/colorschemes/light/base16-harmonic.json diff --git a/pywal/colorschemes/base16-material-lighter.json b/pywal/colorschemes/light/base16-materialer.json similarity index 100% rename from pywal/colorschemes/base16-material-lighter.json rename to pywal/colorschemes/light/base16-materialer.json diff --git a/pywal/colorschemes/base16-mexico-light.json b/pywal/colorschemes/light/base16-mexico.json similarity index 100% rename from pywal/colorschemes/base16-mexico-light.json rename to pywal/colorschemes/light/base16-mexico.json diff --git a/pywal/colorschemes/base16-one-light.json b/pywal/colorschemes/light/base16-one.json similarity index 100% rename from pywal/colorschemes/base16-one-light.json rename to pywal/colorschemes/light/base16-one.json diff --git a/pywal/colorschemes/base16-shapeshifter.json b/pywal/colorschemes/light/base16-shapeshifter.json similarity index 100% rename from pywal/colorschemes/base16-shapeshifter.json rename to pywal/colorschemes/light/base16-shapeshifter.json diff --git a/pywal/colorschemes/base16-solarized-light.json b/pywal/colorschemes/light/base16-solarized.json similarity index 100% rename from pywal/colorschemes/base16-solarized-light.json rename to pywal/colorschemes/light/base16-solarized.json diff --git a/pywal/colorschemes/base16-summerfruit-light.json b/pywal/colorschemes/light/base16-summerfruit.json similarity index 100% rename from pywal/colorschemes/base16-summerfruit-light.json rename to pywal/colorschemes/light/base16-summerfruit.json diff --git a/pywal/colorschemes/base16-tomorrow.json b/pywal/colorschemes/light/base16-tomorrow.json similarity index 100% rename from pywal/colorschemes/base16-tomorrow.json rename to pywal/colorschemes/light/base16-tomorrow.json diff --git a/pywal/colorschemes/base16-unikitty-light.json b/pywal/colorschemes/light/base16-unikitty.json similarity index 100% rename from pywal/colorschemes/base16-unikitty-light.json rename to pywal/colorschemes/light/base16-unikitty.json diff --git a/pywal/colorschemes/github.json b/pywal/colorschemes/light/github.json similarity index 100% rename from pywal/colorschemes/github.json rename to pywal/colorschemes/light/github.json diff --git a/pywal/colorschemes/sexy-mostly-bright.json b/pywal/colorschemes/light/sexy-mostly-bright.json similarity index 100% rename from pywal/colorschemes/sexy-mostly-bright.json rename to pywal/colorschemes/light/sexy-mostly-bright.json diff --git a/pywal/colorschemes/sexy-muzieca-lowcontrast.json b/pywal/colorschemes/sexy-muzieca-lowcontrast.json deleted file mode 100644 index 545c897..0000000 --- a/pywal/colorschemes/sexy-muzieca-lowcontrast.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "colors": { - "color0": "#5f5f5f", - "color1": "#d96468", - "color2": "#a2d964", - "color3": "#d9c964", - "color4": "#64a2d9", - "color5": "#9a64d9", - "color6": "#64d9d5", - "color7": "#989898", - "color8": "#828282", - "color9": "#d96468", - "color10": "#a2d964", - "color11": "#d9c964", - "color12": "#64a2d9", - "color13": "#9a64d9", - "color14": "#64d9d5", - "color15": "#989898", - "color16": "#828282", - "color17": "#d98f93" - }, - "special": { - "foreground": "#93a1a1", - "background": "#3c3b37", - "cursor": "#d98f93" - } -} \ No newline at end of file diff --git a/pywal/colorschemes/sexy-muzieca-pastel-white.json b/pywal/colorschemes/sexy-muzieca-pastel-white.json deleted file mode 100644 index 4b815a5..0000000 --- a/pywal/colorschemes/sexy-muzieca-pastel-white.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "colors": { - "color0": "#646e5b", - "color1": "#db7464", - "color2": "#a7e160", - "color3": "#dbd560", - "color4": "#69b2d6", - "color5": "#a073d6", - "color6": "#69e1d3", - "color7": "#9ea894", - "color8": "#88927e", - "color9": "#db7464", - "color10": "#a7e160", - "color11": "#dbd560", - "color12": "#69b2d6", - "color13": "#a073d6", - "color14": "#69e1d3", - "color15": "#9ea894", - "color16": "#88927e", - "color17": "#dba08f" - }, - "special": { - "foreground": "#ffffff", - "background": "#000000", - "cursor": "#dba08f" - } -} \ No newline at end of file diff --git a/pywal/colorschemes/sexy-ok100-matrix.json b/pywal/colorschemes/sexy-ok100-matrix.json deleted file mode 100644 index e81138b..0000000 --- a/pywal/colorschemes/sexy-ok100-matrix.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "colors": { - "color0": "#000000", - "color1": "#55ff55", - "color2": "#00cc00", - "color3": "#00cc00", - "color4": "#005500", - "color5": "#55ff55", - "color6": "#00cc00", - "color7": "#00cc00", - "color8": "#000000", - "color9": "#55ff55", - "color10": "#00cc00", - "color11": "#00cc00", - "color12": "#005500", - "color13": "#55ff55", - "color14": "#00cc00", - "color15": "#00cc00", - "color16": "#000000", - "color17": "#55ff55" - }, - "special": { - "foreground": "#00cc00", - "background": "#000000", - "cursor": "#55ff55" - } -} \ No newline at end of file diff --git a/pywal/theme.py b/pywal/theme.py index cd3be8b..756386e 100644 --- a/pywal/theme.py +++ b/pywal/theme.py @@ -10,11 +10,42 @@ from .settings import CONF_DIR, MODULE_DIR from . import util -def list_themes(): - """List all installed theme files.""" - themes = [*os.scandir(os.path.join(CONF_DIR, "colorschemes")), - *os.scandir(os.path.join(MODULE_DIR, "colorschemes"))] +def list_out(): + """List all themes in a pretty format.""" + dark_themes = [theme.name.replace(".json", "") + for theme in list_themes()] + ligh_themes = [theme.name.replace(".json", "") + for theme in list_themes(dark=False)] + user_themes = [theme.name.replace(".json", "") + for theme in list_themes_user()] + if user_themes: + print("\033[1;32mUser Themes\033[0m:") + print("\n - ".join(sorted(user_themes))) + + print("\033[1;32mDark Themes\033[0m:") + print("\n - ".join(sorted(dark_themes))) + + print("\033[1;32mLight Themes\033[0m:") + print("\n - ".join(sorted(ligh_themes))) + + print("\033[1;32mExtra\033[0m:") + print(" - random (select a random dark theme)") + print(" - random_dark (select a random dark theme)") + print(" - random_light (select a random light theme)") + + +def list_themes(dark=True): + """List all installed theme files.""" + dark = "dark" if dark else "light" + themes = os.scandir(os.path.join(MODULE_DIR, "colorschemes", dark)) + return [t for t in themes if os.path.isfile(t.path)] + + +def list_themes_user(): + """List user theme files.""" + themes = [*os.scandir(os.path.join(CONF_DIR, "colorschemes/dark/")), + *os.scandir(os.path.join(CONF_DIR, "colorschemes/light/"))] return [t for t in themes if os.path.isfile(t.path)] @@ -50,25 +81,37 @@ def parse(theme_file): return data -def file(input_file): +def get_random_theme(dark=True): + """Get a random theme file.""" + themes = [theme.path for theme in list_themes(dark)] + random.shuffle(themes) + return themes[0] + + +def file(input_file, light=False): """Import colorscheme from json file.""" + util.create_dir(os.path.join(CONF_DIR, "colorschemes/light/")) + util.create_dir(os.path.join(CONF_DIR, "colorschemes/dark/")) + theme_name = ".".join((input_file, "json")) - user_theme_file = os.path.join(CONF_DIR, "colorschemes", theme_name) - theme_file = os.path.join(MODULE_DIR, "colorschemes", theme_name) - util.create_dir(os.path.join(CONF_DIR, "colorschemes")) + bri = "light" if light else "dark" + + user_theme_file = os.path.join(CONF_DIR, "colorschemes", bri, theme_name) + theme_file = os.path.join(MODULE_DIR, "colorschemes", bri, theme_name) # Find the theme file. - if os.path.isfile(input_file): + if input_file == "random" or input_file == "random_dark": + theme_file = get_random_theme() + + elif input_file == "random_light": + theme_file = get_random_theme(light) + + elif os.path.isfile(input_file): theme_file = input_file elif os.path.isfile(user_theme_file): theme_file = user_theme_file - elif input_file == "random": - themes = [theme.path for theme in list_themes()] - random.shuffle(themes) - theme_file = themes[0] - # Parse the theme file. if os.path.isfile(theme_file): logging.info("Set theme to \033[1;37m%s\033[0m.", @@ -76,5 +119,7 @@ def file(input_file): return parse(theme_file) else: - logging.error("No colorscheme file found.") + logging.error("No %s colorscheme file found.", bri) + logging.error("Try adding '-l' to set light themes.") + logging.error("Try removing '-l' to set dark themes.") sys.exit(1)