diff --git a/.gitignore b/.gitignore
index 934eb8c..f44b38e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,5 @@ flycheck_*.el
 
 .direnv/*
 .vscode/*
-result
\ No newline at end of file
+result
+*.mo
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 66097f2..59c1b4b 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,17 +74,18 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.59.0",
+ "once_cell",
+ "windows-sys",
 ]
 
 [[package]]
@@ -171,9 +172,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bitstream-io"
@@ -223,7 +224,7 @@ version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "cairo-sys-rs",
  "glib",
  "libc",
@@ -242,9 +243,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.6"
+version = "1.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
+checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
 dependencies = [
  "jobserver",
  "libc",
@@ -293,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.23"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -303,9 +304,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.23"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -315,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -394,9 +395,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "either"
@@ -423,14 +424,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -554,6 +555,15 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "fuzzy-matcher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+dependencies = [
+ "thread_local",
+]
+
 [[package]]
 name = "gdk-pixbuf"
 version = "0.20.7"
@@ -679,7 +689,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "system-deps 7.0.3",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -688,7 +698,7 @@ version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f969edf089188d821a30cde713b6f9eb08b20c63fc2e584aba2892a7984a8cc0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
@@ -888,7 +898,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core",
 ]
 
 [[package]]
@@ -925,9 +935,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
+checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -941,9 +951,9 @@ checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -962,13 +972,13 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.13"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1009,9 +1019,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1047,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "locale_config"
@@ -1066,9 +1076,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "loop9"
@@ -1121,9 +1131,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -1160,15 +1170,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
 
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -1292,9 +1293,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -1341,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -1384,9 +1385,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -1537,15 +1538,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.8.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1571,9 +1572,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 
 [[package]]
 name = "serde"
@@ -1597,9 +1598,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
 dependencies = [
  "itoa",
  "memchr",
@@ -1720,29 +1721,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.91"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.33.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "memchr",
- "ntapi",
- "rayon",
- "windows",
-]
-
 [[package]]
 name = "system-deps"
 version = "6.2.2"
@@ -1867,9 +1854,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243"
 
 [[package]]
 name = "utf8parse"
@@ -1921,20 +1908,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
@@ -1946,9 +1934,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1956,9 +1944,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1969,17 +1957,21 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "waytrogen"
-version = "0.5.0"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "async-channel",
  "clap",
+ "fuzzy-matcher",
  "gettext-rs",
  "gtk4",
  "hex",
@@ -1995,7 +1987,6 @@ dependencies = [
  "stderrlog",
  "strum",
  "strum_macros",
- "sysinfo",
  "walkdir",
  "which",
  "xdg",
@@ -2041,7 +2032,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2050,16 +2041,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-dependencies = [
- "windows-core 0.57.0",
- "windows-targets",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -2069,58 +2050,6 @@ dependencies = [
  "windows-targets",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-result",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -2196,9 +2125,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.6.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 71dd128..daeba99 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "waytrogen"
-version = "0.5.0"
+version = "0.6.3"
 edition = "2021"
 description = "A GTK graphical user interface for changing your wallpapers on Wayland based compositors."
 license = "Unlicense"
@@ -20,7 +20,6 @@ xdg = "2.5.2"
 stderrlog = "0.6.0"
 log = "0.4.22"
 image = "0.25.5"
-sysinfo = "0.33.1"
 async-channel = "2.3.1"
 which = "7.0.1"
 strum = "0.26.3"
@@ -34,3 +33,4 @@ clap = { version = "4.5.23", features = ["derive"] }
 mktemp = "0.5.1"
 gettext-rs = { version = "0.7.2", features = ["gettext-system"] }
 rand = "0.8.5"
+fuzzy-matcher = "*"
diff --git a/flake.lock b/flake.lock
index 600d0e4..9f8f7c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,11 +64,46 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1736320768,
+        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1737599167,
+        "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "38374302ae9edf819eac666d1f276d62c712dd06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
       }
     },
     "systems": {
diff --git a/flake.nix b/flake.nix
index 300935d..a04fa05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,14 @@
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
     naersk.url = "github:nix-community/naersk";
+    rust-overlay.url = "github:oxalica/rust-overlay";
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   };
-  outputs = { self, flake-utils, naersk, nixpkgs }:
+  outputs = { self, flake-utils, naersk, nixpkgs, rust-overlay }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = (import nixpkgs) { inherit system; };
+        overlays = [ (import rust-overlay) ];
+        pkgs = (import nixpkgs) { inherit system overlays; };
         naersk' = pkgs.callPackage naersk { };
 
       in rec {
@@ -27,7 +29,6 @@
             sqlite
             openssl
             gsettings-desktop-schemas
-            killall
           ];
 
           env = { OPENSSL_NO_VENDOR = 1; };
@@ -51,15 +52,13 @@
 
         devShell = pkgs.mkShell {
           nativeBuildInputs = with pkgs; [
-            rustc
-            cargo
-            rustfmt
-            clippy
             pkg-config
             glib
             wrapGAppsHook4
             sqlite
             bash
+            rust-bin.nightly.latest.default
+            cargo-udeps
           ];
           buildInputs = with pkgs; [
             glib
diff --git a/locales/LINGUAS b/locales/LINGUAS
new file mode 100644
index 0000000..3835fb0
--- /dev/null
+++ b/locales/LINGUAS
@@ -0,0 +1,2 @@
+en
+es
\ No newline at end of file
diff --git a/locales/en/LC_MESSAGES/waytrogen.mo b/locales/en/LC_MESSAGES/waytrogen.mo
deleted file mode 100644
index f577b5b..0000000
Binary files a/locales/en/LC_MESSAGES/waytrogen.mo and /dev/null differ
diff --git a/locales/en/LC_MESSAGES/waytrogen.po b/locales/en/LC_MESSAGES/waytrogen.po
index a79f814..d2711d1 100644
--- a/locales/en/LC_MESSAGES/waytrogen.po
+++ b/locales/en/LC_MESSAGES/waytrogen.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-08 23:34+0000\n"
+"POT-Creation-Date: 2025-01-23 18:34+0000\n"
 "PO-Revision-Date: 2025-01-08 18:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,204 +17,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common.rs:71
+#: ../src/common.rs:74
 msgid "Failed to create thumbnail for"
 msgstr "Failed to create thumbnail for"
 
-#: src/common.rs:94
+#: ../src/common.rs:97
 msgid "Thumbnail could not be generated using ffmpg."
 msgstr "Thumbnail could not be generated using ffmpg."
 
-#: src/common.rs:147
+#: ../src/common.rs:150
 msgid "Invalid string"
 msgstr "Invalid string"
 
-#: src/database.rs:63
+#: ../src/database.rs:63
 msgid "Cache Hit"
 msgstr "Cache Hit"
 
-#: src/database.rs:69
+#: ../src/database.rs:69
 msgid "Cache Miss"
 msgstr "Cache Miss"
 
-#: src/database.rs:77
+#: ../src/database.rs:77
 msgid "GTK Picture created successfully."
 msgstr "GTK Picture created successfully."
 
-#: src/database.rs:87
+#: ../src/database.rs:87
 msgid "File could not be converted to a GTK Picture"
 msgstr "File could not be converted to a GTK Picture"
 
-#: src/ui_common.rs:42 src/ui_common.rs:93 src/ui_common.rs:97
-#: src/ui_common.rs:102
+#: ../src/ui_common.rs:42 ../src/ui_common.rs:93 ../src/ui_common.rs:97
+#: ../src/ui_common.rs:102
 msgid "The channel must be open"
 msgstr "The channel must be open"
 
-#: src/ui_common.rs:153
+#: ../src/ui_common.rs:153
 msgid "stretch"
 msgstr "stretch"
 
-#: src/ui_common.rs:154 src/ui_common.rs:333
+#: ../src/ui_common.rs:154 ../src/ui_common.rs:333
 msgid "fit"
 msgstr "fit"
 
-#: src/ui_common.rs:155
+#: ../src/ui_common.rs:155
 msgid "fill"
 msgstr "fill"
 
-#: src/ui_common.rs:156 src/ui_common.rs:448
+#: ../src/ui_common.rs:156 ../src/ui_common.rs:448
 msgid "center"
 msgstr "center"
 
-#: src/ui_common.rs:157
+#: ../src/ui_common.rs:157
 msgid "tile"
 msgstr "tile"
 
-#: src/ui_common.rs:158
+#: ../src/ui_common.rs:158
 msgid "solid_color"
 msgstr "solid_color"
 
-#: src/ui_common.rs:191
+#: ../src/ui_common.rs:191
 msgid "Serialized RGB"
 msgstr "Serialized RGB"
 
-#: src/ui_common.rs:213 src/ui_common.rs:447
+#: ../src/ui_common.rs:213 ../src/ui_common.rs:447
 msgid "none"
 msgstr "none"
 
-#: src/ui_common.rs:214
+#: ../src/ui_common.rs:214
 msgid "auto-pause"
 msgstr "auto-pause"
 
-#: src/ui_common.rs:215
+#: ../src/ui_common.rs:215
 msgid "auto-stop"
 msgstr "auto-stop"
 
-#: src/ui_common.rs:228
+#: ../src/ui_common.rs:228
 msgid "Enable slideshow for the current folder."
 msgstr "Enable slideshow for the current folder."
 
-#: src/ui_common.rs:242
+#: ../src/ui_common.rs:242
 msgid "Slideshow change interval"
 msgstr "Slideshow change interval"
 
-#: src/ui_common.rs:266
+#: ../src/ui_common.rs:263
+msgid "Additional mpv options"
+msgstr "Additional mpv options"
+
+#: ../src/ui_common.rs:266
 msgid "Additional command line options to be sent to mpv."
 msgstr "Additional command line options to be sent to mpv."
 
-#: src/ui_common.rs:321
+#: ../src/ui_common.rs:321
 msgid "Entered switch callback"
 msgstr "Entered switch callback"
 
-#: src/ui_common.rs:333
+#: ../src/ui_common.rs:333
 msgid "no"
 msgstr "no"
 
-#: src/ui_common.rs:333
+#: ../src/ui_common.rs:333
 msgid "crop"
 msgstr "crop"
 
-#: src/ui_common.rs:386
+#: ../src/ui_common.rs:386
 msgid "SWWW Advanced Image Settings"
 msgstr "SWWW Advanced Image Settings"
 
-#: src/ui_common.rs:394
+#: ../src/ui_common.rs:394
 msgid "Advanced Settings"
 msgstr "Advanced Settings"
 
-#: src/ui_common.rs:413
+#: ../src/ui_common.rs:413
 msgid "Scalling filter"
 msgstr "Scalling filter"
 
-#: src/ui_common.rs:422
+#: ../src/ui_common.rs:422
 msgid "nearest"
 msgstr "nearest"
 
-#: src/ui_common.rs:423
+#: ../src/ui_common.rs:423
 msgid "bilinear"
 msgstr "bilinear"
 
-#: src/ui_common.rs:424
+#: ../src/ui_common.rs:424
 msgid "catmullrom"
 msgstr "catmullrom"
 
-#: src/ui_common.rs:425
+#: ../src/ui_common.rs:425
 msgid "mitchell"
 msgstr "mitchell"
 
-#: src/ui_common.rs:426
+#: ../src/ui_common.rs:426
 msgid "lanczos3"
 msgstr "lanczos3"
 
-#: src/ui_common.rs:438
+#: ../src/ui_common.rs:438
 msgid "Transition type"
 msgstr "Transition type"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "simple"
 msgstr "simple"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "fade"
 msgstr "fade"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "left"
 msgstr "left"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "right"
 msgstr "right"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "top"
 msgstr "top"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "bottom"
 msgstr "bottom"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "wipe"
 msgstr "wipe"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "wave"
 msgstr "wave"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "grow"
 msgstr "grow"
 
-#: src/ui_common.rs:448
+#: ../src/ui_common.rs:448
 msgid "any"
 msgstr "any"
 
-#: src/ui_common.rs:448
+#: ../src/ui_common.rs:448
 msgid "outer"
 msgstr "outer"
 
-#: src/ui_common.rs:448
+#: ../src/ui_common.rs:448
 msgid "random"
 msgstr "random"
 
-#: src/ui_common.rs:481
+#: ../src/ui_common.rs:481
 msgid "Transition step"
 msgstr "Transition step"
 
-#: src/ui_common.rs:508
+#: ../src/ui_common.rs:508
 msgid "Transition duration"
 msgstr "Transition duration"
 
-#: src/ui_common.rs:540
+#: ../src/ui_common.rs:540
 msgid "Transition angle"
 msgstr "Transition angle"
 
-#: src/ui_common.rs:586 src/ui_common.rs:596
+#: ../src/ui_common.rs:586 ../src/ui_common.rs:596
 msgid "Transition position"
 msgstr "Transition position"
 
-#: src/ui_common.rs:598
+#: ../src/ui_common.rs:598
 msgid ""
 "Can either be floating point number between 0 and 0.99, integer coordinate "
 "like 200,200 or one of the following: center, top, left, right, bottom, top-"
@@ -224,72 +228,77 @@ msgstr ""
 "like 200,200 or one of the following: center, top, left, right, bottom, top-"
 "left, top-right, bottom-left or bottom-right."
 
-#: src/ui_common.rs:626
+#: ../src/ui_common.rs:626
 msgid "Invert Y"
 msgstr "Invert Y"
 
-#: src/ui_common.rs:636
+#: ../src/ui_common.rs:636
 msgid "Invert y position in transition position flag"
 msgstr "Invert y position in transition position flag"
 
-#: src/ui_common.rs:649
+#: ../src/ui_common.rs:649
 msgid "Transition wave"
 msgstr "Transition wave"
 
-#: src/ui_common.rs:708
+#: ../src/ui_common.rs:708
 msgid "Transition bezier"
 msgstr "Transition bezier"
 
-#: src/ui_common.rs:778
+#: ../src/ui_common.rs:778
 msgid "Transition FPS"
 msgstr "Transition FPS"
 
-#: src/ui_common.rs:817
+#: ../src/ui_common.rs:817
 msgid "Confirm"
 msgstr "Confirm"
 
-#: src/ui_common.rs:827
+#: ../src/ui_common.rs:827
 msgid "Restore Defaults"
 msgstr "Restore Defaults"
 
-#: src/ui_common.rs:911
+#: ../src/ui_common.rs:911
 msgid "Selected changer"
 msgstr "Selected changer"
 
-#: src/main.rs:151
+#: ../src/main.rs:163
+#, fuzzy
+msgid "Wallpaper Folder"
+msgstr "Image Folder"
+
+#: ../src/main.rs:203
 msgid "Image Folder"
 msgid_plural "Images Folder"
 msgstr[0] "Image Folder"
 msgstr[1] "Images Folder"
 
-#: src/main.rs:302
+#: ../src/main.rs:362
 msgid "Saved wallpapers"
 msgstr "Saved wallpapers"
 
-#: src/main.rs:309
+#: ../src/main.rs:370
 msgid "Stored Text"
 msgstr "Stored Text"
 
-#: src/main.rs:320
+#: ../src/main.rs:399
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
-#: src/main.rs:320
+#: ../src/main.rs:399
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
-#: src/main.rs:332
+#: ../src/main.rs:411
 msgid "Invert Sort"
 msgstr "Invert Sort"
 
-#: src/main.rs:535
+#: ../src/main.rs:613
 msgid "Images are loading, please wait"
 msgstr "Images are loading, please wait"
 
-#: src/main.rs:565
+#: ../src/main.rs:645
 msgid "Finished loading images"
 msgstr "Finished loading images"
 
-#: src/main.rs:570
+#: ../src/main.rs:656
 msgid "Hiding unsupported images"
 msgstr "Hiding unsupported images"
diff --git a/locales/es/LC_MESSAGES/waytrogen.mo b/locales/es/LC_MESSAGES/waytrogen.mo
deleted file mode 100644
index e736ff5..0000000
Binary files a/locales/es/LC_MESSAGES/waytrogen.mo and /dev/null differ
diff --git a/locales/es/LC_MESSAGES/waytrogen.po b/locales/es/LC_MESSAGES/waytrogen.po
index cc20caf..4d83858 100644
--- a/locales/es/LC_MESSAGES/waytrogen.po
+++ b/locales/es/LC_MESSAGES/waytrogen.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-08 23:34+0000\n"
+"POT-Creation-Date: 2025-01-23 18:34+0000\n"
 "PO-Revision-Date: 2025-01-08 18:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,204 +17,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common.rs:71
+#: ../src/common.rs:74
 msgid "Failed to create thumbnail for"
 msgstr "Creación de imagen en miniatura fallo: "
 
-#: src/common.rs:94
+#: ../src/common.rs:97
 msgid "Thumbnail could not be generated using ffmpg."
 msgstr "No se pudo crear imagen en miniatura usando ffmpeg."
 
-#: src/common.rs:147
+#: ../src/common.rs:150
 msgid "Invalid string"
 msgstr "Cadena de caracteres invalido"
 
-#: src/database.rs:63
+#: ../src/database.rs:63
 msgid "Cache Hit"
 msgstr "Encontrado en el cache"
 
-#: src/database.rs:69
+#: ../src/database.rs:69
 msgid "Cache Miss"
 msgstr "No fue encontrado en el cache"
 
-#: src/database.rs:77
+#: ../src/database.rs:77
 msgid "GTK Picture created successfully."
 msgstr "Imagen GTK fue creada"
 
-#: src/database.rs:87
+#: ../src/database.rs:87
 msgid "File could not be converted to a GTK Picture"
 msgstr "Archivo no se pudo convertir a una imagen GTK"
 
-#: src/ui_common.rs:42 src/ui_common.rs:93 src/ui_common.rs:97
-#: src/ui_common.rs:102
+#: ../src/ui_common.rs:42 ../src/ui_common.rs:93 ../src/ui_common.rs:97
+#: ../src/ui_common.rs:102
 msgid "The channel must be open"
 msgstr "El canal tiene que estar abierto"
 
-#: src/ui_common.rs:153
+#: ../src/ui_common.rs:153
 msgid "stretch"
 msgstr "estirar"
 
-#: src/ui_common.rs:154 src/ui_common.rs:333
+#: ../src/ui_common.rs:154 ../src/ui_common.rs:333
 msgid "fit"
 msgstr "caber"
 
-#: src/ui_common.rs:155
+#: ../src/ui_common.rs:155
 msgid "fill"
 msgstr "llenar"
 
-#: src/ui_common.rs:156 src/ui_common.rs:448
+#: ../src/ui_common.rs:156 ../src/ui_common.rs:448
 msgid "center"
 msgstr "centralizar"
 
-#: src/ui_common.rs:157
+#: ../src/ui_common.rs:157
 msgid "tile"
 msgstr "en loza"
 
-#: src/ui_common.rs:158
+#: ../src/ui_common.rs:158
 msgid "solid_color"
 msgstr "color_solido"
 
-#: src/ui_common.rs:191
+#: ../src/ui_common.rs:191
 msgid "Serialized RGB"
 msgstr "RGB serializado"
 
-#: src/ui_common.rs:213 src/ui_common.rs:447
+#: ../src/ui_common.rs:213 ../src/ui_common.rs:447
 msgid "none"
 msgstr "nulo"
 
-#: src/ui_common.rs:214
+#: ../src/ui_common.rs:214
 msgid "auto-pause"
 msgstr "pausa-automática"
 
-#: src/ui_common.rs:215
+#: ../src/ui_common.rs:215
 msgid "auto-stop"
 msgstr "pare-automático"
 
-#: src/ui_common.rs:228
+#: ../src/ui_common.rs:228
 msgid "Enable slideshow for the current folder."
 msgstr "Comenzar presentación de imágenes en la carpeta actual."
 
-#: src/ui_common.rs:242
+#: ../src/ui_common.rs:242
 msgid "Slideshow change interval"
 msgstr "Intervalo de cambio de presentación de imágenes"
 
-#: src/ui_common.rs:266
+#: ../src/ui_common.rs:263
+msgid "Additional mpv options"
+msgstr "Opciones addicionales para mpv"
+
+#: ../src/ui_common.rs:266
 msgid "Additional command line options to be sent to mpv."
 msgstr "Argumentos adicionales de linea de comando para mpv"
 
-#: src/ui_common.rs:321
+#: ../src/ui_common.rs:321
 msgid "Entered switch callback"
 msgstr "Entre a la llamada del interruptor"
 
-#: src/ui_common.rs:333
+#: ../src/ui_common.rs:333
 msgid "no"
 msgstr "no"
 
-#: src/ui_common.rs:333
+#: ../src/ui_common.rs:333
 msgid "crop"
 msgstr "cortar"
 
-#: src/ui_common.rs:386
+#: ../src/ui_common.rs:386
 msgid "SWWW Advanced Image Settings"
 msgstr "Configuración avanzada para images con SWWW"
 
-#: src/ui_common.rs:394
+#: ../src/ui_common.rs:394
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: src/ui_common.rs:413
+#: ../src/ui_common.rs:413
 msgid "Scalling filter"
 msgstr "Filtro de escalada"
 
-#: src/ui_common.rs:422
+#: ../src/ui_common.rs:422
 msgid "nearest"
 msgstr "mas cerca"
 
-#: src/ui_common.rs:423
+#: ../src/ui_common.rs:423
 msgid "bilinear"
 msgstr "bilinear"
 
-#: src/ui_common.rs:424
+#: ../src/ui_common.rs:424
 msgid "catmullrom"
 msgstr "catmullrom"
 
-#: src/ui_common.rs:425
+#: ../src/ui_common.rs:425
 msgid "mitchell"
 msgstr "mitchell"
 
-#: src/ui_common.rs:426
+#: ../src/ui_common.rs:426
 msgid "lanczos3"
 msgstr "lanczos3"
 
-#: src/ui_common.rs:438
+#: ../src/ui_common.rs:438
 msgid "Transition type"
 msgstr "Tipo de transición"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "simple"
 msgstr "simple"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "fade"
 msgstr "desteñir"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "left"
 msgstr "izquierda"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "right"
 msgstr "derecha"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "top"
 msgstr "tope"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "bottom"
 msgstr "piso"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "wipe"
 msgstr "limpiar"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "wave"
 msgstr "ola"
 
-#: src/ui_common.rs:447
+#: ../src/ui_common.rs:447
 msgid "grow"
 msgstr "crecer"
 
-#: src/ui_common.rs:448
+#: ../src/ui_common.rs:448
 msgid "any"
 msgstr "cualquiera"
 
-#: src/ui_common.rs:448
+#: ../src/ui_common.rs:448
 msgid "outer"
 msgstr "externo"
 
-#: src/ui_common.rs:448
+#: ../src/ui_common.rs:448
 msgid "random"
 msgstr "aleatorio"
 
-#: src/ui_common.rs:481
+#: ../src/ui_common.rs:481
 msgid "Transition step"
 msgstr "Paso de transición"
 
-#: src/ui_common.rs:508
+#: ../src/ui_common.rs:508
 msgid "Transition duration"
 msgstr "Duración de transición"
 
-#: src/ui_common.rs:540
+#: ../src/ui_common.rs:540
 msgid "Transition angle"
 msgstr "Angulo de transición"
 
-#: src/ui_common.rs:586 src/ui_common.rs:596
+#: ../src/ui_common.rs:586 ../src/ui_common.rs:596
 msgid "Transition position"
 msgstr "Posición de transición"
 
-#: src/ui_common.rs:598
+#: ../src/ui_common.rs:598
 msgid ""
 "Can either be floating point number between 0 and 0.99, integer coordinate "
 "like 200,200 or one of the following: center, top, left, right, bottom, top-"
@@ -224,72 +228,77 @@ msgstr ""
 "tal como 200,200 o uno de las siguientes opciones: izquierda, derecha, tope, "
 "piso, tope-izquierdo, tope-derecho, piso-izquierdo, o piso-derecho"
 
-#: src/ui_common.rs:626
+#: ../src/ui_common.rs:626
 msgid "Invert Y"
 msgstr "Invertir eje Y"
 
-#: src/ui_common.rs:636
+#: ../src/ui_common.rs:636
 msgid "Invert y position in transition position flag"
 msgstr "Invertir la posición del eje Y durante la transición."
 
-#: src/ui_common.rs:649
+#: ../src/ui_common.rs:649
 msgid "Transition wave"
 msgstr "Transición en ola."
 
-#: src/ui_common.rs:708
+#: ../src/ui_common.rs:708
 msgid "Transition bezier"
 msgstr "Transición bezier"
 
-#: src/ui_common.rs:778
+#: ../src/ui_common.rs:778
 msgid "Transition FPS"
 msgstr "Cuadros por segundo de la transición"
 
-#: src/ui_common.rs:817
+#: ../src/ui_common.rs:817
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: src/ui_common.rs:827
+#: ../src/ui_common.rs:827
 msgid "Restore Defaults"
 msgstr "Restaurar valores predeterminados"
 
-#: src/ui_common.rs:911
+#: ../src/ui_common.rs:911
 msgid "Selected changer"
 msgstr "Cambiador elegido"
 
-#: src/main.rs:151
+#: ../src/main.rs:163
+#, fuzzy
+msgid "Wallpaper Folder"
+msgstr "Carpeta de imagen"
+
+#: ../src/main.rs:203
 msgid "Image Folder"
 msgid_plural "Images Folder"
 msgstr[0] "Carpeta de imagen"
 msgstr[1] "Carpeta de imágenes"
 
-#: src/main.rs:302
+#: ../src/main.rs:362
 msgid "Saved wallpapers"
 msgstr "Imágenes salvados"
 
-#: src/main.rs:309
+#: ../src/main.rs:370
 msgid "Stored Text"
 msgstr "Text almacenado"
 
-#: src/main.rs:320
+#: ../src/main.rs:399
 msgid "Date"
 msgstr "Fecha"
 
-#: src/main.rs:320
+#: ../src/main.rs:399
 msgid "Name"
 msgstr "Nombre"
 
-#: src/main.rs:332
+#: ../src/main.rs:411
 msgid "Invert Sort"
 msgstr "Invertir ordenamiento"
 
-#: src/main.rs:535
+#: ../src/main.rs:613
 msgid "Images are loading, please wait"
 msgstr "Las imágenes están cargando. Espera, por favor."
 
-#: src/main.rs:565
+#: ../src/main.rs:645
 msgid "Finished loading images"
 msgstr "Las imágenes terminaron de cargar."
 
-#: src/main.rs:570
+#: ../src/main.rs:656
 msgid "Hiding unsupported images"
 msgstr "Escondiendo imágenes que no son compatibles."
diff --git a/locales/waypaper.pot b/locales/waypaper.pot
deleted file mode 100644
index b5aa87d..0000000
--- a/locales/waypaper.pot
+++ /dev/null
@@ -1,288 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-08 23:34+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/common.rs:71 src/common.rs:71
-msgid "Failed to create thumbnail for"
-msgstr ""
-
-#: src/common.rs:94 src/common.rs:94
-msgid "Thumbnail could not be generated using ffmpg."
-msgstr ""
-
-#: src/common.rs:147 src/common.rs:147
-msgid "Invalid string"
-msgstr ""
-
-#: src/database.rs:63 src/database.rs:63
-msgid "Cache Hit"
-msgstr ""
-
-#: src/database.rs:69 src/database.rs:69
-msgid "Cache Miss"
-msgstr ""
-
-#: src/database.rs:77 src/database.rs:77
-msgid "GTK Picture created successfully."
-msgstr ""
-
-#: src/database.rs:87 src/database.rs:87
-msgid "File could not be converted to a GTK Picture"
-msgstr ""
-
-#: src/ui_common.rs:42 src/ui_common.rs:93 src/ui_common.rs:97 src/ui_common.rs:102 src/ui_common.rs:42 src/ui_common.rs:93 src/ui_common.rs:97 src/ui_common.rs:102
-msgid "The channel must be open"
-msgstr ""
-
-#: src/ui_common.rs:153 src/ui_common.rs:153
-msgid "stretch"
-msgstr ""
-
-#: src/ui_common.rs:154 src/ui_common.rs:333 src/ui_common.rs:154 src/ui_common.rs:333
-msgid "fit"
-msgstr ""
-
-#: src/ui_common.rs:155 src/ui_common.rs:155
-msgid "fill"
-msgstr ""
-
-#: src/ui_common.rs:156 src/ui_common.rs:448 src/ui_common.rs:156 src/ui_common.rs:448
-msgid "center"
-msgstr ""
-
-#: src/ui_common.rs:157 src/ui_common.rs:157
-msgid "tile"
-msgstr ""
-
-#: src/ui_common.rs:158 src/ui_common.rs:158
-msgid "solid_color"
-msgstr ""
-
-#: src/ui_common.rs:191 src/ui_common.rs:191
-msgid "Serialized RGB"
-msgstr ""
-
-#: src/ui_common.rs:213 src/ui_common.rs:447 src/ui_common.rs:213 src/ui_common.rs:447
-msgid "none"
-msgstr ""
-
-#: src/ui_common.rs:214 src/ui_common.rs:214
-msgid "auto-pause"
-msgstr ""
-
-#: src/ui_common.rs:215 src/ui_common.rs:215
-msgid "auto-stop"
-msgstr ""
-
-#: src/ui_common.rs:228 src/ui_common.rs:228
-msgid "Enable slideshow for the current folder."
-msgstr ""
-
-#: src/ui_common.rs:242 src/ui_common.rs:242
-msgid "Slideshow change interval"
-msgstr ""
-
-#: src/ui_common.rs:266 src/ui_common.rs:266
-msgid "Additional command line options to be sent to mpv."
-msgstr ""
-
-#: src/ui_common.rs:321 src/ui_common.rs:321
-msgid "Entered switch callback"
-msgstr ""
-
-#: src/ui_common.rs:333 src/ui_common.rs:333
-msgid "no"
-msgstr ""
-
-#: src/ui_common.rs:333 src/ui_common.rs:333
-msgid "crop"
-msgstr ""
-
-#: src/ui_common.rs:386 src/ui_common.rs:386
-msgid "SWWW Advanced Image Settings"
-msgstr ""
-
-#: src/ui_common.rs:394 src/ui_common.rs:394
-msgid "Advanced Settings"
-msgstr ""
-
-#: src/ui_common.rs:413 src/ui_common.rs:413
-msgid "Scalling filter"
-msgstr ""
-
-#: src/ui_common.rs:422 src/ui_common.rs:422
-msgid "nearest"
-msgstr ""
-
-#: src/ui_common.rs:423 src/ui_common.rs:423
-msgid "bilinear"
-msgstr ""
-
-#: src/ui_common.rs:424 src/ui_common.rs:424
-msgid "catmullrom"
-msgstr ""
-
-#: src/ui_common.rs:425 src/ui_common.rs:425
-msgid "mitchell"
-msgstr ""
-
-#: src/ui_common.rs:426 src/ui_common.rs:426
-msgid "lanczos3"
-msgstr ""
-
-#: src/ui_common.rs:438 src/ui_common.rs:438
-msgid "Transition type"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "simple"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "fade"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "left"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "right"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "top"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "bottom"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "wipe"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "wave"
-msgstr ""
-
-#: src/ui_common.rs:447 src/ui_common.rs:447
-msgid "grow"
-msgstr ""
-
-#: src/ui_common.rs:448 src/ui_common.rs:448
-msgid "any"
-msgstr ""
-
-#: src/ui_common.rs:448 src/ui_common.rs:448
-msgid "outer"
-msgstr ""
-
-#: src/ui_common.rs:448 src/ui_common.rs:448
-msgid "random"
-msgstr ""
-
-#: src/ui_common.rs:481 src/ui_common.rs:481
-msgid "Transition step"
-msgstr ""
-
-#: src/ui_common.rs:508 src/ui_common.rs:508
-msgid "Transition duration"
-msgstr ""
-
-#: src/ui_common.rs:540 src/ui_common.rs:540
-msgid "Transition angle"
-msgstr ""
-
-#: src/ui_common.rs:586 src/ui_common.rs:596 src/ui_common.rs:586 src/ui_common.rs:596
-msgid "Transition position"
-msgstr ""
-
-#: src/ui_common.rs:598 src/ui_common.rs:598
-msgid "Can either be floating point number between 0 and 0.99, integer coordinate like 200,200 or one of the following: center, top, left, right, bottom, top-left, top-right, bottom-left or bottom-right."
-msgstr ""
-
-#: src/ui_common.rs:626 src/ui_common.rs:626
-msgid "Invert Y"
-msgstr ""
-
-#: src/ui_common.rs:636 src/ui_common.rs:636
-msgid "Invert y position in transition position flag"
-msgstr ""
-
-#: src/ui_common.rs:649 src/ui_common.rs:649
-msgid "Transition wave"
-msgstr ""
-
-#: src/ui_common.rs:708 src/ui_common.rs:708
-msgid "Transition bezier"
-msgstr ""
-
-#: src/ui_common.rs:778 src/ui_common.rs:778
-msgid "Transition FPS"
-msgstr ""
-
-#: src/ui_common.rs:817 src/ui_common.rs:817
-msgid "Confirm"
-msgstr ""
-
-#: src/ui_common.rs:827 src/ui_common.rs:827
-msgid "Restore Defaults"
-msgstr ""
-
-#: src/ui_common.rs:911 src/ui_common.rs:911
-msgid "Selected changer"
-msgstr ""
-
-#: src/main.rs:151
-msgid "Image Folder"
-msgid_plural "Images Folder"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/main.rs:302
-msgid "Saved wallpapers"
-msgstr ""
-
-#: src/main.rs:309
-msgid "Stored Text"
-msgstr ""
-
-#: src/main.rs:320
-msgid "Date"
-msgstr ""
-
-#: src/main.rs:320
-msgid "Name"
-msgstr ""
-
-#: src/main.rs:332
-msgid "Invert Sort"
-msgstr ""
-
-#: src/main.rs:535
-msgid "Images are loading, please wait"
-msgstr ""
-
-#: src/main.rs:565
-msgid "Finished loading images"
-msgstr ""
-
-#: src/main.rs:570
-msgid "Hiding unsupported images"
-msgstr ""
diff --git a/locales/waytrogen.pot b/locales/waytrogen.pot
new file mode 100644
index 0000000..a52b046
--- /dev/null
+++ b/locales/waytrogen.pot
@@ -0,0 +1,296 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-01-23 18:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/common.rs:74 ../src/common.rs:74
+msgid "Failed to create thumbnail for"
+msgstr ""
+
+#: ../src/common.rs:97 ../src/common.rs:97
+msgid "Thumbnail could not be generated using ffmpg."
+msgstr ""
+
+#: ../src/common.rs:150 ../src/common.rs:150
+msgid "Invalid string"
+msgstr ""
+
+#: ../src/database.rs:63 ../src/database.rs:63
+msgid "Cache Hit"
+msgstr ""
+
+#: ../src/database.rs:69 ../src/database.rs:69
+msgid "Cache Miss"
+msgstr ""
+
+#: ../src/database.rs:77 ../src/database.rs:77
+msgid "GTK Picture created successfully."
+msgstr ""
+
+#: ../src/database.rs:87 ../src/database.rs:87
+msgid "File could not be converted to a GTK Picture"
+msgstr ""
+
+#: ../src/ui_common.rs:42 ../src/ui_common.rs:93 ../src/ui_common.rs:97 ../src/ui_common.rs:102 ../src/ui_common.rs:42 ../src/ui_common.rs:93 ../src/ui_common.rs:97 ../src/ui_common.rs:102
+msgid "The channel must be open"
+msgstr ""
+
+#: ../src/ui_common.rs:153 ../src/ui_common.rs:153
+msgid "stretch"
+msgstr ""
+
+#: ../src/ui_common.rs:154 ../src/ui_common.rs:333 ../src/ui_common.rs:154 ../src/ui_common.rs:333
+msgid "fit"
+msgstr ""
+
+#: ../src/ui_common.rs:155 ../src/ui_common.rs:155
+msgid "fill"
+msgstr ""
+
+#: ../src/ui_common.rs:156 ../src/ui_common.rs:448 ../src/ui_common.rs:156 ../src/ui_common.rs:448
+msgid "center"
+msgstr ""
+
+#: ../src/ui_common.rs:157 ../src/ui_common.rs:157
+msgid "tile"
+msgstr ""
+
+#: ../src/ui_common.rs:158 ../src/ui_common.rs:158
+msgid "solid_color"
+msgstr ""
+
+#: ../src/ui_common.rs:191 ../src/ui_common.rs:191
+msgid "Serialized RGB"
+msgstr ""
+
+#: ../src/ui_common.rs:213 ../src/ui_common.rs:447 ../src/ui_common.rs:213 ../src/ui_common.rs:447
+msgid "none"
+msgstr ""
+
+#: ../src/ui_common.rs:214 ../src/ui_common.rs:214
+msgid "auto-pause"
+msgstr ""
+
+#: ../src/ui_common.rs:215 ../src/ui_common.rs:215
+msgid "auto-stop"
+msgstr ""
+
+#: ../src/ui_common.rs:228 ../src/ui_common.rs:228
+msgid "Enable slideshow for the current folder."
+msgstr ""
+
+#: ../src/ui_common.rs:242 ../src/ui_common.rs:242
+msgid "Slideshow change interval"
+msgstr ""
+
+#: ../src/ui_common.rs:263 ../src/ui_common.rs:263
+msgid "Additional mpv options"
+msgstr ""
+
+#: ../src/ui_common.rs:266 ../src/ui_common.rs:266
+msgid "Additional command line options to be sent to mpv."
+msgstr ""
+
+#: ../src/ui_common.rs:321 ../src/ui_common.rs:321
+msgid "Entered switch callback"
+msgstr ""
+
+#: ../src/ui_common.rs:333 ../src/ui_common.rs:333
+msgid "no"
+msgstr ""
+
+#: ../src/ui_common.rs:333 ../src/ui_common.rs:333
+msgid "crop"
+msgstr ""
+
+#: ../src/ui_common.rs:386 ../src/ui_common.rs:386
+msgid "SWWW Advanced Image Settings"
+msgstr ""
+
+#: ../src/ui_common.rs:394 ../src/ui_common.rs:394
+msgid "Advanced Settings"
+msgstr ""
+
+#: ../src/ui_common.rs:413 ../src/ui_common.rs:413
+msgid "Scalling filter"
+msgstr ""
+
+#: ../src/ui_common.rs:422 ../src/ui_common.rs:422
+msgid "nearest"
+msgstr ""
+
+#: ../src/ui_common.rs:423 ../src/ui_common.rs:423
+msgid "bilinear"
+msgstr ""
+
+#: ../src/ui_common.rs:424 ../src/ui_common.rs:424
+msgid "catmullrom"
+msgstr ""
+
+#: ../src/ui_common.rs:425 ../src/ui_common.rs:425
+msgid "mitchell"
+msgstr ""
+
+#: ../src/ui_common.rs:426 ../src/ui_common.rs:426
+msgid "lanczos3"
+msgstr ""
+
+#: ../src/ui_common.rs:438 ../src/ui_common.rs:438
+msgid "Transition type"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "simple"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "fade"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "left"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "right"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "top"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "bottom"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "wipe"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "wave"
+msgstr ""
+
+#: ../src/ui_common.rs:447 ../src/ui_common.rs:447
+msgid "grow"
+msgstr ""
+
+#: ../src/ui_common.rs:448 ../src/ui_common.rs:448
+msgid "any"
+msgstr ""
+
+#: ../src/ui_common.rs:448 ../src/ui_common.rs:448
+msgid "outer"
+msgstr ""
+
+#: ../src/ui_common.rs:448 ../src/ui_common.rs:448
+msgid "random"
+msgstr ""
+
+#: ../src/ui_common.rs:481 ../src/ui_common.rs:481
+msgid "Transition step"
+msgstr ""
+
+#: ../src/ui_common.rs:508 ../src/ui_common.rs:508
+msgid "Transition duration"
+msgstr ""
+
+#: ../src/ui_common.rs:540 ../src/ui_common.rs:540
+msgid "Transition angle"
+msgstr ""
+
+#: ../src/ui_common.rs:586 ../src/ui_common.rs:596 ../src/ui_common.rs:586 ../src/ui_common.rs:596
+msgid "Transition position"
+msgstr ""
+
+#: ../src/ui_common.rs:598 ../src/ui_common.rs:598
+msgid "Can either be floating point number between 0 and 0.99, integer coordinate like 200,200 or one of the following: center, top, left, right, bottom, top-left, top-right, bottom-left or bottom-right."
+msgstr ""
+
+#: ../src/ui_common.rs:626 ../src/ui_common.rs:626
+msgid "Invert Y"
+msgstr ""
+
+#: ../src/ui_common.rs:636 ../src/ui_common.rs:636
+msgid "Invert y position in transition position flag"
+msgstr ""
+
+#: ../src/ui_common.rs:649 ../src/ui_common.rs:649
+msgid "Transition wave"
+msgstr ""
+
+#: ../src/ui_common.rs:708 ../src/ui_common.rs:708
+msgid "Transition bezier"
+msgstr ""
+
+#: ../src/ui_common.rs:778 ../src/ui_common.rs:778
+msgid "Transition FPS"
+msgstr ""
+
+#: ../src/ui_common.rs:817 ../src/ui_common.rs:817
+msgid "Confirm"
+msgstr ""
+
+#: ../src/ui_common.rs:827 ../src/ui_common.rs:827
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../src/ui_common.rs:911 ../src/ui_common.rs:911
+msgid "Selected changer"
+msgstr ""
+
+#: ../src/main.rs:163
+msgid "Wallpaper Folder"
+msgstr ""
+
+#: ../src/main.rs:203
+msgid "Image Folder"
+msgid_plural "Images Folder"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/main.rs:362
+msgid "Saved wallpapers"
+msgstr ""
+
+#: ../src/main.rs:370
+msgid "Stored Text"
+msgstr ""
+
+#: ../src/main.rs:399
+msgid "Date"
+msgstr ""
+
+#: ../src/main.rs:399
+msgid "Name"
+msgstr ""
+
+#: ../src/main.rs:411
+msgid "Invert Sort"
+msgstr ""
+
+#: ../src/main.rs:613
+msgid "Images are loading, please wait"
+msgstr ""
+
+#: ../src/main.rs:645
+msgid "Finished loading images"
+msgstr ""
+
+#: ../src/main.rs:656
+msgid "Hiding unsupported images"
+msgstr ""
diff --git a/src/main.rs b/src/main.rs
index 3ee9532..ee6c4fb 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -160,7 +160,7 @@ fn build_ui(app: &Application, args: Cli) {
         )
         .to_string();
 
-    log::trace!("Wallpaper Folder: {}", path);
+    log::trace!("{}: {}", gettext("Wallpaper Folder"), path);
 
     let (sender_cache_images, receiver_cache_images): (
         Sender<CacheImageFile>,
diff --git a/src/ui_common.rs b/src/ui_common.rs
index 724ed64..54d5025 100644
--- a/src/ui_common.rs
+++ b/src/ui_common.rs
@@ -260,7 +260,7 @@ pub fn generate_changer_bar(
                 .bind("mpvpaper-slideshow-interval", &spin_button, "value")
                 .build();
             let mpv_options = Entry::builder()
-                .placeholder_text("Additional mpv options")
+                .placeholder_text(gettext("Additional mpv options"))
                 .has_tooltip(true)
                 .tooltip_text(gettext(
                     "Additional command line options to be sent to mpv.",