diff --git a/src/geometry.c b/src/geometry.c
index 7db8d49d..d5298521 100644
--- a/src/geometry.c
+++ b/src/geometry.c
@@ -14,7 +14,7 @@ static const char *px_sampling_names[] = {
 
 static param_t params[] = {
    {    H_OFFSET,        "H offset",         0,       100, 1 },
-   {    V_OFFSET,        "V offset",         0,        39, 1 },
+   {    V_OFFSET,        "V offset",         0,        49, 1 },
    {     H_WIDTH,         "H width",         1,       100, 1 },
    {    V_HEIGHT,        "V height",         1,       300, 1 },
    {    FB_WIDTH,        "FB width",       250,       800, 1 },
diff --git a/src/osd.c b/src/osd.c
index b921cba8..cb8aad32 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -57,8 +57,9 @@ static const char *profile_names[] = {
    "PC CGA",
    "PC EGA",
    "PC CGA on VGA",
-   "PC VGA Text (EGA)",
+   "PC EGA on VGA",
    "PC VGA Graphics",
+   "PC VGA Text",
    "UK 101",
    "ZX80-81",
    "Oric",
diff --git a/src/osd.h b/src/osd.h
index da52af9f..b1020a00 100644
--- a/src/osd.h
+++ b/src/osd.h
@@ -32,8 +32,9 @@ enum {
    PROFILE_PCCGA,
    PROFILE_PCEGA,
    PROFILE_PCVGACGA,
-   PROFILE_PCVGATEXT,
+   PROFILE_PCVGAEGA,
    PROFILE_PCVGAGRAPHICS,
+   PROFILE_PCVGATEXT,
    PROFILE_UK101,
    PROFILE_ZX8081,
    PROFILE_ORIC,
diff --git a/src/scripts/Profiles/Atom.txt b/src/scripts/Profiles/Atom.txt
index 0ba089e9..484177df 100644
--- a/src/scripts/Profiles/Atom.txt
+++ b/src/scripts/Profiles/Atom.txt
@@ -1,2 +1,3 @@
-sampling=4,4,4,4,4,4,4,0,6,5,0
-geometry=23,26,100,270,800,270,1
+sampling=1,1,1,1,1,1,1,0,8,0,1
+geometry=11,11,38,240,304,240,0,8,57272720,3648 
+palette=17
diff --git a/src/scripts/Profiles/BBC Micro (192 Mhz).txt b/src/scripts/Profiles/BBC Micro (192 Mhz).txt
index e6c3d4cd..d0688ce1 100644
--- a/src/scripts/Profiles/BBC Micro (192 Mhz).txt	
+++ b/src/scripts/Profiles/BBC Micro (192 Mhz).txt	
@@ -1,4 +1,4 @@
-sampling06=0,0,0,0,0,0,0,0,6,5,0
+sampling06=4,4,4,4,4,4,4,0,6,5,0
 sampling7=3,3,4,3,3,4,4,1,8,10,3
 geometry7=33,18,63,270,504,270,1,4,192000000,12288,5000,0
 control=1
diff --git a/src/scripts/Profiles/Oric.txt b/src/scripts/Profiles/Oric.txt
index 2b8b49f5..3f379649 100644
--- a/src/scripts/Profiles/Oric.txt
+++ b/src/scripts/Profiles/Oric.txt
@@ -1,2 +1,2 @@
-sampling=3,3,3,3,3,3,3,0,6,5,0
-geometry=38,21,84,270,672,270,1,8,96000000,6144,5000,0
+sampling=0,0,0,0,0,0,0,0,8,0,0
+geometry=32,30,63,270,504,270,1,4,96000000,6144,5000,0
diff --git a/src/scripts/Profiles/PC EGA on VGA.txt b/src/scripts/Profiles/PC EGA on VGA.txt
new file mode 100644
index 00000000..1c70ad4b
--- /dev/null
+++ b/src/scripts/Profiles/PC EGA on VGA.txt	
@@ -0,0 +1,6 @@
+sampling=0,3,3,3,3,3,3,0,6,3,1
+geometry=9,28,80,410,640,410,0,8,151050000,4800,5000,0
+palette=3
+control=0
+autoswitch=2
+vlockmode=0
diff --git a/src/scripts/Profiles/PC EGA.txt b/src/scripts/Profiles/PC EGA.txt
index 2862358b..59012a61 100644
--- a/src/scripts/Profiles/PC EGA.txt	
+++ b/src/scripts/Profiles/PC EGA.txt	
@@ -1,4 +1,4 @@
-sampling=0,3,3,3,3,3,3,0,6,4,1
-geometry=20,22,83,220,672,220,0,8,85909091,5472,5000,0
+sampling=0,0,0,0,0,0,0,0,6,2,1
+geometry=3,0,79,350,640,350,0,8,97542000,4464,5000,0
 palette=3
 autoswitch=2
diff --git a/src/scripts/Profiles/PC VGA Text (EGA).txt b/src/scripts/Profiles/PC VGA Text.txt
similarity index 100%
rename from src/scripts/Profiles/PC VGA Text (EGA).txt
rename to src/scripts/Profiles/PC VGA Text.txt
diff --git a/src/scripts/Profiles/UK 101.txt b/src/scripts/Profiles/UK 101.txt
index e75d8a16..49094936 100644
--- a/src/scripts/Profiles/UK 101.txt	
+++ b/src/scripts/Profiles/UK 101.txt	
@@ -1,3 +1,3 @@
-sampling=3,3,3,3,3,3,3,0,6,5,0
-geometry=38,21,84,270,672,270,1,8,96000000,6144,5000,0
+sampling=2,2,2,2,2,2,2,0,6,0,0
+geometry=28,22,100,270,800,270,0,8,96000000,6144,5000,0
 
diff --git a/src/scripts/Profiles/ZX80-81.txt b/src/scripts/Profiles/ZX80-81.txt
index 4e0fefce..e4d1495a 100644
--- a/src/scripts/Profiles/ZX80-81.txt
+++ b/src/scripts/Profiles/ZX80-81.txt
@@ -1,2 +1,2 @@
-sampling=4,4,4,4,4,4,4,0,6,5,0
-geometry=9,18,84,270,672,270,1,4,78000000,4968,20000,0
+sampling=5,5,5,5,5,5,5,0,6,4,0
+geometry=9,42,40,216,320,216,0,4,39000000,2484,0,0