15 files changed, 81 insertions, 30 deletions
diff --git a/client/menu/theme/font-azaret-mono.woff2 b/client/menu/theme/fonts/font-azaret-mono.woff2
index c413b182..c413b182 100644
--- a/client/menu/theme/font-azaret-mono.woff2
+++ b/client/menu/theme/fonts/font-azaret-mono.woff2
diff --git a/client/menu/theme/font-azaret-mono.woff2.import b/client/menu/theme/fonts/font-azaret-mono.woff2.import
index cafe1fbd..20a14c40 100644
--- a/client/menu/theme/font-azaret-mono.woff2.import
+++ b/client/menu/theme/fonts/font-azaret-mono.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://bk704sc5gkrb3"
-path="res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e5bff930be6.fontdata"
+path="res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata"
 
 [deps]
 
-source_file="res://menu/theme/font-azaret-mono.woff2"
-dest_files=["res://.godot/imported/font-azaret-mono.woff2-38a6d727215392526b2e0e5bff930be6.fontdata"]
+source_file="res://menu/theme/fonts/font-azaret-mono.woff2"
+dest_files=["res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata"]
 
 [params]
 
diff --git a/client/menu/theme/font-josefin-sans.woff2 b/client/menu/theme/fonts/font-josefin-sans.woff2
index dce2708f..dce2708f 100644
--- a/client/menu/theme/font-josefin-sans.woff2
+++ b/client/menu/theme/fonts/font-josefin-sans.woff2
diff --git a/client/menu/theme/font-josefin-sans.woff2.import b/client/menu/theme/fonts/font-josefin-sans.woff2.import
index 03e086da..8334a70e 100644
--- a/client/menu/theme/font-josefin-sans.woff2.import
+++ b/client/menu/theme/fonts/font-josefin-sans.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://5ixo6b3bd3km"
-path="res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"
+path="res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata"
 
 [deps]
 
-source_file="res://menu/theme/font-josefin-sans.woff2"
-dest_files=["res://.godot/imported/font-josefin-sans.woff2-e2c3f263d98e1132cfe6af3f4f0a3454.fontdata"]
+source_file="res://menu/theme/fonts/font-josefin-sans.woff2"
+dest_files=["res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata"]
 
 [params]
 
diff --git a/client/menu/theme/font-sansita-swashed.woff2 b/client/menu/theme/fonts/font-sansita-swashed.woff2
index 5c665fb0..5c665fb0 100644
--- a/client/menu/theme/font-sansita-swashed.woff2
+++ b/client/menu/theme/fonts/font-sansita-swashed.woff2
diff --git a/client/menu/theme/font-sansita-swashed.woff2.import b/client/menu/theme/fonts/font-sansita-swashed.woff2.import
index 2d38716d..d35f5ae1 100644
--- a/client/menu/theme/font-sansita-swashed.woff2.import
+++ b/client/menu/theme/fonts/font-sansita-swashed.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://bo4vh5xkpvrh1"
-path="res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"
+path="res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata"
 
 [deps]
 
-source_file="res://menu/theme/font-sansita-swashed.woff2"
-dest_files=["res://.godot/imported/font-sansita-swashed.woff2-323b4a2ee0671aba6e17a6f073f706f3.fontdata"]
+source_file="res://menu/theme/fonts/font-sansita-swashed.woff2"
+dest_files=["res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata"]
 
 [params]
 
diff --git a/client/menu/theme/blur_material.tres b/client/menu/theme/materials/blur_material.tres
index c035d230..035351c5 100644
--- a/client/menu/theme/blur_material.tres
+++ b/client/menu/theme/materials/blur_material.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://2j8a0c0a2ta5"]
 
-[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_d16rd"]
+[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_d16rd"]
 
 [resource]
 shader = ExtResource("1_d16rd")
diff --git a/client/menu/theme/dark_blur_material.tres b/client/menu/theme/materials/dark_blur_material.tres
index daf74099..cee1aeca 100644
--- a/client/menu/theme/dark_blur_material.tres
+++ b/client/menu/theme/materials/dark_blur_material.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://beea1pc5nt67r"]
 
-[ext_resource type="Shader" path="res://menu/blur_mix.gdshader" id="1_cynu0"]
+[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_cynu0"]
 
 [resource]
 shader = ExtResource("1_cynu0")
diff --git a/client/menu/theme/materials/grayscale_material.tres b/client/menu/theme/materials/grayscale_material.tres
new file mode 100644
index 00000000..065356e5
--- /dev/null
+++ b/client/menu/theme/materials/grayscale_material.tres
@@ -0,0 +1,6 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bplhkekj6rebp"]
+
+[ext_resource type="Shader" path="res://menu/theme/shaders/grayscale.gdshader" id="1_u0c2c"]
+
+[resource]
+shader = ExtResource("1_u0c2c")
diff --git a/client/menu/theme/paper_texture.tres b/client/menu/theme/paper_texture.tres
deleted file mode 100644
index 2c681244..00000000
--- a/client/menu/theme/paper_texture.tres
+++ /dev/null
@@ -1,14 +0,0 @@
-[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://chxkwohi56cxx"]
-
-[sub_resource type="Gradient" id="Gradient_pkrjd"]
-colors = PackedColorArray(0.917969, 0.866454, 0.770122, 1, 0.832031, 0.781817, 0.666307, 1)
-
-[sub_resource type="FastNoiseLite" id="FastNoiseLite_k7p6k"]
-noise_type = 0
-frequency = 0.0084
-domain_warp_enabled = true
-domain_warp_frequency = -1.465
-
-[resource]
-color_ramp = SubResource("Gradient_pkrjd")
-noise = SubResource("FastNoiseLite_k7p6k")
diff --git a/client/menu/theme/shaders/blur_mix.gdshader b/client/menu/theme/shaders/blur_mix.gdshader
new file mode 100644
index 00000000..7e95224d
--- /dev/null
+++ b/client/menu/theme/shaders/blur_mix.gdshader
@@ -0,0 +1,34 @@
+/*
+    Hurry Curry! - a game about cooking
+    Copyright 2024 tpart
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, version 3 of the License only.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+*/
+shader_type canvas_item;
+
+uniform float blur_amount : hint_range(-2.0, 10.0);
+uniform float mix_amount : hint_range(0.0, 1.0);
+uniform float mix_amount_no_blur : hint_range(0.0, 1.0);
+uniform vec4 color_over: source_color;
+uniform sampler2D SCREEN_TEXTURE : hint_screen_texture, filter_linear_mipmap;
+uniform bool enable_blur;
+
+void fragment() {
+	if (enable_blur) {
+		vec4 blurred = textureLod(SCREEN_TEXTURE, SCREEN_UV, blur_amount);
+    	COLOR = mix(blurred, color_over, mix_amount);
+	} else {
+		COLOR = mix(texture(SCREEN_TEXTURE, SCREEN_UV), color_over, mix_amount_no_blur);
+	}
+}
+\ No newline at end of file
diff --git a/client/menu/theme/shaders/grayscale.gdshader b/client/menu/theme/shaders/grayscale.gdshader
new file mode 100644
index 00000000..cc132c54
--- /dev/null
+++ b/client/menu/theme/shaders/grayscale.gdshader
@@ -0,0 +1,25 @@
+/*
+    Hurry Curry! - a game about cooking
+    Copyright 2024 nokoe
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, version 3 of the License only.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+*/
+shader_type canvas_item;
+
+void fragment() {
+    float brightness = 0.2126 * COLOR.r + 0.7152 * COLOR.g + 0.0722 * COLOR.b;
+    brightness = (brightness - .5) * 2.;
+    COLOR.rgb = vec3(brightness);
+    COLOR.a *= 1. - brightness;
+}
diff --git a/client/menu/theme/paper_panel_style.tres b/client/menu/theme/style/paper_panel_style.tres
index 5a8a4a78..bd49eea4 100644
--- a/client/menu/theme/paper_panel_style.tres
+++ b/client/menu/theme/style/paper_panel_style.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bqhs5wtdp2oax"]
 
-[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/theme/paper_texture.tres" id="1_u1kqj"]
+[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/textures/paper_texture.tres" id="1_u1kqj"]
 
 [resource]
 texture = ExtResource("1_u1kqj")
diff --git a/client/menu/theme/paper.tres b/client/menu/theme/theme/paper.tres
index acf6699a..6ff3bd10 100644
--- a/client/menu/theme/paper.tres
+++ b/client/menu/theme/theme/paper.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Theme" load_steps=17 format=3 uid="uid://ci2qajdoa1an1"]
 
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="1_koj1m"]
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_tc8bk"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="1_koj1m"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_tc8bk"]
 
 [sub_resource type="FontVariation" id="FontVariation_pirkj"]
 base_font = ExtResource("1_tc8bk")
diff --git a/client/menu/theme/theme.tres b/client/menu/theme/theme/theme.tres
index fff223c0..9e2c4ac6 100644
--- a/client/menu/theme/theme.tres
+++ b/client/menu/theme/theme/theme.tres
@@ -1,10 +1,10 @@
 [gd_resource type="Theme" load_steps=11 format=3 uid="uid://b0qmvo504e457"]
 
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/font-josefin-sans.woff2" id="1_f8qb0"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_f8qb0"]
 [ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/style/focus_style.tres" id="1_x88rs"]
 [ext_resource type="StyleBox" uid="uid://pi5uhe0lrgka" path="res://menu/theme/style/normal_style.tres" id="2_8fwoi"]
 [ext_resource type="StyleBox" uid="uid://dua4jqje3704w" path="res://menu/theme/style/hover_style.tres" id="2_ye28t"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_8u6ww"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_8u6ww"]
 [ext_resource type="StyleBox" uid="uid://bcd4xcvtv7tws" path="res://menu/theme/style/panel_style.tres" id="4_42dlp"]
 
 [sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"]