Revert "oops"

This reverts commit d2c6307428e56a6b0c52feeac48ec1e29db7a9a6.
Revert "fix for transparent lockscreen option"

This reverts commit 7fb4cb1d11d347207ea4a9faafc5ec8a2592bb0a.
Revert "fix conflict"

This reverts commit 9a07c43dbba25b51afbb0f91fc567596059bd2d9.
Revert "add transparent lockscreen"

This reverts commit 54821cf11a208c647640af5c5abf111247124ece.