diff --git a/resources/cards/edit/ui.xml b/resources/cards/edit/ui.xml
new file mode 100644
index 0000000..20c05b4
--- /dev/null
+++ b/resources/cards/edit/ui.xml
@@ -0,0 +1,50 @@
+
+
+
+ Memory cards edit
+ 1000
+ 1000
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/cards/game/ui.xml b/resources/cards/game/ui.xml
index e69de29..86fdc00 100644
--- a/resources/cards/game/ui.xml
+++ b/resources/cards/game/ui.xml
@@ -0,0 +1,21 @@
+
+
+
+ Memory cards setup
+
+
+ horizontal
+
+
+ Edit cards
+
+
+
+
+ start game
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/cards/new/ui.xml b/resources/cards/new/ui.xml
new file mode 100644
index 0000000..b78ad3b
--- /dev/null
+++ b/resources/cards/new/ui.xml
@@ -0,0 +1,50 @@
+
+
+
+ New memory card
+ 512
+ 512
+
+
+ vertical
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+
+
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+ /home/leca/Downloads/2648 - SoyBooru.png
+
+
+
+
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+ Choose file
+
+
+
+
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+ Hieroglyph
+
+
+
+
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+ Translation
+
+
+
+
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+ Done
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/cards/setup/ui.xml b/resources/cards/setup/ui.xml
index 3af6073..86fdc00 100644
--- a/resources/cards/setup/ui.xml
+++ b/resources/cards/setup/ui.xml
@@ -7,15 +7,15 @@
horizontal
- test
+ Edit cards
- test2
+ start game
-
+
\ No newline at end of file
diff --git a/resources/menu/ui.xml b/resources/menu/ui.xml
index b1cf1ff..cb97189 100644
--- a/resources/menu/ui.xml
+++ b/resources/menu/ui.xml
@@ -4,18 +4,24 @@
Menu
- horizontal
+ horizontal
Practice hiragana and katakana
+
Practice vocabulary with memory cards
+
-
+
\ No newline at end of file
diff --git a/resources/org.foxarmy.settings.gschema.xml b/resources/org.foxarmy.settings.gschema.xml
index cc56617..f0a7424 100644
--- a/resources/org.foxarmy.settings.gschema.xml
+++ b/resources/org.foxarmy.settings.gschema.xml
@@ -1,21 +1,21 @@
-
-
- false
- Enable romaji to kana
-
-
- true
- Enable kana to romaji
-
-
- true
- Enable hiragana
-
-
- false
- Enable katakana
-
-
-
+
+
+ false
+ Enable romaji to kana
+
+
+ true
+ Enable kana to romaji
+
+
+ true
+ Enable hiragana
+
+
+ false
+ Enable katakana
+
+
+
\ No newline at end of file
diff --git a/resources/resources.gresource.xml b/resources/resources.gresource.xml
index 47e71d5..d706e16 100644
--- a/resources/resources.gresource.xml
+++ b/resources/resources.gresource.xml
@@ -1,14 +1,19 @@
-
- menu/ui.xml
-
- guessing/game/ui.xml
- guessing/setup/ui.xml
+
+ menu/ui.xml
-
- cards/setup/ui.xml
+ cards/edit/ui.xml
+ cards/setup/ui.xml
+ cards/new/ui.xml
- widgets/labled_switch/template.ui.xml
-
-
+
+ guessing/game/ui.xml
+ guessing/setup/ui.xml
+
+
+
+ widgets/labled_switch/template.ui.xml
+ widgets/card_entry/template.ui.xml
+
+
\ No newline at end of file
diff --git a/resources/widgets/card_entry/template.ui.xml b/resources/widgets/card_entry/template.ui.xml
new file mode 100644
index 0000000..f2299e7
--- /dev/null
+++ b/resources/widgets/card_entry/template.ui.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+ GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER
+
+
+
+
+ GTK_ALIGN_START
+ GTK_ALIGN_START
+
+
+
+
+ GTK_ALIGN_START
+ GTK_ALIGN_START
+
+
+
+
+ GTK_ALIGN_END
+ GTK_ALIGN_END
+
+
+
+
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index f77844f..6c34c53 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
mod game;
-mod labled_switch;
mod ui;
+mod widgets;
use crate::ui::menu::MenuScene;
diff --git a/src/ui/cards/edit/imp.rs b/src/ui/cards/edit/imp.rs
index 8b13789..cbdbb25 100644
--- a/src/ui/cards/edit/imp.rs
+++ b/src/ui/cards/edit/imp.rs
@@ -1 +1,80 @@
+use std::rc::Rc;
+use glib::subclass::InitializingObject;
+use gtk::glib::object::ObjectExt;
+use gtk::glib::{clone, closure_local};
+use gtk::subclass::prelude::*;
+use gtk::{glib, Button, CompositeTemplate, ScrolledWindow, SearchEntry, Window};
+use gtk::{prelude::*, FileDialog};
+
+use crate::ui::cards::new::*;
+use crate::widgets::card_entry::CardEntry;
+
+#[derive(CompositeTemplate, Default)]
+#[template(resource = "/org/foxarmy/learn-hieroglyph/cards/edit/ui.xml")]
+pub struct MemoryCardsEditScene {
+ #[template_child]
+ pub search_entry: TemplateChild,
+ #[template_child]
+ pub add_button: TemplateChild