diff --git a/theme-screenshots/bakke-black.jpg b/theme-screenshots/bakke-black.jpg
new file mode 100644
index 00000000..d522f797
Binary files /dev/null and b/theme-screenshots/bakke-black.jpg differ
diff --git a/theme-screenshots/bakke-white.jpg b/theme-screenshots/bakke-white.jpg
new file mode 100644
index 00000000..d56b3b74
Binary files /dev/null and b/theme-screenshots/bakke-white.jpg differ
diff --git a/theme-screenshots/bakke.jpg b/theme-screenshots/bakke.jpg
deleted file mode 100644
index 7db5fc2b..00000000
Binary files a/theme-screenshots/bakke.jpg and /dev/null differ
diff --git a/theme-screenshots/bobby-black.jpg b/theme-screenshots/bobby-black.jpg
new file mode 100644
index 00000000..396d5b09
Binary files /dev/null and b/theme-screenshots/bobby-black.jpg differ
diff --git a/theme-screenshots/bobby-white.jpg b/theme-screenshots/bobby-white.jpg
new file mode 100644
index 00000000..22b163e3
Binary files /dev/null and b/theme-screenshots/bobby-white.jpg differ
diff --git a/theme-screenshots/bobby.jpg b/theme-screenshots/bobby.jpg
deleted file mode 100644
index af674e60..00000000
Binary files a/theme-screenshots/bobby.jpg and /dev/null differ
diff --git a/theme-screenshots/candy-black.jpg b/theme-screenshots/candy-black.jpg
new file mode 100644
index 00000000..4d29c940
Binary files /dev/null and b/theme-screenshots/candy-black.jpg differ
diff --git a/theme-screenshots/candy-white.jpg b/theme-screenshots/candy-white.jpg
new file mode 100644
index 00000000..74d9cb10
Binary files /dev/null and b/theme-screenshots/candy-white.jpg differ
diff --git a/theme-screenshots/candy.jpg b/theme-screenshots/candy.jpg
deleted file mode 100644
index d9cae5cf..00000000
Binary files a/theme-screenshots/candy.jpg and /dev/null differ
diff --git a/theme-screenshots/clean-black.jpg b/theme-screenshots/clean-black.jpg
new file mode 100644
index 00000000..bc3a3683
Binary files /dev/null and b/theme-screenshots/clean-black.jpg differ
diff --git a/theme-screenshots/clean-white.jpg b/theme-screenshots/clean-white.jpg
new file mode 100644
index 00000000..c85abb25
Binary files /dev/null and b/theme-screenshots/clean-white.jpg differ
diff --git a/theme-screenshots/clean.jpg b/theme-screenshots/clean.jpg
deleted file mode 100644
index e4af1dfb..00000000
Binary files a/theme-screenshots/clean.jpg and /dev/null differ
diff --git a/theme-screenshots/demula-black.jpg b/theme-screenshots/demula-black.jpg
new file mode 100644
index 00000000..3ef4a895
Binary files /dev/null and b/theme-screenshots/demula-black.jpg differ
diff --git a/theme-screenshots/demula-white.jpg b/theme-screenshots/demula-white.jpg
new file mode 100644
index 00000000..3669a8bd
Binary files /dev/null and b/theme-screenshots/demula-white.jpg differ
diff --git a/theme-screenshots/demula.jpg b/theme-screenshots/demula.jpg
deleted file mode 100644
index 3601f969..00000000
Binary files a/theme-screenshots/demula.jpg and /dev/null differ
diff --git a/theme-screenshots/dos-black.jpg b/theme-screenshots/dos-black.jpg
new file mode 100644
index 00000000..4fc7e6fc
Binary files /dev/null and b/theme-screenshots/dos-black.jpg differ
diff --git a/theme-screenshots/dos-white.jpg b/theme-screenshots/dos-white.jpg
new file mode 100644
index 00000000..bfcc0484
Binary files /dev/null and b/theme-screenshots/dos-white.jpg differ
diff --git a/theme-screenshots/dos.jpg b/theme-screenshots/dos.jpg
deleted file mode 100644
index 1e3bf47a..00000000
Binary files a/theme-screenshots/dos.jpg and /dev/null differ
diff --git a/theme-screenshots/doubletime-black.jpg b/theme-screenshots/doubletime-black.jpg
new file mode 100644
index 00000000..29edeca7
Binary files /dev/null and b/theme-screenshots/doubletime-black.jpg differ
diff --git a/theme-screenshots/doubletime-white.jpg b/theme-screenshots/doubletime-white.jpg
new file mode 100644
index 00000000..d9ef22ff
Binary files /dev/null and b/theme-screenshots/doubletime-white.jpg differ
diff --git a/theme-screenshots/doubletime.jpg b/theme-screenshots/doubletime.jpg
deleted file mode 100644
index 0f4cfb77..00000000
Binary files a/theme-screenshots/doubletime.jpg and /dev/null differ
diff --git a/theme-screenshots/doubletime_multiline-black.jpg b/theme-screenshots/doubletime_multiline-black.jpg
new file mode 100644
index 00000000..d0f0262a
Binary files /dev/null and b/theme-screenshots/doubletime_multiline-black.jpg differ
diff --git a/theme-screenshots/doubletime_multiline-white.jpg b/theme-screenshots/doubletime_multiline-white.jpg
new file mode 100644
index 00000000..eefcb350
Binary files /dev/null and b/theme-screenshots/doubletime_multiline-white.jpg differ
diff --git a/theme-screenshots/doubletime_multiline.jpg b/theme-screenshots/doubletime_multiline.jpg
deleted file mode 100644
index 25dc72a0..00000000
Binary files a/theme-screenshots/doubletime_multiline.jpg and /dev/null differ
diff --git a/theme-screenshots/doubletime_multiline_pyonly-black.jpg b/theme-screenshots/doubletime_multiline_pyonly-black.jpg
new file mode 100644
index 00000000..92330d23
Binary files /dev/null and b/theme-screenshots/doubletime_multiline_pyonly-black.jpg differ
diff --git a/theme-screenshots/doubletime_multiline_pyonly-white.jpg b/theme-screenshots/doubletime_multiline_pyonly-white.jpg
new file mode 100644
index 00000000..218095ac
Binary files /dev/null and b/theme-screenshots/doubletime_multiline_pyonly-white.jpg differ
diff --git a/theme-screenshots/doubletime_multiline_pyonly.jpg b/theme-screenshots/doubletime_multiline_pyonly.jpg
deleted file mode 100644
index 83a527ad..00000000
Binary files a/theme-screenshots/doubletime_multiline_pyonly.jpg and /dev/null differ
diff --git a/theme-screenshots/envy-black.jpg b/theme-screenshots/envy-black.jpg
new file mode 100644
index 00000000..34292844
Binary files /dev/null and b/theme-screenshots/envy-black.jpg differ
diff --git a/theme-screenshots/envy-white.jpg b/theme-screenshots/envy-white.jpg
new file mode 100644
index 00000000..30b307e1
Binary files /dev/null and b/theme-screenshots/envy-white.jpg differ
diff --git a/theme-screenshots/envy.jpg b/theme-screenshots/envy.jpg
deleted file mode 100644
index b4810bad..00000000
Binary files a/theme-screenshots/envy.jpg and /dev/null differ
diff --git a/theme-screenshots/hawaii50-white.jpg b/theme-screenshots/hawaii50-white.jpg
new file mode 100644
index 00000000..6fb8970c
Binary files /dev/null and b/theme-screenshots/hawaii50-white.jpg differ
diff --git a/theme-screenshots/hawaii50.jpg b/theme-screenshots/hawaii50.jpg
deleted file mode 100644
index 344321e2..00000000
Binary files a/theme-screenshots/hawaii50.jpg and /dev/null differ
diff --git a/theme-screenshots/mbriggs-black.jpg b/theme-screenshots/mbriggs-black.jpg
new file mode 100644
index 00000000..57c4acdd
Binary files /dev/null and b/theme-screenshots/mbriggs-black.jpg differ
diff --git a/theme-screenshots/mbriggs-white.jpg b/theme-screenshots/mbriggs-white.jpg
new file mode 100644
index 00000000..fee6795e
Binary files /dev/null and b/theme-screenshots/mbriggs-white.jpg differ
diff --git a/theme-screenshots/mbriggs.jpg b/theme-screenshots/mbriggs.jpg
deleted file mode 100644
index 4aee6045..00000000
Binary files a/theme-screenshots/mbriggs.jpg and /dev/null differ
diff --git a/theme-screenshots/minimal-black.jpg b/theme-screenshots/minimal-black.jpg
new file mode 100644
index 00000000..49fff9ee
Binary files /dev/null and b/theme-screenshots/minimal-black.jpg differ
diff --git a/theme-screenshots/minimal-white.jpg b/theme-screenshots/minimal-white.jpg
new file mode 100644
index 00000000..965a2b82
Binary files /dev/null and b/theme-screenshots/minimal-white.jpg differ
diff --git a/theme-screenshots/minimal.jpg b/theme-screenshots/minimal.jpg
deleted file mode 100644
index b4290118..00000000
Binary files a/theme-screenshots/minimal.jpg and /dev/null differ
diff --git a/theme-screenshots/modern-black.jpg b/theme-screenshots/modern-black.jpg
new file mode 100644
index 00000000..8c11fc7a
Binary files /dev/null and b/theme-screenshots/modern-black.jpg differ
diff --git a/theme-screenshots/modern-t-black.jpg b/theme-screenshots/modern-t-black.jpg
new file mode 100644
index 00000000..2b29e49e
Binary files /dev/null and b/theme-screenshots/modern-t-black.jpg differ
diff --git a/theme-screenshots/modern-t-white.jpg b/theme-screenshots/modern-t-white.jpg
new file mode 100644
index 00000000..f9c440a7
Binary files /dev/null and b/theme-screenshots/modern-t-white.jpg differ
diff --git a/theme-screenshots/modern-t.jpg b/theme-screenshots/modern-t.jpg
deleted file mode 100644
index da197818..00000000
Binary files a/theme-screenshots/modern-t.jpg and /dev/null differ
diff --git a/theme-screenshots/modern-white.jpg b/theme-screenshots/modern-white.jpg
new file mode 100644
index 00000000..3127cca6
Binary files /dev/null and b/theme-screenshots/modern-white.jpg differ
diff --git a/theme-screenshots/modern.jpg b/theme-screenshots/modern.jpg
deleted file mode 100644
index 83942fff..00000000
Binary files a/theme-screenshots/modern.jpg and /dev/null differ
diff --git a/theme-screenshots/n0qorg-black.jpg b/theme-screenshots/n0qorg-black.jpg
new file mode 100644
index 00000000..22e08258
Binary files /dev/null and b/theme-screenshots/n0qorg-black.jpg differ
diff --git a/theme-screenshots/n0qorg-white.jpg b/theme-screenshots/n0qorg-white.jpg
new file mode 100644
index 00000000..2ba6c1f4
Binary files /dev/null and b/theme-screenshots/n0qorg-white.jpg differ
diff --git a/theme-screenshots/n0qorg.jpg b/theme-screenshots/n0qorg.jpg
deleted file mode 100644
index ee6ed311..00000000
Binary files a/theme-screenshots/n0qorg.jpg and /dev/null differ
diff --git a/theme-screenshots/nwinkler-black.jpg b/theme-screenshots/nwinkler-black.jpg
new file mode 100644
index 00000000..6962ac12
Binary files /dev/null and b/theme-screenshots/nwinkler-black.jpg differ
diff --git a/theme-screenshots/nwinkler-white.jpg b/theme-screenshots/nwinkler-white.jpg
new file mode 100644
index 00000000..066323a0
Binary files /dev/null and b/theme-screenshots/nwinkler-white.jpg differ
diff --git a/theme-screenshots/nwinkler.jpg b/theme-screenshots/nwinkler.jpg
deleted file mode 100644
index becc4383..00000000
Binary files a/theme-screenshots/nwinkler.jpg and /dev/null differ
diff --git a/theme-screenshots/pete-black.jpg b/theme-screenshots/pete-black.jpg
new file mode 100644
index 00000000..14a33af6
Binary files /dev/null and b/theme-screenshots/pete-black.jpg differ
diff --git a/theme-screenshots/pete-white.jpg b/theme-screenshots/pete-white.jpg
new file mode 100644
index 00000000..0dfa509a
Binary files /dev/null and b/theme-screenshots/pete-white.jpg differ
diff --git a/theme-screenshots/pete.jpg b/theme-screenshots/pete.jpg
deleted file mode 100644
index c760da20..00000000
Binary files a/theme-screenshots/pete.jpg and /dev/null differ
diff --git a/theme-screenshots/powerline-black.jpg b/theme-screenshots/powerline-black.jpg
new file mode 100644
index 00000000..7d4c2a88
Binary files /dev/null and b/theme-screenshots/powerline-black.jpg differ
diff --git a/theme-screenshots/powerline-plain-black.jpg b/theme-screenshots/powerline-plain-black.jpg
new file mode 100644
index 00000000..6c14c213
Binary files /dev/null and b/theme-screenshots/powerline-plain-black.jpg differ
diff --git a/theme-screenshots/powerline-plain-white.jpg b/theme-screenshots/powerline-plain-white.jpg
new file mode 100644
index 00000000..683d7095
Binary files /dev/null and b/theme-screenshots/powerline-plain-white.jpg differ
diff --git a/theme-screenshots/powerline-plain.jpg b/theme-screenshots/powerline-plain.jpg
deleted file mode 100644
index 6783982e..00000000
Binary files a/theme-screenshots/powerline-plain.jpg and /dev/null differ
diff --git a/theme-screenshots/powerline-white.jpg b/theme-screenshots/powerline-white.jpg
new file mode 100644
index 00000000..199a9327
Binary files /dev/null and b/theme-screenshots/powerline-white.jpg differ
diff --git a/theme-screenshots/powerline.jpg b/theme-screenshots/powerline.jpg
deleted file mode 100644
index 1c8ac11f..00000000
Binary files a/theme-screenshots/powerline.jpg and /dev/null differ
diff --git a/theme-screenshots/pure-black.jpg b/theme-screenshots/pure-black.jpg
new file mode 100644
index 00000000..9bb4c150
Binary files /dev/null and b/theme-screenshots/pure-black.jpg differ
diff --git a/theme-screenshots/pure-white.jpg b/theme-screenshots/pure-white.jpg
new file mode 100644
index 00000000..61ec5f3b
Binary files /dev/null and b/theme-screenshots/pure-white.jpg differ
diff --git a/theme-screenshots/pure.jpg b/theme-screenshots/pure.jpg
deleted file mode 100644
index eed19d89..00000000
Binary files a/theme-screenshots/pure.jpg and /dev/null differ
diff --git a/theme-screenshots/rainbowbrite-black.jpg b/theme-screenshots/rainbowbrite-black.jpg
new file mode 100644
index 00000000..79b1a0b4
Binary files /dev/null and b/theme-screenshots/rainbowbrite-black.jpg differ
diff --git a/theme-screenshots/rainbowbrite-white.jpg b/theme-screenshots/rainbowbrite-white.jpg
new file mode 100644
index 00000000..87495cef
Binary files /dev/null and b/theme-screenshots/rainbowbrite-white.jpg differ
diff --git a/theme-screenshots/rainbowbrite.jpg b/theme-screenshots/rainbowbrite.jpg
deleted file mode 100644
index f04d72fe..00000000
Binary files a/theme-screenshots/rainbowbrite.jpg and /dev/null differ
diff --git a/theme-screenshots/rjorgenson-black.jpg b/theme-screenshots/rjorgenson-black.jpg
new file mode 100644
index 00000000..92ea39a7
Binary files /dev/null and b/theme-screenshots/rjorgenson-black.jpg differ
diff --git a/theme-screenshots/rjorgenson-white.jpg b/theme-screenshots/rjorgenson-white.jpg
new file mode 100644
index 00000000..9d3c9112
Binary files /dev/null and b/theme-screenshots/rjorgenson-white.jpg differ
diff --git a/theme-screenshots/rjorgenson.jpg b/theme-screenshots/rjorgenson.jpg
deleted file mode 100644
index 3534cd50..00000000
Binary files a/theme-screenshots/rjorgenson.jpg and /dev/null differ
diff --git a/theme-screenshots/sexy-black.jpg b/theme-screenshots/sexy-black.jpg
new file mode 100644
index 00000000..9d607b97
Binary files /dev/null and b/theme-screenshots/sexy-black.jpg differ
diff --git a/theme-screenshots/sexy-white.jpg b/theme-screenshots/sexy-white.jpg
new file mode 100644
index 00000000..e9553fc1
Binary files /dev/null and b/theme-screenshots/sexy-white.jpg differ
diff --git a/theme-screenshots/sexy.jpg b/theme-screenshots/sexy.jpg
deleted file mode 100644
index 9f6ff3da..00000000
Binary files a/theme-screenshots/sexy.jpg and /dev/null differ
diff --git a/theme-screenshots/simple-black.jpg b/theme-screenshots/simple-black.jpg
new file mode 100644
index 00000000..dfa660eb
Binary files /dev/null and b/theme-screenshots/simple-black.jpg differ
diff --git a/theme-screenshots/simple-white.jpg b/theme-screenshots/simple-white.jpg
new file mode 100644
index 00000000..052bd069
Binary files /dev/null and b/theme-screenshots/simple-white.jpg differ
diff --git a/theme-screenshots/simple.jpg b/theme-screenshots/simple.jpg
deleted file mode 100644
index fd08df74..00000000
Binary files a/theme-screenshots/simple.jpg and /dev/null differ
diff --git a/theme-screenshots/sirup-black.jpg b/theme-screenshots/sirup-black.jpg
new file mode 100644
index 00000000..37020eed
Binary files /dev/null and b/theme-screenshots/sirup-black.jpg differ
diff --git a/theme-screenshots/sirup-white.jpg b/theme-screenshots/sirup-white.jpg
new file mode 100644
index 00000000..8cb7fb69
Binary files /dev/null and b/theme-screenshots/sirup-white.jpg differ
diff --git a/theme-screenshots/sirup.jpg b/theme-screenshots/sirup.jpg
deleted file mode 100644
index 733cf6f3..00000000
Binary files a/theme-screenshots/sirup.jpg and /dev/null differ
diff --git a/theme-screenshots/standard-black.jpg b/theme-screenshots/standard-black.jpg
new file mode 100644
index 00000000..a4ae036f
Binary files /dev/null and b/theme-screenshots/standard-black.jpg differ
diff --git a/theme-screenshots/standard-white.jpg b/theme-screenshots/standard-white.jpg
new file mode 100644
index 00000000..2b584393
Binary files /dev/null and b/theme-screenshots/standard-white.jpg differ
diff --git a/theme-screenshots/standard.jpg b/theme-screenshots/standard.jpg
deleted file mode 100644
index 00e829d1..00000000
Binary files a/theme-screenshots/standard.jpg and /dev/null differ
diff --git a/theme-screenshots/tonka-black.jpg b/theme-screenshots/tonka-black.jpg
new file mode 100644
index 00000000..708e8e52
Binary files /dev/null and b/theme-screenshots/tonka-black.jpg differ
diff --git a/theme-screenshots/tonka-white.jpg b/theme-screenshots/tonka-white.jpg
new file mode 100644
index 00000000..2da0c4d5
Binary files /dev/null and b/theme-screenshots/tonka-white.jpg differ
diff --git a/theme-screenshots/tonka.jpg b/theme-screenshots/tonka.jpg
deleted file mode 100644
index a43136e5..00000000
Binary files a/theme-screenshots/tonka.jpg and /dev/null differ
diff --git a/theme-screenshots/tylenol-black.jpg b/theme-screenshots/tylenol-black.jpg
new file mode 100644
index 00000000..fd61e4b6
Binary files /dev/null and b/theme-screenshots/tylenol-black.jpg differ
diff --git a/theme-screenshots/tylenol-white.jpg b/theme-screenshots/tylenol-white.jpg
new file mode 100644
index 00000000..d2c63a55
Binary files /dev/null and b/theme-screenshots/tylenol-white.jpg differ
diff --git a/theme-screenshots/tylenol.jpg b/theme-screenshots/tylenol.jpg
deleted file mode 100644
index bb6a7fb3..00000000
Binary files a/theme-screenshots/tylenol.jpg and /dev/null differ
diff --git a/theme-screenshots/zitron-black.jpg b/theme-screenshots/zitron-black.jpg
new file mode 100644
index 00000000..1cf26883
Binary files /dev/null and b/theme-screenshots/zitron-black.jpg differ
diff --git a/theme-screenshots/zitron-white.jpg b/theme-screenshots/zitron-white.jpg
new file mode 100644
index 00000000..81ce2276
Binary files /dev/null and b/theme-screenshots/zitron-white.jpg differ
diff --git a/theme-screenshots/zitron.jpg b/theme-screenshots/zitron.jpg
deleted file mode 100644
index 1b3d54a7..00000000
Binary files a/theme-screenshots/zitron.jpg and /dev/null differ
diff --git a/theme-screenshots/zork-black.jpg b/theme-screenshots/zork-black.jpg
new file mode 100644
index 00000000..97d5e3da
Binary files /dev/null and b/theme-screenshots/zork-black.jpg differ
diff --git a/theme-screenshots/zork-white.jpg b/theme-screenshots/zork-white.jpg
new file mode 100644
index 00000000..e4a3cdf0
Binary files /dev/null and b/theme-screenshots/zork-white.jpg differ
diff --git a/theme-screenshots/zork.jpg b/theme-screenshots/zork.jpg
deleted file mode 100644
index cf9a41b1..00000000
Binary files a/theme-screenshots/zork.jpg and /dev/null differ