rename styles -> themes

8 files changed, 6 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 718760d..62087b1 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ install: release
 	mkdir -p $(GLOBAL_DATA_DIR) $(LOCAL_DATA_DIR)
 	chown `logname`:`logname` $(LOCAL_DATA_DIR)
 	cp -r assets $(GLOBAL_DATA_DIR)
+	cp -r themes $(GLOBAL_DATA_DIR)
 	install -m 644 ted.cfg $(GLOBAL_DATA_DIR)
 	install ted $(INSTALL_BIN_DIR)
 libpcre2-32.a: pcre2
@@ -53,7 +54,7 @@ ted.deb: release
 	mkdir -p /tmp/ted/usr/share/applications
 	cp ted.desktop /tmp/ted/usr/share/applications
 	cp ted /tmp/ted$(INSTALL_BIN_DIR)/
-	cp -r assets ted.cfg /tmp/ted$(GLOBAL_DATA_DIR)/
+	cp -r assets themes ted.cfg /tmp/ted$(GLOBAL_DATA_DIR)/
 	cp control /tmp/ted/DEBIAN
 	dpkg-deb --build /tmp/ted
 	mv /tmp/ted.deb ./
diff --git a/control b/control
index 210c472..235a8ec 100644
--- a/control
+++ b/control
@@ -1,5 +1,5 @@
 Package: ted
-Version: 2.0
+Version: 2.1
 Section: text
 Priority: optional
 Architecture: amd64
diff --git a/main.c b/main.c
index 3a594e1..d3cdbed 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,6 @@
 /*
 FUTURE FEATURES:
 - better undo chaining (dechain on backspace?)
-- manual.md
 - font setting & support for multiple fonts to cover more characters
 - support for variable-width fonts
 - robust find (results shouldn't move around when you type things)
@@ -20,6 +19,7 @@ FUTURE FEATURES:
 - keyboard macros
     -  ctrl+9/0 to inc/dec number would be useful here
     - with macros we can really test performance of buffer_insert_text_at_pos, etc. (which should ideally be fast)
+- manual.md
 - auto-reload config even for %included files
 - LSP request timeout
 BUG REPORTS IM TO LAZY TO FILE (RIGHT NOW)
diff --git a/ted.cfg b/ted.cfg
index cf6fda8..f2d63f0 100644
--- a/ted.cfg
+++ b/ted.cfg
@@ -385,5 +385,5 @@ CSS = .css
 # [/path/to/special/project//Javascript.keyboard]
 # Ctrl+J = "function() {" :insert-text
 
-%include styles/classic.ted.cfg
+%include themes/classic.ted.cfg
 
diff --git a/ted.h b/ted.h
index 3470c5b..59bdf65 100644
--- a/ted.h
+++ b/ted.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "sdl-inc.h"
 
 /// Version number
-#define TED_VERSION "2.0"
+#define TED_VERSION "2.1"
 /// Version string
 #define TED_VERSION_FULL "ted v. " TED_VERSION
 /// Maximum path size ted handles.
diff --git a/styles/classic-light.ted.cfg b/themes/classic-light.ted.cfg
index c154020..c154020 100644
--- a/styles/classic-light.ted.cfg
+++ b/themes/classic-light.ted.cfg
diff --git a/styles/classic.ted.cfg b/themes/classic.ted.cfg
index b7a9025..b7a9025 100644
--- a/styles/classic.ted.cfg
+++ b/themes/classic.ted.cfg
diff --git a/styles/extradark.ted.cfg b/themes/extradark.ted.cfg
index 0b3603e..0b3603e 100644
--- a/styles/extradark.ted.cfg
+++ b/themes/extradark.ted.cfg