Playlists and directory shuffle

[ar-ct]

Hi!
First of all: thank you for this very useful app @vzhd1701

I seem to have some problems with Repeat Directory (Shuffle) feature. Shuffle only works when the videoclip is played till the end, but when I press PgDn, next file is not selected randomly. Is there any way to implement a hotkey to select a next random file, not the next in alphabetical order?

There is another thing I wanted to ask about. When adding all files from directory the GridPlayer is not indexing files in subdirectories. I guess this is intended behavior but my videoclip collection is sorted by dozens of subfolders (which is much more convenient than keeping them all in one folder) and it would be great to have a possibility to play all those clips randomly without placing all files in one parent folder. Could you please consider implementing subfolders indexing as an optional feature?