diff --git a/options.css b/options.css
index c66f359..fcec8af 100644
--- a/options.css
+++ b/options.css
@@ -12,45 +12,47 @@ html {
 
 }
 
-@media (prefers-color-scheme: dark) {
-
-	body {
-		background: #222;
-	}
-
-}
-
 body {
-	color: #000;
+	color: #fff;
 	font-size: 14px;
 }
 
 .ui-button {
-	background: #eee;
-	color: #333;
-	border: 1px solid #888;
+	background: #34d46a;
+	color: #000;
+	border: none;
+	border-radius: 50px;
+	padding:8px 15px;
+	animation-name: ui-button-unhover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-button:focus {
-	background: #eee;
-	border: 1px solid #888;
+	background: #34d46a;
+	border:none;
 }
 
 .ui-button:hover {
-	background: #ddd;
-	border: 1px solid #888;
+	background: #8cff6f;
+	border:none;
+	animation-name: ui-button-hover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-widget button {
-	padding: 2px 8px;
-	background: #eee;
+	background: #ccc;
 	color: #333;
-	border: 1px solid #888;
-	border-radius: 3px;
+	border: none;
+	padding:8px 12px;
+	border-radius:50px;
+	animation-name: widget-unhover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-widget button:hover:enabled {
 	background: #ddd;
+	animation-name: widget-hover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-widget button:active:enabled {
@@ -60,13 +62,19 @@ body {
 .ui-widget button:disabled {
 	background: #eee;
 	color: #666;
-	border: 1px solid #ccc;
+	border: none;
 }
 
 .ui-widget fieldset, .ui-widget input, .ui-widget select, .ui-widget textarea {
-	background: #fff;
 	color: #000;
-	border: 1px solid #888;
+	border: 1px #aaa solid;
+	border-radius:15px;
+	padding: 8px 10px;
+	margin: 10px 0px;
+}
+
+.ui-widget input, .ui-widget select {
+	background-color:white;
 }
 
 .ui-widget input:disabled, .ui-widget select:disabled, .ui-widget textarea:disabled {
@@ -100,12 +108,55 @@ body {
 .ui-widget th, .ui-widget td {
 	text-align: center;
 	padding: 4px 12px;
+	border: none;
 }
 
 .ui-widget code {
 	font: normal 14px monospace;
 }
 
+.ui-widget-header {
+	background: #fff;
+	color: #333;
+	border: none;
+}
+
+.ui-widget-content {
+	background: #eee;
+	color: #000;
+	border: none;
+}
+
+.ui-widget.ui-widget-content {
+	border: none;
+}
+
+.ui-tabs .ui-state-default {
+	background: #ccc;
+	border: none;
+	border-radius: 15px 15px 0px 0px;
+	padding-top: 3px !important;
+}
+
+.ui-tabs .ui-state-default a {
+	color: #333;
+}
+
+.ui-tabs .ui-state-hover {
+	background: #ddd;
+	border: none;
+	animation-name: tab-hover;
+  	animation-duration: 0.2s;
+}
+
+.ui-tabs .ui-state-active {
+	background: #eee;
+	border: none;
+	animation-name: tab-select;
+  	animation-duration: 0.2s;
+}
+
+
 .logo {
 	width: 408px;
 }
@@ -153,3 +204,38 @@ body {
 #results {
 	font: normal 12px monospace;
 }
+
+@keyframes ui-button-hover {
+  	from {background-color: #34d46a;}
+  	to {background-color: #8cff6f;}
+}
+
+@keyframes ui-button-unhover {
+  	from {background-color: #8cff6f;}
+  	to {background-color: #34d46a;}
+}
+
+@keyframes widget-hover {
+	from {background-color: #ccc;}
+	to {background-color: #ddd;}
+}
+
+@keyframes widget-unhover {
+	from {background-color: #ddd;}
+	to {background-color: #ccc;}
+}
+
+@keyframes tab-select {
+  	from {background-color: #ccc;}
+  	to {background-color: #eee;}
+}
+
+@keyframes tab-hover {
+  	from {background-color: #ccc;}
+  	to {background-color: #ddd;}
+}
+
+@keyframes tab-unhover {
+  	from {background-color: #ddd;}
+  	to {background-color: #ccc;}
+}
diff --git a/popup.css b/popup.css
index 12ae4ae..461d874 100644
--- a/popup.css
+++ b/popup.css
@@ -17,7 +17,7 @@
 }
 
 body {
-	color: #000;
+	color: #fff;
 	font-size: 14px;
 	text-align: center;
 }
@@ -28,17 +28,20 @@ body {
 }
 
 button {
-	display: inline;
-	width: 100%;
-	margin: 2px;
-	padding: 2px;
 	background: #eee;
-	border: 1px solid #888;
-	border-radius: 6px;
+	color: #333;
+	border: none;
+	padding:8px 12px;
+	margin: 2px 0px;
+	border-radius:50px;
+	animation-name: button-unhover;
+ 	animation-duration: 0.2s;
 }
 
 button:hover:enabled {
 	background: #ddd;
+	animation: button-hover;
+	animation-duration: 0.2s;
 }
 
 button:active:enabled {
@@ -48,3 +51,13 @@ button:active:enabled {
 .logo {
 	width: 204px;
 }
+
+@keyframes button-hover {
+  	from {background-color: #eee;}
+  	to {background-color: #ddd;}
+}
+
+@keyframes button-unhover {
+  	from {background-color: #ddd;}
+  	to {background-color: #eee;}
+}
\ No newline at end of file
diff --git a/style.css b/style.css
index 8c557d0..a7f4f2f 100644
--- a/style.css
+++ b/style.css
@@ -11,13 +11,14 @@
 @media (prefers-color-scheme: dark) {
 
 	body {
-		background: #222;
+		background: #000;
 	}
 
 }
 
 body {
-	color: #2e3436;
+	padding:30px 0px;
+	color: #000;
 	font: normal 16px "Open Sans", Arial, sans-serif;
 	text-align: center;
 }
@@ -44,28 +45,55 @@ blockquote {
 	font-weight: bold;
 }
 
-input, button {
-	color: #333;
-	font: normal 16px "Open Sans", Arial, sans-serif;
-	padding: 2px 8px;
-	border: 1px solid #888;
-	border-radius: 6px;
+input {
+	background: #fff;
+	color: #000;
+	border: 1px #aaa solid;
+	border-radius:15px;
+	padding: 8px 10px;
+	margin: 10px 0px;
 }
 
 button {
 	background: #eee;
+	color: #333;
+	border: none;
+	padding:6px 12px;
+	margin: 2px 0px;
+	border-radius:50px;
+	animation-name: button-unhover;
+ 	animation-duration: 0.2s;
 }
 
 button:hover:enabled {
 	background: #ddd;
+	animation: button-hover;
+	animation-duration: 0.2s;
 }
 
 button:active:enabled {
 	background: #ccc;
 }
 
+@keyframes button-hover {
+  	from {background-color: #eee;}
+  	to {background-color: #ddd;}
+}
+
+@keyframes button-unhover {
+  	from {background-color: #ddd;}
+  	to {background-color: #eee;}
+}
+
 .logo {
-	width: 408px;
+	width:408px;
+	animation: leechblock;
+	animation-duration: 1s;
+}
+
+@keyframes leechblock {
+  	from {width:100%;}
+  	to {width:408px;}
 }
 
 .keyword {
diff --git a/themes/dark.css b/themes/dark.css
index 8838e9e..b2088c9 100644
--- a/themes/dark.css
+++ b/themes/dark.css
@@ -1,58 +1,68 @@
-/* LeechBlock Dark theme style */
+/* LeechBlock Modern theme style */
 
 body {
-	background: #222;
-	color: #bbb;
+	background: #111;
+	color: #eee;
 }
 
 .ui-button {
-	background: #444;
-	color: #bbb;
-	border: 1px solid #666;
+	background: #253;
+	color: #eee;
+	border: none;
+	border-radius: 50px;
+	padding:8px 15px;
+	animation-name: ui-button-unhover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-button:focus {
-	background: #444;
-	color: #bbb;
-	border: 1px solid #666;
+	background: #253;
+	color: #eee;
 }
 
 .ui-button:hover {
-	background: #333;
-	color: #bbb;
-	border: 1px solid #666;
+	background: #142;
+	color: #eee;
+	animation-name: ui-button-hover;
+ 	animation-duration: 0.2s;
 }
 
-.ui-widget button {
+.ui-widget button, input[type="file"]::file-selector-button{
 	background: #444;
-	color: #bbb;
-	border: 1px solid #666;
+	color: #eee;
+	animation-name: widget-unhover;
+ 	animation-duration: 0.2s;
 }
 
-.ui-widget button:hover:enabled {
+.ui-widget button:hover:enabled, input[type="file"]::file-selector-button:hover{
 	background: #333;
+	animation-name: widget-hover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-widget button:active:enabled {
-	background: #222;
+	background: #444;
 }
 
 .ui-widget button:disabled {
 	background: #333;
 	color: #666;
-	border: 1px solid #444;
+	border: none;
 }
 
 .ui-widget fieldset, .ui-widget input, .ui-widget select, .ui-widget textarea {
 	background: #222;
-	color: #bbb;
-	border: 1px solid #666;
+	color: #eee;
+	border: 1px #555 solid;
+	border-radius:15px;
+	padding: 8px 10px;
+	margin: 10px 0px;
 }
 
 .ui-widget input:disabled, .ui-widget select:disabled, .ui-widget textarea:disabled {
 	background: #333;
 	color: #666;
-	border: 1px solid #444;
+	border: 1px #555 solid;
 }
 
 .ui-widget hr {
@@ -61,52 +71,91 @@ body {
 	border-top: none;
 	border-left: none;
 	border-right: none;
-	border-bottom: 1px solid #666;
-}
-
-.ui-widget th, td {
-	border: 1px solid #666;
+	border-bottom: 1px solid #555;
 }
 
 .ui-widget-header {
 	background: #444;
-	color: #bbb;
-	border: 1px solid #888;
+	color: #eee;
+	border: none;
 }
 
 .ui-widget-content {
 	background: #222;
-	color: #bbb;
-	border: 1px solid #888;
+	color: #eee;
+	border: none;
 }
 
 .ui-widget.ui-widget-content {
-	border: 1px solid #888;
+	border: none;
 }
 
 .ui-tabs .ui-state-default {
-	background: #aaa;
-	border: 1px solid #666;
+	background: #333;
+	border: none;
+	border-radius: 15px 15px 0px 0px;
+	padding-top: 3px !important;
 }
 
 .ui-tabs .ui-state-default a {
-	color: #000;
+	color: #eee;
 }
 
 .ui-tabs .ui-state-hover {
-	background: #999;
-	border: 1px solid #666;
+	background: #777;
+	border: none;
+	animation-name: tab-hover;
+  	animation-duration: 0.2s;
 }
 
 .ui-tabs .ui-state-active {
 	background: #222;
-	border: 1px solid #666;
+	border: none;
+	animation-name: tab-select;
+  	animation-duration: 0.2s;
 }
 
 .ui-tabs .ui-state-active a {
-	color: #bbb;
+	color: #eee;
 }
 
 #paneAbout {
-	color: #bbb;
+	color: #eee;
+}
+
+/* Animations */
+
+@keyframes ui-button-hover {
+  	from {background-color: #253;}
+  	to {background-color: #142;}
 }
+
+@keyframes ui-button-unhover {
+  	from {background-color: #142;}
+  	to {background-color: #253;}
+}
+
+@keyframes widget-hover {
+	from {background-color: #444;}
+	to {background-color: #333;}
+}
+
+@keyframes widget-unhover {
+	from {background-color: #333;}
+	to {background-color: #444;}
+}
+
+@keyframes tab-select {
+  	from {background-color: #333;}
+  	to {background-color: #222;}
+}
+
+@keyframes tab-hover {
+  	from {background-color: #333;}
+  	to {background-color: #777;}
+}
+
+@keyframes tab-unhover {
+  	from {background-color: #777;}
+  	to {background-color: #333;}
+}
\ No newline at end of file
diff --git a/themes/default.css b/themes/default.css
index 87d064d..828dc1b 100644
--- a/themes/default.css
+++ b/themes/default.css
@@ -5,58 +5,73 @@
 /* The following should replicate the Dark theme style */
 
 body {
-	background: #222;
-	color: #bbb;
+	background: #111;
+	color: #eee;
 }
 
 .ui-button {
-	background: #444;
-	color: #bbb;
-	border: 1px solid #666;
+	background: #253;
+	color: #eee;
+	border: none;
+	border-radius: 50px;
+	padding:8px 15px;
+	animation-name: ui-button-unhover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-button:focus {
-	background: #444;
-	color: #bbb;
-	border: 1px solid #666;
+	background: #253;
+	color: #eee;
+	border: none;
 }
 
 .ui-button:hover {
-	background: #333;
-	color: #bbb;
-	border: 1px solid #666;
+	background: #142;
+	color: #eee;
+	border: none;
+	animation-name: ui-button-hover;
+ 	animation-duration: 0.2s;
 }
 
-.ui-widget button {
+.ui-widget button, input[type="file"]::file-selector-button{
 	background: #444;
-	color: #bbb;
-	border: 1px solid #666;
+	color: #eee;
+	border: none;
+	padding:8px 12px;
+	border-radius:50px;
+	animation-name: widget-unhover;
+ 	animation-duration: 0.2s;
 }
 
-.ui-widget button:hover:enabled {
+.ui-widget button:hover:enabled, input[type="file"]::file-selector-button:hover{
 	background: #333;
+	animation-name: widget-hover;
+ 	animation-duration: 0.2s;
 }
 
 .ui-widget button:active:enabled {
-	background: #222;
+	background: #444;
 }
 
 .ui-widget button:disabled {
 	background: #333;
 	color: #666;
-	border: 1px solid #444;
+	border: none;
 }
 
 .ui-widget fieldset, .ui-widget input, .ui-widget select, .ui-widget textarea {
 	background: #222;
-	color: #bbb;
-	border: 1px solid #666;
+	color: #eee;
+	border: 1px #555 solid;
+	border-radius:15px;
+	padding: 8px 10px;
+	margin: 10px 0px;
 }
 
 .ui-widget input:disabled, .ui-widget select:disabled, .ui-widget textarea:disabled {
 	background: #333;
 	color: #666;
-	border: 1px solid #444;
+	border: 1px #555 solid;
 }
 
 .ui-widget hr {
@@ -65,54 +80,96 @@ body {
 	border-top: none;
 	border-left: none;
 	border-right: none;
-	border-bottom: 1px solid #666;
+	border-bottom: none;
 }
 
 .ui-widget th, td {
-	border: 1px solid #666;
+	border: none;
 }
 
 .ui-widget-header {
 	background: #444;
-	color: #bbb;
-	border: 1px solid #888;
+	color: #eee;
+	border: none;
 }
 
 .ui-widget-content {
 	background: #222;
-	color: #bbb;
-	border: 1px solid #888;
+	color: #eee;
+	border: none;
 }
 
 .ui-widget.ui-widget-content {
-	border: 1px solid #888;
+	border: none;
 }
 
 .ui-tabs .ui-state-default {
-	background: #aaa;
-	border: 1px solid #666;
+	background: #333;
+	border: none;
+	border-radius: 15px 15px 0px 0px;
+	padding-top: 3px !important;
 }
 
 .ui-tabs .ui-state-default a {
-	color: #000;
+	color: #eee;
 }
 
 .ui-tabs .ui-state-hover {
-	background: #999;
-	border: 1px solid #666;
+	background: #777;
+	border: none;
+	animation-name: tab-hover;
+  	animation-duration: 0.2s;
 }
 
 .ui-tabs .ui-state-active {
 	background: #222;
-	border: 1px solid #666;
+	border: none;
+	animation-name: tab-select;
+  	animation-duration: 0.2s;
 }
 
 .ui-tabs .ui-state-active a {
-	color: #bbb;
+	color: #eee;
 }
 
 #paneAbout {
-	color: #bbb;
+	color: #eee;
 }
 
+/* Animations */
+
+@keyframes ui-button-hover {
+  	from {background-color: #253;}
+  	to {background-color: #142;}
+}
+
+@keyframes ui-button-unhover {
+  	from {background-color: #142;}
+  	to {background-color: #253;}
+}
+
+@keyframes widget-hover {
+	from {background-color: #444;}
+	to {background-color: #333;}
+}
+
+@keyframes widget-unhover {
+	from {background-color: #333;}
+	to {background-color: #444;}
+}
+
+@keyframes tab-select {
+  	from {background-color: #333;}
+  	to {background-color: #222;}
+}
+
+@keyframes tab-hover {
+  	from {background-color: #333;}
+  	to {background-color: #777;}
+}
+
+@keyframes tab-unhover {
+  	from {background-color: #777;}
+  	to {background-color: #333;}
+}
 }