Index: /trunk/src/org/expeditee/actions/Misc.java
===================================================================
--- /trunk/src/org/expeditee/actions/Misc.java	(revision 1509)
+++ /trunk/src/org/expeditee/actions/Misc.java	(revision 1510)
@@ -94,4 +94,8 @@
 	}
 	
+	public static String append(Text content, Text actionItem) {
+		return actionItem.getText() + ": " + content.getText();
+	}
+	
 	/**
 	 * Returns an Item located at the specified position.
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/0.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/0.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/0.exp	(revision 1510)
@@ -0,0 +1,61 @@
+V 3
+U authadmin
+D 05Feb2020[15:32]
+M authadmin
+d 10Feb2020[14:11]
+E 300
+e 300
+Z
+
+S T 3
+s 10Feb2020[14:11.03]
+d 50 50 50 100
+P 1525 30
+T @ao: 1
+F 1
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:04
+DarkTime:00:00:00
+11:11:035 1128 309 Md
+11:11:184 1128 309 Mu
+11:14:146 979 189 kSHIFT
+11:14:538 979 189 kP
+11:14:770 989 189 kO
+11:14:921 998 189 kS
+11:15:090 1005 189 kI
+11:15:243 1010 189 kT
+11:15:336 1014 189 kI
+11:15:384 1019 189 kO
+11:15:448 1029 189 kN
+11:15:691 1038 189 kSHIFT
+11:21:444 1011 176 Rd
+11:21:528 1011 176 Ru
+11:22:347 1543 14 Md
+11:22:456 1543 14 Mu
+11:25:859 1108 179 kBACKSPACE
+11:25:994 1097 189 kBACKSPACE
+11:27:476 1036 179 Rd
+11:27:568 1036 179 Ru
+11:28:715 1538 13 Md
+11:28:824 1538 13 Mu
+11:31:292 1143 316 Md
+11:31:361 1143 316 Rd
+11:31:520 1143 316 Ru
+11:31:552 1143 316 Mu
+11:32:404 1030 174 Md
+11:32:528 1030 174 Mu
+11:33:607 1147 306 kRIGHT_ARROW
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/1.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/1.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/1.exp	(revision 1510)
@@ -0,0 +1,365 @@
+V 24
+U authadmin
+D 05Feb2020[15:32]
+M authadmin
+d 07Feb2020[14:17]
+E 300
+e 300
+Z
+
+S P 528
+s 07Feb2020[13:24.35]
+d 0 0 0 100
+P 1678 799
+e 100 59 59 100
+H -10
+I 70
+o authadmin
+v S
+h 1.0
+l 532
+c 524
+
+S P 529
+s 07Feb2020[13:24.35]
+d 0 0 0 100
+P 0 799
+e 100 59 59 100
+R 0
+I 70
+o authadmin
+v S
+h 1.0
+l 532
+c 524
+
+S T 415
+s 05Feb2020[16:27.09]
+d 0 0 100 100
+P 952 830
+T -->
+R 950
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 209
+s 05Feb2020[15:56.48]
+d 0 0 100 100
+P 28 830
+T FrameEncryptionLabel
+X append
+R 15
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 343
+s 05Feb2020[16:18.03]
+d 0 0 100 100
+P 373 830
+T EncryptionLabel
+X append
+R 360
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 267
+s 05Feb2020[16:07.15]
+d 0 0 100 100
+P 663 830
+T FrameEncryptionPermission
+X append
+R 650
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 412
+s 05Feb2020[16:26.31]
+d 0 0 100 100
+P 1043 830
+T Example [Only Owner can Encrypt Frame]
+X GenFrameEncryption300
+R 1030
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 353
+s 05Feb2020[16:19.12]
+d 0 0 100 100
+P 663 860
+T ItemEncryptionPermission
+X append
+R 650
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 322
+s 05Feb2020[16:16.13]
+d 0 0 100 100
+P 28 860
+T HomogeneousEncryptionLabel
+X append
+R 15
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 511
+s 05Feb2020[16:37.25]
+d 0 0 100 100
+P 952 860
+T -->
+R 950
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 454
+s 05Feb2020[16:32.44]
+d 0 0 100 100
+P 1043 860
+T Example [Can Encrypt Items with Labels That Owner Has]
+X GenItemEncryption322
+R 1030
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 533
+s 07Feb2020[14:00.29]
+d 0 0 100 100
+P 373 860
+T GenerateSecret
+X append
+R 360
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 114
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P -5 881
+e 40 60 60 100
+R -5
+I -12
+o authadmin
+v S
+h 1.0
+l 117 118
+c 110 109
+
+S P 115
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P 1683 881
+e 40 60 60 100
+H -15
+I -12
+o authadmin
+v S
+h 1.0
+l 118 119
+c 109 111
+
+S P 201
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P -5 884
+e 59 100 59 100
+R -5
+I -15
+o authadmin
+v S
+h 1.0
+l 204 205
+c 197 196
+
+S P 202
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P 1683 884
+e 59 100 59 100
+H -15
+I -15
+o authadmin
+v S
+h 1.0
+l 205 206
+c 196 198
+
+S P 200
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P -5 1272
+e 59 100 59 100
+R -5
+o authadmin
+v S
+h 1.0
+l 204 203
+c 197 195
+
+S P 199
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P 1683 1272
+e 59 100 59 100
+H -15
+o authadmin
+v S
+h 1.0
+l 206 203
+c 198 195
+
+S P 112
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P 1683 2278
+e 40 60 60 100
+H -15
+o authadmin
+v S
+h 1.0
+l 119 116
+c 111 108
+
+S P 113
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P -5 2278
+e 40 60 60 100
+R -5
+o authadmin
+v S
+h 1.0
+l 117 116
+c 110 108
+
+Z
+
+L 532 1
+s 528 529
+
+L 117 1
+s 113 114
+
+L 118 1
+s 114 115
+
+L 119 1
+s 115 112
+
+L 204 1
+s 200 201
+
+L 205 1
+s 201 202
+
+L 206 1
+s 202 199
+
+L 203 1
+s 199 200
+
+L 116 1
+s 112 113
+
+Z
+
+C 524 3
+s 528 529
+
+C 110 2
+s 113 114
+
+C 109 3
+s 114 115
+
+C 111 2
+s 115 112
+
+C 197 2
+s 200 201
+
+C 196 3
+s 201 202
+
+C 198 2
+s 202 199
+
+C 195 3
+s 199 200
+
+C 108 3
+s 112 113
+
+Z
+
+ActiveTime:00:25:09
+DarkTime:00:03:16
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/2.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/2.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/2.exp	(revision 1510)
@@ -0,0 +1,313 @@
+V 14
+U authadmin
+D 07Feb2020[14:16]
+M authadmin
+d 10Feb2020[14:11]
+B 100 100 39 100
+E 300
+e 300
+Z
+
+S T 13
+s 07Feb2020[14:17.25]
+d 50 50 50 100
+P 1525 30
+T @ao: 1
+F 1
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 21
+s 07Feb2020[14:19.45]
+d 0 0 0 100
+P 105 65
+T Secure Expeditee:
+o authadmin
+v S
+f Metamorphous_r36
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 56
+s 07Feb2020[14:39.55]
+d 0 0 0 100
+P 1499 68
+T @ItemTemplate
+o authadmin
+v S
+f Amaranth_r24
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 20
+s 07Feb2020[14:19.28]
+d 0 0 0 100
+P 20 104
+T 🔒
+o authadmin
+v S
+f tr74
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 22
+s 07Feb2020[14:19.51]
+d 0 0 0 100
+P 105 115
+T Sleek like Aphroditē–Wise like Athēnâ.
+o authadmin
+v S
+f Metamorphous_r36
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 38
+s 07Feb2020[14:25.07]
+d 0 0 0 100
+P 105 165
+T Encryption Cockpit
+o authadmin
+v S
+f Metamorphous_r36
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 59
+s 10Feb2020[14:01.44]
+d 0 0 0 100
+P 36 220
+T Welcome to the Expeditee Encryption Cockpit.  This collection of frames is designed let you play with encryption and surrogates before using this functionality in a more serious situation.  It can also be used to take a copy of the active overlay supplying related actions.  
+o authadmin
+v S
+f Amaranth_r24
+t -1.0
+b 0.0
+m 0.0
+w 950
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:03:45
+DarkTime:00:10:34
+11:35:258 1529 15 Md
+11:35:424 1529 15 Mu
+11:46:044 1500 129 Md
+11:46:145 1500 129 Mu
+11:49:268 1621 55 Md
+11:49:472 1621 55 Mu
+11:51:369 202 351 Md
+11:51:466 202 351 Rd
+11:51:673 202 351 Ru
+11:51:705 202 351 Mu
+12:13:419 394 249 kB
+12:13:603 407 249 kE
+12:13:875 418 249 kF
+12:14:100 427 249 kO
+12:14:209 439 249 kR
+12:14:273 448 249 kE
+12:15:491 465 249 kY
+12:15:586 478 249 kO
+12:15:692 491 249 kU
+13:33:916 509 249 kLEFT_ARROW
+13:34:421 503 249 kLEFT_ARROW
+13:34:446 490 249 kLEFT_ARROW
+13:34:479 478 249 kLEFT_ARROW
+13:34:515 465 249 kLEFT_ARROW
+13:34:546 458 249 kLEFT_ARROW
+13:34:578 447 249 kLEFT_ARROW
+13:34:623 438 249 kLEFT_ARROW
+13:34:850 426 249 kLEFT_ARROW
+13:35:020 418 249 kLEFT_ARROW
+13:35:172 406 249 kLEFT_ARROW
+13:35:283 394 249 kLEFT_ARROW
+13:35:404 387 249 kLEFT_ARROW
+13:35:738 378 249 kLEFT_ARROW
+13:35:887 366 249 kA
+13:36:204 380 249 kT
+13:37:626 388 249 kRIGHT_ARROW
+13:37:844 399 249 kRIGHT_ARROW
+13:38:012 409 249 kRIGHT_ARROW
+13:38:172 415 249 kRIGHT_ARROW
+13:38:356 428 249 kRIGHT_ARROW
+13:38:529 439 249 kRIGHT_ARROW
+13:38:700 448 249 kRIGHT_ARROW
+13:38:841 460 249 kRIGHT_ARROW
+13:38:988 469 249 kRIGHT_ARROW
+13:39:130 480 249 kRIGHT_ARROW
+13:39:276 486 249 kRIGHT_ARROW
+13:39:409 499 249 kRIGHT_ARROW
+13:39:553 512 249 kRIGHT_ARROW
+14:20:612 526 247 kBACKSPACE
+14:20:836 512 249 kBACKSPACE
+14:20:980 500 249 kBACKSPACE
+14:21:107 487 249 kBACKSPACE
+14:21:948 487 249 kU
+14:22:100 500 249 kS
+14:22:187 509 249 kI
+14:22:242 516 249 kN
+14:22:356 529 249 kG
+14:22:701 548 249 kT
+14:22:770 557 249 kH
+14:22:818 570 249 kE
+14:26:490 587 249 kBACKSPACE
+14:26:644 581 249 kBACKSPACE
+14:26:772 570 249 kBACKSPACE
+14:26:890 557 249 kBACKSPACE
+14:27:228 548 249 kT
+14:27:275 557 249 kH
+14:27:330 570 249 kI
+14:27:410 576 249 kS
+14:27:612 592 249 kF
+14:27:657 600 249 kU
+14:27:836 613 249 kN
+14:27:954 627 249 kC
+14:28:162 636 249 kT
+14:28:234 645 249 kI
+14:28:282 651 249 kO
+14:28:338 664 249 kN
+14:28:627 677 249 kA
+14:28:730 690 249 kL
+14:28:893 697 249 kI
+14:28:954 703 249 kT
+14:29:124 711 249 kY
+14:29:820 730 249 kI
+14:29:898 737 249 kN
+14:30:668 756 249 kA
+14:30:916 775 249 kM
+14:30:986 794 249 kO
+14:31:106 807 249 kR
+14:31:178 815 249 kE
+14:33:332 833 249 kS
+14:33:492 843 249 kE
+14:33:546 854 249 kR
+14:34:068 862 249 kI
+14:34:256 869 249 kO
+14:34:386 882 249 kU
+14:34:539 895 249 kS
+14:34:893 910 249 kS
+14:34:979 921 249 kI
+14:35:253 927 249 kU
+14:35:556 940 249 kBACKSPACE
+14:35:658 927 249 kT
+14:36:005 935 249 kU
+14:36:220 949 249 kA
+14:36:660 961 249 kT
+14:36:916 969 249 kI
+14:36:955 976 249 kO
+14:37:010 113 278 kN
+14:58:173 146 278 kSHIFT
+14:58:300 146 278 kI
+14:58:588 152 278 kT
+15:02:197 167 278 kC
+15:02:282 177 278 kA
+15:02:493 189 278 kN
+15:02:925 209 278 kA
+15:03:003 222 278 kL
+15:03:892 228 278 kS
+15:03:929 238 278 kO
+15:04:397 257 278 kB
+15:04:613 270 278 kE
+15:04:837 287 278 kS
+15:04:843 297 278 kU
+15:04:898 310 278 kE
+15:05:076 322 278 kD
+15:05:629 341 278 kBACKSPACE
+15:06:029 334 278 kBACKSPACE
+15:06:147 322 278 kBACKSPACE
+15:06:266 310 278 kBACKSPACE
+15:06:492 297 278 kBACKSPACE
+15:06:764 287 278 kU
+15:06:851 300 278 kS
+15:06:922 310 278 kE
+15:07:133 322 278 kD
+15:07:372 341 278 kT
+15:07:442 349 278 kO
+15:16:852 368 278 kT
+15:16:922 376 278 kA
+15:17:173 389 278 kK
+15:17:274 402 278 kE
+15:17:427 419 278 kA
+15:17:725 438 278 kC
+15:17:778 448 278 kO
+15:17:948 460 278 kP
+15:18:125 473 278 kY
+15:18:325 492 278 kO
+15:18:765 505 278 kF
+15:20:453 519 278 kT
+15:20:580 528 278 kH
+15:20:642 541 278 kE
+15:21:205 558 278 kA
+15:21:460 571 278 kC
+15:21:749 581 278 kT
+15:21:834 590 278 kI
+15:21:972 596 278 kV
+15:22:092 608 278 kE
+15:22:685 626 278 kO
+15:22:821 638 278 kV
+15:23:013 651 278 kE
+15:23:082 662 278 kR
+15:23:338 671 278 kL
+15:23:554 678 278 kO
+15:23:741 691 278 kA
+15:24:037 703 278 kBACKSPACE
+15:24:163 691 278 kBACKSPACE
+15:24:276 678 278 kA
+15:24:476 691 278 kY
+15:28:843 710 278 kS
+15:28:923 720 278 kU
+15:29:116 733 278 kP
+15:29:259 746 278 kP
+15:29:493 759 278 kL
+15:31:604 766 278 kY
+15:31:765 779 278 kI
+15:31:835 785 278 kN
+15:31:899 798 278 kG
+15:41:901 817 278 kR
+15:41:946 826 278 kE
+15:42:068 837 278 kL
+15:42:146 844 278 kA
+15:42:226 856 278 kT
+15:42:331 865 278 kE
+15:42:573 877 278 kD
+15:43:388 896 278 kA
+15:43:533 908 278 kC
+15:43:757 919 278 kT
+15:43:860 927 278 kI
+15:43:898 934 278 kO
+15:43:954 946 278 kN
+15:44:059 959 278 kS
+16:02:781 1160 153 kCTRL
+16:03:285 1160 153 kCTRL
+16:03:313 1160 153 kCTRL
+16:03:344 1160 153 kCTRL
+16:03:377 1160 153 kCTRL
+16:03:424 1160 153 kCTRL
+16:03:444 1160 153 kCTRL
+16:03:466 1160 153 kS
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/frame.inf
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/frame.inf	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/encryption/frame.inf	(revision 1510)
@@ -0,0 +1,1 @@
+encryption2
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/1.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/1.exp	(revision 1509)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/1.exp	(revision 1510)
@@ -1,14 +1,17 @@
-V 9
+V 132
 U davidb
 D 17Nov2015[09:35]
-M bryce
-d 08Nov2019[13:30]
+M ${USER.NAME}
+d 14Feb2020[15:08]
+B 100 100 39 100
+E 300
+e 300
 Z
 
-S T 189
-s 17Nov2015[09:35.54]
-P 45 5
-T @i: expediteeicon128.png 263
-o davidb
+S T 884
+s 17Nov2015[09:35.54]
+P 10 27
+T @i: expediteeicon128.png 154
+o authadmin
 v S
 f tr18
@@ -21,9 +24,9 @@
 S P 15
 s 17Nov2015[09:35.54]
-d 70 70 0 100
-P 5 70
-e 100 100 50 100
+d 100 100 100 100
+P 5 51
+e 100 100 100 100
 R 5
-o davidb
+o authadmin
 v S
 h 2.0
@@ -33,9 +36,9 @@
 S P 16
 s 17Nov2015[09:35.54]
-d 70 70 0 100
-P 1663 70
-e 100 100 50 100
-H 5
-o davidb
+d 100 100 100 100
+P 1671 51
+e 100 100 100 100
+H -3
+o authadmin
 v S
 h 2.0
@@ -45,9 +48,10 @@
 S T 181
 s 17Nov2015[09:35.54]
-P 317 83
+d 0 0 0 100
+P 181 64
 T Expeditee
-o davidb
-v S
-f Metamorphous_r51
+o authadmin
+v S
+f Metamorphous_r46
 t -1.0
 b 0.0
@@ -58,11 +62,25 @@
 S T 182
 s 17Nov2015[09:35.54]
-P 322 130
-T “If Aphrodite be the goddess of love, 
-T then let Expeditee be the goddess of
-T Getting Things Done”
-o davidb
-v S
-f Metamorphous_r32
+d 0 0 0 100
+P 179 103
+T “If Aphrodite be the goddess of love, then let  Expeditee be the goddess of Getting Things Done”
+o authadmin
+v S
+f Metamorphous_r27
+t -1.0
+b 0.0
+m 0.0
+w 800
+h -1.0
+_sl F
+
+S T 184
+s 17Nov2015[09:35.54]
+d 0 0 0 100
+P 177 178
+T –Rob Akscyn, Inventor of Expeditee
+o authadmin
+v S
+f Metamorphous_i27
 t -1.0
 b 0.0
@@ -73,9 +91,9 @@
 S P 18
 s 17Nov2015[09:35.54]
-d 70 70 0 100
-P 5 237
-e 100 100 50 100
+d 100 100 100 100
+P 5 180
+e 100 100 100 100
 R 5
-o davidb
+o authadmin
 v S
 h 2.0
@@ -85,9 +103,9 @@
 S P 17
 s 17Nov2015[09:35.54]
-d 70 70 0 100
-P 1663 237
-e 100 100 50 100
-H 5
-o davidb
+d 100 100 100 100
+P 1671 180
+e 100 100 100 100
+H -3
+o authadmin
 v S
 h 2.0
@@ -95,46 +113,42 @@
 c 116 117
 
-S T 184
-s 17Nov2015[09:35.54]
-P 323 286
-T –Rob Akscyn, Inventor of Expeditee
-o davidb
-v S
-f Metamorphous_i32
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-_sl F
-
-S P 618
-s 14Apr2016[14:03.24]
-d 70 70 0 100
-P 410 393
-e 100 100 70 100
-o davidb
-v S
-h 2.0
-l 622 625
-c 157
-
-S P 619
-s 14Apr2016[14:03.24]
-d 70 70 0 100
-P 607 393
-e 100 100 70 100
-o davidb
-v S
-h 2.0
-l 622 623
-c 157
-
-S T 611
-s 14Apr2016[14:03.24]
+S T 932
+s 11Feb2020[15:41.13]
+d 50 50 50 100
+P 587 247
+T @i: help.png 68
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+p 411
+_sl F
+
+S T 903
+s 13Feb2020[15:42.37]
+d 50 50 50 100
+P 188 253
+T @i: tutorial.png 75
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+p 411
+_sl F
+
+S T 192
+s 10Feb2020[15:00.11]
 d 0 30 0 100
-P 425 445
+P 178 299
 T Tutorial
 F tutorialshomenew1
-o davidb
+o authadmin
+n F
 v S
 f Amaranth_r49
@@ -142,29 +156,18 @@
 b 0.0
 m 0.0
-h -1.0
-_sl F
-
-S T 612
-s 14Apr2016[14:03.24]
+w 275
+k R
+h -1.0
+p 411
+_sl F
+
+S T 224
+s 10Feb2020[15:22.44]
 d 0 30 0 100
-P 324 502
-T Settings
-X GotoSettings
-o davidb
-v S
-f Amaranth_r51
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-_sl F
-
-S T 613
-s 14Apr2016[14:03.24]
-d 0 30 0 100
-P 563 502
+P 579 299
 T Help
 F documentation1
-o davidb
+o authadmin
+n F
 v S
 f Amaranth_r51
@@ -172,14 +175,116 @@
 b 0.0
 m 0.0
-h -1.0
-_sl F
-
-S T 614
-s 14Apr2016[14:03.24]
+w 210
+k R
+h -1.0
+p 411
+_sl F
+
+S T 1100
+s 11Feb2020[15:55.13]
+d 50 50 50 100
+P 586 372
+T @i: audio.png 76
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+p 411
+_sl F
+
+S T 847
+s 11Feb2020[16:04.55]
+d 50 50 50 100
+P 177 375
+T @i: pictures.png 83
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+p 411
+_sl F
+
+S T 267
+s 10Feb2020[15:44.43]
 d 0 30 0 100
-P 124 567
+P 178 423
+T Pictures
+F mypictures1
+o authadmin
+n F
+v S
+f Amaranth_r53
+t -1.0
+b 0.0
+m 0.0
+w 285
+k R
+h -1.0
+p 411
+_sl F
+
+S T 1063
+s 13Feb2020[16:11.14]
+d 0 30 0 100
+P 578 423
+T Audio
+F mymusic1
+o authadmin
+n F
+v S
+f Amaranth_r51
+t -1.0
+b 0.0
+m 0.0
+w 240
+k R
+h -1.0
+p 411
+_sl F
+
+S T 852
+s 11Feb2020[16:00.46]
+d 50 50 50 100
+P 592 498
+T @i: apps.png 68
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+p 411
+_sl F
+
+S T 1191
+s 11Feb2020[15:46.28]
+d 50 50 50 100
+P 189 500
+T @i: documents.png 65
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+p 411
+_sl F
+
+S T 319
+s 10Feb2020[15:45.56]
+d 0 30 0 100
+P 584 552
 T Apps
 F 3
-o davidb
+o authadmin
+n F
 v S
 f Amaranth_r53
@@ -187,14 +292,18 @@
 b 0.0
 m 0.0
-h -1.0
-_sl F
-
-S T 615
-s 14Apr2016[14:03.24]
+w 220
+k R
+h -1.0
+p 411
+_sl F
+
+S T 266
+s 10Feb2020[15:44.39]
 d 0 30 0 100
-P 267 567
+P 175 552
 T Documents
 F mydocuments1
-o davidb
+o authadmin
+n F
 v S
 f Amaranth_r53
@@ -202,58 +311,9 @@
 b 0.0
 m 0.0
-h -1.0
-_sl F
-
-S T 616
-s 14Apr2016[14:03.24]
-d 0 30 0 100
-P 550 567
-T Pictures
-F mypictures1
-o davidb
-v S
-f Amaranth_r53
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-_sl F
-
-S T 617
-s 14Apr2016[14:03.24]
-d 0 30 0 100
-P 757 567
-T Music
-F mymusic1
-o davidb
-v S
-f Amaranth_r53
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-_sl F
-
-S P 621
-s 14Apr2016[14:03.24]
-d 70 70 0 100
-P 16 584
-e 100 100 70 100
-o davidb
-v S
-h 2.0
-l 625 624
-c 158
-
-S P 620
-s 14Apr2016[14:03.24]
-d 70 70 0 100
-P 992 584
-e 100 100 70 100
-o davidb
-v S
-h 2.0
-l 623 624
-c 158
+w 360
+k R
+h -1.0
+p 411
+_sl F
 
 Z
@@ -271,16 +331,4 @@
 s 18 17
 
-L 622 1
-s 619 618
-
-L 625 1
-s 621 618
-
-L 623 1
-s 620 619
-
-L 624 1
-s 620 621
-
 Z
 
@@ -297,18 +345,298 @@
 s 18 17
 
-C 157 3
-s 619 618
-
-C 158 3
-s 620 621
-
 Z
 
-ActiveTime:00:50:57
-DarkTime:02:10:38
-31:01:282 483 648 Md
-31:01:423 483 648 Rd
-31:01:534 483 648 Ru
-31:01:591 483 648 Mu
-31:03:936 1528 234 kCTRL
-31:04:168 1528 234 kS
+ActiveTime:01:59:37
+DarkTime:03:31:35
+09:02:669 621 241 kDELETE
+09:02:917 618 247 kDELETE
+09:03:157 618 247 kDELETE
+09:03:437 618 247 kDELETE
+09:03:669 618 247 kDELETE
+09:03:925 618 247 kDELETE
+09:04:294 618 247 kDELETE
+09:05:253 618 247 kH
+09:05:373 627 247 kE
+09:05:445 635 247 kL
+09:05:630 640 247 kP
+09:06:655 649 247 kRIGHT_ARROW
+09:07:061 653 247 kRIGHT_ARROW
+09:07:173 662 247 kRIGHT_ARROW
+09:07:541 671 247 kRIGHT_ARROW
+09:07:677 680 247 kRIGHT_ARROW
+09:08:021 685 247 kLEFT_ARROW
+09:08:389 680 247 kDELETE
+09:08:558 681 247 kDELETE
+09:08:733 681 247 kDELETE
+09:19:758 213 370 kDELETE
+09:20:366 217 375 kDELETE
+09:20:865 217 375 kDELETE
+09:20:899 217 375 kDELETE
+09:21:077 217 375 kDELETE
+09:21:237 217 375 kDELETE
+09:21:717 217 375 kDELETE
+09:22:581 217 375 kBACKSPACE
+09:23:373 208 375 kP
+09:23:533 217 375 kI
+09:23:709 222 375 kC
+09:24:005 230 375 kT
+09:24:102 235 375 kU
+09:24:229 244 375 kR
+09:24:325 250 375 kE
+09:24:389 258 375 kS
+09:25:109 265 375 kRIGHT_ARROW
+09:25:261 269 375 kRIGHT_ARROW
+09:25:349 278 375 kRIGHT_ARROW
+09:25:501 287 375 kRIGHT_ARROW
+09:25:917 296 375 kDELETE
+09:26:053 297 375 kDELETE
+09:26:189 297 375 kDELETE
+09:33:709 619 370 kDELETE
+09:33:981 617 372 kDELETE
+09:34:149 617 372 kDELETE
+09:34:317 617 372 kDELETE
+09:34:461 617 372 kDELETE
+09:34:589 617 372 kDELETE
+09:34:869 617 372 kDELETE
+09:35:293 617 372 kDELETE
+09:36:325 617 372 kA
+09:36:429 625 372 kU
+09:36:644 634 372 kD
+09:36:814 643 372 kI
+09:36:901 648 372 kO
+09:37:525 657 372 kRIGHT_ARROW
+09:37:701 661 372 kRIGHT_ARROW
+09:37:854 670 372 kRIGHT_ARROW
+09:37:981 679 372 kRIGHT_ARROW
+09:38:445 688 372 kDELETE
+09:38:581 689 372 kDELETE
+09:38:757 689 372 kDELETE
+09:43:733 624 499 kDELETE
+09:43:973 623 498 kDELETE
+09:44:141 623 498 kDELETE
+09:44:277 623 498 kDELETE
+09:44:429 623 498 kDELETE
+09:44:574 623 498 kDELETE
+09:44:917 623 498 kDELETE
+09:45:253 623 498 kDELETE
+09:46:229 623 498 kA
+09:46:421 631 498 kP
+09:46:541 640 498 kP
+09:46:621 649 498 kS
+09:47:293 656 498 kEND
+09:47:645 710 498 kBACKSPACE
+09:47:790 701 498 kBACKSPACE
+09:47:957 692 498 kBACKSPACE
+10:01:734 378 275 Ld
+10:01:901 378 275 Rd
+10:02:061 378 275 Lu
+10:02:062 378 275 Ru
+10:03:149 1217 268 Md
+10:03:269 1217 268 Mu
+10:04:493 1043 719 kSHIFT
+10:04:837 1043 719 kY
+10:07:975 1082 708 Md
+10:08:077 1082 708 Mu
+10:13:264 767 291 Md
+10:13:381 767 291 Mu
+10:25:838 759 434 Md
+10:26:373 759 434 Mu
+10:28:517 759 434 kALT
+10:29:017 759 434 kALT
+10:29:051 759 434 kALT
+10:29:083 759 434 kALT
+10:29:116 759 434 kALT
+10:29:150 759 434 kALT
+10:29:183 759 434 kALT
+10:29:215 759 434 kALT
+10:29:248 759 434 kALT
+10:29:282 759 434 kALT
+10:29:314 759 434 kALT
+10:29:347 759 434 kALT
+10:29:381 759 434 kALT
+10:29:413 759 434 kALT
+10:29:446 759 434 kALT
+10:29:479 759 434 kALT
+10:29:512 759 434 kALT
+10:29:545 759 434 kALT
+10:29:578 759 434 kALT
+10:29:611 759 434 kALT
+10:29:644 759 434 kALT
+10:29:677 759 434 kALT
+10:29:709 759 434 kUP_ARROW
+10:31:926 759 414 Md
+10:32:165 759 414 Mu
+10:35:568 743 407 Md
+10:35:749 743 407 Mu
+10:37:998 742 410 Md
+10:38:149 742 410 Mu
+10:40:461 1225 394 Md
+10:40:509 1225 394 Rd
+10:40:669 1225 394 Ru
+10:40:678 1225 394 Mu
+10:41:664 404 472 Ld
+10:41:910 404 472 Rd
+10:42:125 404 472 Ru
+10:42:197 404 472 Lu
+10:42:879 1094 325 Md
+10:42:926 1094 325 Rd
+10:43:181 1094 325 Ru
+10:43:197 1094 325 Mu
+10:43:702 812 403 Ld
+10:43:765 812 403 Rd
+10:43:885 812 403 Ru
+10:43:896 814 404 Lu
+10:45:382 1128 360 Md
+10:45:445 1128 360 Rd
+10:45:589 1128 360 Ru
+10:45:605 1128 360 Mu
+10:46:182 1128 360 kSHIFT
+10:46:422 1128 360 kY
+10:49:255 1178 360 Md
+10:49:357 1178 360 Mu
+10:50:166 375 446 Md
+10:50:269 375 446 Mu
+11:42:278 748 554 Md
+11:42:469 748 554 Mu
+11:43:374 748 554 kALT
+11:43:678 748 554 kUP_ARROW
+11:45:518 748 534 Md
+11:45:669 748 534 Mu
+11:47:567 748 534 Md
+11:47:774 748 534 Mu
+11:48:142 748 534 Md
+11:48:269 748 534 Mu
+11:51:334 748 539 Md
+11:51:566 748 539 Mu
+11:54:751 748 540 Md
+11:54:918 748 540 Mu
+11:56:735 746 539 Md
+11:56:917 746 539 Mu
+12:00:142 746 541 Md
+12:00:261 746 542 Mu
+12:06:175 760 530 Ld
+12:06:542 760 530 Rd
+12:06:685 760 530 Ru
+12:06:701 760 530 Lu
+12:08:279 999 389 Md
+12:08:390 999 389 Rd
+12:08:494 999 389 Ru
+12:08:590 999 389 Mu
+12:09:125 999 389 kSHIFT
+12:09:446 999 389 kY
+12:13:622 1049 389 Md
+12:13:742 1049 389 Mu
+12:14:440 351 571 Md
+12:14:549 351 571 Mu
+12:24:325 678 16 kF10
+12:34:262 364 482 kBACKSPACE
+12:34:622 349 496 kBACKSPACE
+12:35:558 340 496 kBACKSPACE
+12:37:110 819 696 kF10
+12:42:431 368 572 Md
+12:42:686 368 572 Mu
+12:44:039 368 572 kALT
+12:44:334 368 572 kUP_ARROW
+12:44:645 368 552 kUP_ARROW
+12:46:919 368 532 Md
+12:47:062 368 532 Mu
+12:48:246 368 532 Ld
+12:48:375 368 532 Rd
+12:48:518 368 532 Lu
+12:48:542 368 532 Ru
+12:49:726 1090 454 Md
+12:49:790 1090 454 Rd
+12:49:893 1090 454 Ru
+12:49:910 1090 454 Mu
+12:50:398 702 536 Ld
+12:50:438 702 536 Rd
+12:50:542 702 536 Ru
+12:50:565 702 536 Lu
+12:51:703 1016 456 Md
+12:51:734 1016 456 Rd
+12:51:894 1016 456 Ru
+12:51:910 1016 456 Mu
+14:24:286 546 752 kCTRL
+14:24:575 472 747 kV
+14:31:407 410 609 Md
+14:31:479 410 609 Rd
+14:31:678 410 609 Mu
+14:31:686 410 609 Ru
+15:50:944 445 7 kF10
+15:56:832 355 493 kBACKSPACE
+15:57:332 349 496 kBACKSPACE
+15:57:364 340 496 kBACKSPACE
+15:57:397 336 496 kBACKSPACE
+15:57:430 327 496 kBACKSPACE
+15:57:463 318 496 kBACKSPACE
+15:57:496 309 496 kBACKSPACE
+15:57:529 304 496 kBACKSPACE
+15:57:736 299 496 kBACKSPACE
+15:57:888 290 496 kBACKSPACE
+15:58:388 282 496 kBACKSPACE
+15:58:420 268 496 kBACKSPACE
+15:58:453 259 496 kBACKSPACE
+15:58:486 251 496 kBACKSPACE
+15:58:736 241 496 kBACKSPACE
+15:58:887 234 496 kBACKSPACE
+15:59:752 220 496 kD
+15:59:756 229 496 kO
+16:00:255 238 496 kC
+16:00:432 246 496 kU
+16:00:640 254 496 kM
+16:00:721 269 496 kE
+16:00:823 277 496 kN
+16:00:896 286 496 kT
+16:01:007 291 496 kS
+16:01:408 303 496 kP
+16:01:495 312 496 kN
+16:01:568 321 496 kG
+16:03:904 602 699 kF10
+16:42:602 775 522 Ld
+16:42:682 775 522 Rd
+16:42:848 775 522 Lu
+16:42:872 775 522 Ru
+16:45:825 1093 283 Md
+16:45:888 1093 283 Rd
+16:46:152 1093 283 Ru
+16:46:400 1093 283 Mu
+16:47:160 1093 283 kSHIFT
+16:47:480 1093 283 kY
+16:50:252 1143 283 Md
+16:50:344 1143 283 Mu
+16:50:976 479 574 Md
+16:51:072 479 574 Mu
+16:52:657 766 556 Ld
+16:52:720 766 556 Rd
+16:52:856 766 556 Lu
+16:52:872 766 556 Ru
+16:53:680 1076 413 Md
+16:53:736 1076 413 Rd
+16:53:872 1076 413 Ru
+16:53:920 1076 413 Mu
+16:54:432 1076 413 kSHIFT
+16:54:616 1076 413 kY
+16:57:304 1126 413 Md
+16:57:424 1126 413 Mu
+16:58:048 469 505 Md
+16:58:152 469 505 Mu
+17:02:129 233 530 Md
+17:02:296 233 530 Mu
+17:03:921 233 534 Md
+17:04:120 233 534 Mu
+22:08:413 741 284 Ld
+22:08:499 741 284 Rd
+22:08:627 741 284 Lu
+22:08:627 741 284 Ru
+22:09:877 910 244 Md
+22:09:931 910 244 Rd
+22:10:075 910 244 Mu
+22:10:091 910 244 Ru
+22:10:765 748 392 Ld
+22:10:851 748 392 Rd
+22:10:947 748 392 Ru
+22:10:955 748 392 Lu
+22:11:653 888 335 Md
+22:11:683 888 335 Rd
+22:11:820 888 335 Ru
+22:11:820 888 335 Mu
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/15.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/15.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/15.exp	(revision 1510)
@@ -0,0 +1,64 @@
+V 2
+U bryce
+D 13Feb2020[13:22]
+M bryce
+d 13Feb2020[13:22]
+E 300
+e 300
+Z
+
+S T 6
+s 13Feb2020[13:22]
+d 0 0 100 100
+P 15 58
+T @i: resources-public\images\6ecba83490748330967872577.png 75
+o bryce
+v S
+f sb30
+t -1.0
+b 0.0
+m 0.0
+w 896
+h -1.0
+_sl F
+
+S T 5
+s 13Feb2020[13:22]
+d 0 0 0 100
+P 706 61
+T @ItemTemplate
+H 10
+N 20
+o davidb
+v S
+f Amaranth_r42
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 9
+s 13Feb2020[13:22.13]
+d 0 0 0 100
+P 509 269
+T jjjj
+o bryce
+v S
+f Amaranth_r42
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:04
+DarkTime:00:00:00
+22:21:690 261 311 Ld
+22:21:775 261 311 Lu
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/18.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/18.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/18.exp	(revision 1510)
@@ -0,0 +1,52 @@
+V 0
+U bryce
+D 13Feb2020[13:46]
+M bryce
+d 13Feb2020[13:46]
+E 300
+e 300
+Z
+
+S T 7
+s 13Feb2020[13:46.20]
+d 50 50 50 100
+P -137 68
+T @ao: 2
+F overlayset3
+R -150
+N 50
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 8
+s 13Feb2020[13:46.20]
+P 11 503
+T @old
+R 9
+I 114
+o bryce
+n F
+v S
+f Roboto Condensed_r15
+t -1.0
+b 0.0
+m 0.0
+w 116
+k R
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:00
+DarkTime:00:00:00
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/19.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/19.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/19.exp	(revision 1510)
@@ -0,0 +1,52 @@
+V 0
+U bryce
+D 13Feb2020[13:46]
+M bryce
+d 13Feb2020[13:46]
+E 300
+e 300
+Z
+
+S T 7
+s 13Feb2020[13:46.26]
+d 50 50 50 100
+P -137 68
+T @ao: 2
+F overlayset3
+R -150
+N 50
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 8
+s 13Feb2020[13:46.26]
+P 11 503
+T @old
+R 9
+I 114
+o bryce
+n F
+v S
+f Roboto Condensed_r15
+t -1.0
+b 0.0
+m 0.0
+w 116
+k R
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:00
+DarkTime:00:00:00
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/2.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/2.exp	(revision 1509)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/2.exp	(revision 1510)
@@ -1,7 +1,9 @@
-V 58
+V 20
 U davidb
 D 17Nov2015[09:35]
 M authadmin
-d 12Apr2019[12:41]
+d 13Feb2020[16:13]
+E 300
+e 300
 Z
 
@@ -17,4 +19,5 @@
 m 0.0
 h 0.0
+_sl F
 
 S P 15
@@ -53,10 +56,11 @@
 m 0.0
 h -1.0
+_sl F
 
 S T 182
 s 17Nov2015[09:35.54]
 P 322 130
-T “If Aphrodite be the godess of love, 
-T then let Expeditee be the godess of
+T “If Aphrodite be the goddess of love, 
+T then let Expeditee be the goddess of
 T Getting Things Done”
 o davidb
@@ -67,4 +71,5 @@
 m 0.0
 h -1.0
+_sl F
 
 S P 18
@@ -103,35 +108,81 @@
 m 0.0
 h -1.0
-
-S P 369
-s 14Apr2016[11:40.20]
-d 70 70 0 100
-P 46 338
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 375 384
-c 385 386
-
-S P 370
-s 14Apr2016[11:40.20]
-d 70 70 0 100
-P 988 338
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 375 378
-c 385 387
-
-S T 368
-s 14Apr2016[11:40.20]
-d 0 0 0 100
-P 92 414
-T Interative-Tutorial
+_sl F
+
+S P 618
+s 14Apr2016[14:03.24]
+d 70 70 0 100
+P 410 393
+e 100 100 70 100
+o davidb
+v S
+h 2.0
+l 622 625
+c 157
+
+S P 619
+s 14Apr2016[14:03.24]
+d 70 70 0 100
+P 607 393
+e 100 100 70 100
+o davidb
+v S
+h 2.0
+l 622 623
+c 157
+
+S T 611
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 425 445
+T Tutorial
 F tutorialshomenew1
 o davidb
 v S
+f Amaranth_r49
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 612
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 324 502
+T Settings
+X GotoSettings
+o davidb
+v S
+f Amaranth_r51
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 613
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 563 502
+T Help
+F documentation1
+o davidb
+v S
+f Amaranth_r51
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 614
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 124 567
+T Apps
+F 3
+o davidb
+v S
 f Amaranth_r53
 t -1.0
@@ -139,11 +190,12 @@
 m 0.0
 h -1.0
-
-S T 366
-s 14Apr2016[11:40.20]
-d 0 0 0 100
-P 828 414
-T HELP
-F documentation1
+_sl F
+
+S T 615
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 267 567
+T Documents
+F mydocuments1
 o davidb
 v S
@@ -153,67 +205,10 @@
 m 0.0
 h -1.0
-
-S T 365
-s 14Apr2016[11:40.20]
-d 0 0 0 100
-P 587 414
-T Apps
-F home2
-o davidb
-v S
-f Amaranth_r53
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S P 371
-s 14Apr2016[11:40.20]
-d 70 70 0 100
-P 988 447
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 378 381
-c 387 388
-
-S P 372
-s 14Apr2016[11:40.20]
-d 70 70 0 100
-P 46 447
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 384 381
-c 386 388
-
-S P 340
-s 14Apr2016[10:24.00]
-d 70 70 0 100
-P 46 489
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 350 353
-c 356 357
-
-S P 339
-s 14Apr2016[10:24.00]
-d 70 70 0 100
-P 988 489
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 350 347
-c 356 354
-
-S T 336
-s 14Apr2016[10:23.23]
-d 0 0 0 100
-P 586 566
+_sl F
+
+S T 616
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 550 567
 T Pictures
 F mypictures1
@@ -225,9 +220,10 @@
 m 0.0
 h -1.0
-
-S T 335
-s 14Apr2016[10:23.00]
-d 0 0 0 100
-P 828 566
+_sl F
+
+S T 617
+s 14Apr2016[14:03.24]
+d 0 30 0 100
+P 757 567
 T Music
 F mymusic1
@@ -239,54 +235,27 @@
 m 0.0
 h -1.0
-
-S T 337
-s 14Apr2016[10:23.39]
-d 0 0 0 100
-P 86 566
-T Profile
-X gotoUserSettingsFrame
-o davidb
-v S
-f Amaranth_i53
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S T 362
-s 14Apr2016[10:25.14]
-d 0 0 0 100
-P 279 566
-T Documents
-F mydocuments1
-o davidb
-v S
-f Amaranth_r53
-t -1.0
-b 0.0
-m 0.0
-h -1.0
-
-S P 341
-s 14Apr2016[10:24.00]
-d 70 70 0 100
-P 46 598
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 353 344
-c 357 355
-
-S P 338
-s 14Apr2016[10:24.00]
-d 70 70 0 100
-P 988 598
-e 100 100 50 100
-o davidb
-v S
-h 2.0
-l 347 344
-c 354 355
+_sl F
+
+S P 621
+s 14Apr2016[14:03.24]
+d 70 70 0 100
+P 16 584
+e 100 100 70 100
+o davidb
+v S
+h 2.0
+l 625 624
+c 158
+
+S P 620
+s 14Apr2016[14:03.24]
+d 70 70 0 100
+P 992 584
+e 100 100 70 100
+o davidb
+v S
+h 2.0
+l 623 624
+c 158
 
 Z
@@ -304,27 +273,15 @@
 s 18 17
 
-L 375 1
-s 370 369
-
-L 384 1
-s 369 372
-
-L 378 1
-s 371 370
-
-L 381 1
-s 372 371
-
-L 350 1
-s 339 340
-
-L 353 1
-s 340 341
-
-L 347 1
-s 338 339
-
-L 344 1
-s 341 338
+L 622 1
+s 619 618
+
+L 625 1
+s 621 618
+
+L 623 1
+s 620 619
+
+L 624 1
+s 620 621
 
 Z
@@ -342,31 +299,21 @@
 s 18 17
 
-C 385 3
-s 370 369
-
-C 386 2
-s 369 372
-
-C 387 2
-s 371 370
-
-C 388 3
-s 372 371
-
-C 356 3
-s 339 340
-
-C 357 2
-s 340 341
-
-C 354 2
-s 338 339
-
-C 355 3
-s 341 338
+C 157 3
+s 619 618
+
+C 158 3
+s 620 621
 
 Z
 
-ActiveTime:00:50:52
-DarkTime:01:07:50
-41:53:425 1183 537 kRIGHT_ARROW
+ActiveTime:01:11:52
+DarkTime:02:38:27
+13:05:383 765 555 Ld
+13:05:455 765 555 Rd
+13:05:566 765 555 Lu
+13:05:599 765 555 Ru
+13:06:808 1053 418 Md
+13:06:831 1053 418 Rd
+13:06:982 1053 418 Ru
+13:06:999 1053 418 Mu
+13:07:219 1074 424 kLEFT_ARROW
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/20.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/20.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/20.exp	(revision 1510)
@@ -0,0 +1,52 @@
+V 0
+U bryce
+D 13Feb2020[13:49]
+M bryce
+d 13Feb2020[13:49]
+E 300
+e 300
+Z
+
+S T 7
+s 13Feb2020[13:49.07]
+d 50 50 50 100
+P -137 68
+T @ao: 2
+F overlayset3
+R -150
+N 50
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 8
+s 13Feb2020[13:49.07]
+P 11 605
+T @old
+R 9
+I 114
+o bryce
+n F
+v S
+f Roboto Condensed_r15
+t -1.0
+b 0.0
+m 0.0
+w 116
+k R
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:00
+DarkTime:00:00:00
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/21.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/21.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/21.exp	(revision 1510)
@@ -0,0 +1,146 @@
+V 5
+U bryce
+D 13Feb2020[13:54]
+M bryce
+d 13Feb2020[13:55]
+E 300
+e 300
+Z
+
+S T 7
+s 13Feb2020[13:54.18]
+d 50 50 50 100
+P -137 68
+T @ao: 2
+F overlayset3
+R -150
+N 50
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 11
+s 13Feb2020[13:54.39]
+d 100 0 0 100
+P 487 199
+e 100 59 59 100
+o bryce
+v S
+h 1.7866071
+l 19 25
+
+S P 12
+s 13Feb2020[13:54.39]
+d 100 0 0 100
+P 388 199
+e 100 59 59 100
+o bryce
+v S
+h 1.7866071
+l 19 22
+
+S P 13
+s 13Feb2020[13:54.39]
+d 100 0 0 100
+P 537 285
+e 100 59 59 100
+o bryce
+v S
+h 1.7866071
+l 25 31
+
+S P 14
+s 13Feb2020[13:54.39]
+d 100 0 0 100
+P 338 285
+e 100 59 59 100
+o bryce
+v S
+h 1.7866071
+l 22 28
+
+S P 15
+s 13Feb2020[13:54.39]
+d 100 0 0 100
+P 487 372
+e 100 59 59 100
+o bryce
+v S
+h 1.7866071
+l 31 34
+
+S P 16
+s 13Feb2020[13:54.39]
+d 100 0 0 100
+P 388 372
+e 100 59 59 100
+o bryce
+v S
+h 1.7866071
+l 28 34
+
+S T 8
+s 13Feb2020[13:54.18]
+P 11 503
+T @old
+F home-old3
+R 9
+I 114
+o bryce
+n F
+v S
+f Roboto Condensed_r15
+t -1.0
+b 0.0
+m 0.0
+w 116
+k R
+h -1.0
+_sl F
+
+S T 37
+s 13Feb2020[13:55.28]
+P 908 580
+T jj
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+Z
+
+L 19 1
+s 11 12
+
+L 25 1
+s 13 11
+
+L 22 1
+s 12 14
+
+L 31 1
+s 15 13
+
+L 28 1
+s 14 16
+
+L 34 1
+s 16 15
+
+Z
+
+Z
+
+ActiveTime:00:00:08
+DarkTime:00:00:00
+55:37:979 742 651 Ld
+55:38:063 742 651 Lu
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/23.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/23.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/23.exp	(revision 1510)
@@ -0,0 +1,108 @@
+V 2
+U bryce
+D 13Feb2020[13:58]
+M bryce
+d 13Feb2020[13:58]
+E 300
+e 300
+Z
+
+S T 7
+s 13Feb2020[13:58.15]
+d 50 50 50 100
+P -137 68
+T @ao: 2
+F overlayset3
+R -150
+N 50
+o bryce
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 27
+s 13Feb2020[13:58.25]
+d 100 0 0 100
+P 1259 332
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 30
+c 22 23
+
+S T 8
+s 13Feb2020[13:58.15]
+P 11 503
+T @old
+F home-old4
+R 9
+I 114
+o bryce
+n F
+v S
+f Roboto Condensed_r15
+t -1.0
+b 0.0
+m 0.0
+w 116
+k R
+h -1.0
+_sl F
+
+S P 25
+s 13Feb2020[13:58.25]
+d 100 0 0 100
+P 770 568
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 29
+c 21 24
+
+S P 26
+s 13Feb2020[13:58.25]
+d 100 0 0 100
+P 1259 568
+e 100 59 59 100
+o bryce
+v S
+h 2.0
+l 29 30
+c 21 23
+
+Z
+
+L 30 1
+s 26 27
+
+L 29 1
+s 25 26
+
+Z
+
+C 23 2
+s 26 27
+
+C 21 3
+s 25 26
+
+Z
+
+ActiveTime:00:00:06
+DarkTime:00:00:00
+58:25:173 1259 568 Rd
+58:25:273 1259 568 Ru
+58:25:860 770 328 Md
+58:25:978 770 332 Mu
+58:27:556 770 336 Rd
+58:27:569 770 336 Md
+58:27:673 770 336 Mu
+58:27:713 770 336 Ru
+58:38:756 90 532 Ld
+58:38:841 90 532 Lu
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/3.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/3.exp	(revision 1509)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/3.exp	(revision 1510)
@@ -1,7 +1,10 @@
-V 59
+V 135
 U authadmin
 D 14Apr2016[13:55]
 M bryce
-d 12Apr2019[12:49]
+d 13Feb2020[14:17]
+B 100 100 39 100
+E 300
+e 300
 Z
 
@@ -20,4 +23,5 @@
 w 95
 h -1.0
+_sl F
 
 S T 113
@@ -33,4 +37,5 @@
 m 0.0
 h -1.0
+_sl F
 
 S T 214
@@ -47,5 +52,6 @@
 m 0.0
 h -1.0
-p 40
+p 400
+_sl F
 
 S T 190
@@ -61,5 +67,6 @@
 m 0.0
 h 0.0
-p 40
+p 400
+_sl F
 
 S T 23
@@ -77,5 +84,6 @@
 m 0.0
 h -1.0
-p 41
+p 411
+_sl F
 
 S T 16
@@ -93,5 +101,51 @@
 m 0.0
 h -1.0
-p 41
+p 411
+_sl F
+
+S T 350
+s 13Feb2020[13:49.07]
+d 0 0 50 100
+P 1010 202
+T 13Feb2020[13:49] - Mindmap Session
+F 20
+o bryce
+v S
+f Amaranth_r22
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 369
+s 13Feb2020[13:54.18]
+d 0 0 50 100
+P 586 249
+T 13Feb2020[13:54] - Mindmap Session
+F 21
+o bryce
+v S
+f Amaranth_r22
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 372
+s 13Feb2020[13:58.15]
+d 0 0 50 100
+P 584 284
+T 13Feb2020[13:58] - Mindmap Session
+F 23
+o bryce
+v S
+f Amaranth_r22
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
 
 S T 270
@@ -107,4 +161,6 @@
 m 0.0
 h 0.0
+p 400
+_sl F
 
 S T 236
@@ -120,4 +176,6 @@
 m 0.0
 h 0.0
+p 400
+_sl F
 
 S T 122
@@ -135,5 +193,6 @@
 m 0.0
 h -1.0
-p 41
+p 411
+_sl F
 
 S T 13
@@ -151,5 +210,6 @@
 m 0.0
 h -1.0
-p 41
+p 411
+_sl F
 
 S T 314
@@ -165,4 +225,6 @@
 m 0.0
 h 0.0
+p 400
+_sl F
 
 S T 347
@@ -178,5 +240,6 @@
 m 0.0
 h 0.0
-p 40
+p 400
+_sl F
 
 S T 342
@@ -185,4 +248,5 @@
 P 522 561
 T Encryption
+F encryption2
 N 520
 o authadmin
@@ -193,5 +257,6 @@
 m 0.0
 h -1.0
-p 41
+p 411
+_sl F
 
 S T 279
@@ -209,109 +274,15 @@
 m 0.0
 h -1.0
-p 41
-
-Z
-
-Z
-
-Z
-
-ActiveTime:00:21:50
-DarkTime:00:24:32
-49:35:687 366 533 Ld
-49:35:844 366 533 Rd
-49:36:003 366 533 Lu
-49:36:004 366 533 Ru
-49:38:011 196 125 Md
-49:38:083 196 125 Rd
-49:38:251 196 125 Ru
-49:38:259 196 125 Mu
-49:40:022 342 182 Ld
-49:40:204 342 182 Rd
-49:40:355 342 182 Ru
-49:40:371 342 182 Lu
-49:41:550 174 88 Md
-49:41:700 174 88 Rd
-49:41:827 174 88 Ru
-49:41:828 174 88 Mu
-49:42:798 877 158 Ld
-49:42:893 877 158 Rd
-49:43:051 877 158 Lu
-49:43:052 877 158 Ru
-49:44:387 230 83 Md
-49:44:466 230 83 Rd
-49:44:642 230 83 Ru
-49:44:651 230 83 Mu
-49:45:691 372 518 Ld
-49:45:835 372 518 Rd
-49:46:026 372 518 Ru
-49:46:050 372 518 Lu
-49:47:380 150 43 Md
-49:47:539 150 43 Rd
-49:48:491 150 43 Ru
-49:48:507 150 43 Mu
-49:49:315 812 534 Ld
-49:49:494 812 535 Rd
-49:49:659 812 535 Ru
-49:49:667 812 535 Lu
-49:50:837 175 88 Md
-49:50:867 175 88 Rd
-49:51:059 175 88 Ru
-49:51:059 175 88 Mu
-50:04:763 334 152 Ld
-50:04:861 334 152 Rd
-50:04:987 334 152 Ru
-50:05:003 334 152 Lu
-50:06:228 153 82 Md
-50:06:357 153 82 Rd
-50:06:523 153 82 Ru
-50:06:524 153 82 Mu
-50:09:821 505 55 kF10
-50:11:080 505 55 Ld
-50:11:213 341 104 Rd
-50:11:339 341 104 Ru
-50:11:347 341 104 Lu
-50:12:654 210 57 Md
-50:12:733 210 57 Rd
-50:12:883 210 57 Ru
-50:12:884 210 57 Mu
-50:13:679 131 298 Ld
-50:13:765 131 298 Rd
-50:13:915 131 298 Ru
-50:13:923 131 298 Lu
-50:14:909 175 119 Md
-50:15:069 175 119 Rd
-50:15:387 175 119 Ru
-50:15:443 175 119 Mu
-50:16:702 702 305 Ld
-50:16:822 702 305 Rd
-50:16:963 702 305 Lu
-50:16:971 702 305 Ru
-50:18:212 167 107 Md
-50:18:269 167 107 Rd
-50:18:435 167 107 Ru
-50:18:443 167 107 Mu
-50:21:917 1237 260 kSHIFT
-50:22:285 1237 260 kP
-50:22:558 1249 260 kE
-50:22:611 1259 260 kR
-50:22:789 1267 260 kM
-50:22:876 1285 260 kI
-50:23:092 1291 260 kS
-50:23:254 1300 260 kS
-50:23:380 1309 260 kI
-50:23:451 1314 260 kO
-50:23:491 1326 260 kN
-50:23:659 1338 260 kSHIFT
-50:28:430 1337 252 Md
-50:28:539 1337 252 Mu
-50:31:141 845 102 Md
-50:31:283 845 102 Mu
-50:33:998 901 187 Ld
-50:34:134 901 187 Rd
-50:34:267 901 187 Lu
-50:34:275 901 187 Ru
-50:35:422 1095 174 Md
-50:35:573 1095 174 Rd
-50:35:731 1095 174 Ru
-50:35:787 1095 174 Mu
+p 411
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:34:32
+DarkTime:00:25:54
+20:59:531 917 622 Ld
+20:59:602 917 622 Lu
Index: /trunk/src/org/expeditee/assets/resources-private/framesets/home/frame.inf
===================================================================
--- /trunk/src/org/expeditee/assets/resources-private/framesets/home/frame.inf	(revision 1509)
+++ /trunk/src/org/expeditee/assets/resources-private/framesets/home/frame.inf	(revision 1510)
@@ -1,1 +1,1 @@
-home5
+home24
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/authentication/1.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/authentication/1.exp	(revision 1509)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/authentication/1.exp	(revision 1510)
@@ -1,9 +1,11 @@
-V 174
+V 192
 p 400
 U authadmin
 D 07Jan2019[14:34]
-M authadmin
-d 05Dec2019[16:30]
+M ${USER.NAME}
+d 10Feb2020[16:42]
 B 100 100 39 100
+E 300
+e 300
 Z
 
@@ -272,17 +274,37 @@
 Z
 
-ActiveTime:5208691:17:01
-DarkTime:-5207756:-22:-36
-30:40:128 875 299 Rd
-30:40:231 875 299 Ru
-30:41:779 854 302 Rd
-30:41:857 852 302 Ru
-30:58:750 388 283 Rd
-30:58:813 388 283 Ru
-31:00:138 869 299 Rd
-31:00:231 869 299 Ru
-31:01:549 382 334 Rd
-31:01:642 382 334 Ru
-31:04:348 881 299 Md
-31:04:442 881 299 Mu
-31:05:727 861 427 kRIGHT_ARROW
+ActiveTime:9600658:59:05
+DarkTime:-9597855:-50:-10
+42:56:700 748 282 Ld
+42:56:780 748 282 Lu
+42:57:836 758 429 Md
+42:58:039 758 429 Rd
+42:58:453 758 429 Ru
+42:58:484 758 429 Mu
+42:59:128 758 369 Md
+42:59:160 758 369 Rd
+42:59:404 758 369 Mu
+42:59:412 758 369 Ru
+43:01:622 775 292 Md
+43:01:676 775 292 Rd
+43:01:916 775 292 Ru
+43:01:917 775 292 Mu
+43:04:863 775 292 kCTRL
+43:05:362 775 292 kCTRL
+43:05:394 775 292 kCTRL
+43:05:427 775 292 kCTRL
+43:05:460 775 292 kCTRL
+43:05:496 775 292 kCTRL
+43:05:526 775 292 kCTRL
+43:05:558 775 292 kCTRL
+43:05:591 775 292 kCTRL
+43:05:624 775 292 kCTRL
+43:05:657 775 292 kCTRL
+43:05:690 775 292 kCTRL
+43:05:723 775 292 kCTRL
+43:05:756 775 292 kCTRL
+43:05:789 775 292 kCTRL
+43:05:822 775 292 kCTRL
+43:05:855 775 292 kCTRL
+43:05:889 775 292 kCTRL
+43:05:908 775 292 kS
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/0.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/0.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/0.exp	(revision 1510)
@@ -0,0 +1,61 @@
+V 3
+U authadmin
+D 05Feb2020[15:32]
+M authadmin
+d 10Feb2020[14:11]
+E 300
+e 300
+Z
+
+S T 3
+s 10Feb2020[14:11.03]
+d 50 50 50 100
+P 1525 30
+T @ao: 1
+F 1
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:04
+DarkTime:00:00:00
+11:11:035 1128 309 Md
+11:11:184 1128 309 Mu
+11:14:146 979 189 kSHIFT
+11:14:538 979 189 kP
+11:14:770 989 189 kO
+11:14:921 998 189 kS
+11:15:090 1005 189 kI
+11:15:243 1010 189 kT
+11:15:336 1014 189 kI
+11:15:384 1019 189 kO
+11:15:448 1029 189 kN
+11:15:691 1038 189 kSHIFT
+11:21:444 1011 176 Rd
+11:21:528 1011 176 Ru
+11:22:347 1543 14 Md
+11:22:456 1543 14 Mu
+11:25:859 1108 179 kBACKSPACE
+11:25:994 1097 189 kBACKSPACE
+11:27:476 1036 179 Rd
+11:27:568 1036 179 Ru
+11:28:715 1538 13 Md
+11:28:824 1538 13 Mu
+11:31:292 1143 316 Md
+11:31:361 1143 316 Rd
+11:31:520 1143 316 Ru
+11:31:552 1143 316 Mu
+11:32:404 1030 174 Md
+11:32:528 1030 174 Mu
+11:33:607 1147 306 kRIGHT_ARROW
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/1.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/1.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/1.exp	(revision 1510)
@@ -0,0 +1,365 @@
+V 24
+U authadmin
+D 05Feb2020[15:32]
+M authadmin
+d 07Feb2020[14:17]
+E 300
+e 300
+Z
+
+S P 528
+s 07Feb2020[13:24.35]
+d 0 0 0 100
+P 1678 799
+e 100 59 59 100
+H -10
+I 70
+o authadmin
+v S
+h 1.0
+l 532
+c 524
+
+S P 529
+s 07Feb2020[13:24.35]
+d 0 0 0 100
+P 0 799
+e 100 59 59 100
+R 0
+I 70
+o authadmin
+v S
+h 1.0
+l 532
+c 524
+
+S T 415
+s 05Feb2020[16:27.09]
+d 0 0 100 100
+P 952 830
+T -->
+R 950
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 209
+s 05Feb2020[15:56.48]
+d 0 0 100 100
+P 28 830
+T FrameEncryptionLabel
+X append
+R 15
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 343
+s 05Feb2020[16:18.03]
+d 0 0 100 100
+P 373 830
+T EncryptionLabel
+X append
+R 360
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 267
+s 05Feb2020[16:07.15]
+d 0 0 100 100
+P 663 830
+T FrameEncryptionPermission
+X append
+R 650
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 412
+s 05Feb2020[16:26.31]
+d 0 0 100 100
+P 1043 830
+T Example [Only Owner can Encrypt Frame]
+X GenFrameEncryption300
+R 1030
+I 45
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 353
+s 05Feb2020[16:19.12]
+d 0 0 100 100
+P 663 860
+T ItemEncryptionPermission
+X append
+R 650
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 322
+s 05Feb2020[16:16.13]
+d 0 0 100 100
+P 28 860
+T HomogeneousEncryptionLabel
+X append
+R 15
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 511
+s 05Feb2020[16:37.25]
+d 0 0 100 100
+P 952 860
+T -->
+R 950
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 454
+s 05Feb2020[16:32.44]
+d 0 0 100 100
+P 1043 860
+T Example [Can Encrypt Items with Labels That Owner Has]
+X GenItemEncryption322
+R 1030
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 533
+s 07Feb2020[14:00.29]
+d 0 0 100 100
+P 373 860
+T GenerateSecret
+X append
+R 360
+I 15
+o authadmin
+v S
+f mr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S P 114
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P -5 881
+e 40 60 60 100
+R -5
+I -12
+o authadmin
+v S
+h 1.0
+l 117 118
+c 110 109
+
+S P 115
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P 1683 881
+e 40 60 60 100
+H -15
+I -12
+o authadmin
+v S
+h 1.0
+l 118 119
+c 109 111
+
+S P 201
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P -5 884
+e 59 100 59 100
+R -5
+I -15
+o authadmin
+v S
+h 1.0
+l 204 205
+c 197 196
+
+S P 202
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P 1683 884
+e 59 100 59 100
+H -15
+I -15
+o authadmin
+v S
+h 1.0
+l 205 206
+c 196 198
+
+S P 200
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P -5 1272
+e 59 100 59 100
+R -5
+o authadmin
+v S
+h 1.0
+l 204 203
+c 197 195
+
+S P 199
+s 05Feb2020[15:55.01]
+d 0 0 0 100
+P 1683 1272
+e 59 100 59 100
+H -15
+o authadmin
+v S
+h 1.0
+l 206 203
+c 198 195
+
+S P 112
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P 1683 2278
+e 40 60 60 100
+H -15
+o authadmin
+v S
+h 1.0
+l 119 116
+c 111 108
+
+S P 113
+s 05Feb2020[15:38.44]
+d 0 0 0 100
+P -5 2278
+e 40 60 60 100
+R -5
+o authadmin
+v S
+h 1.0
+l 117 116
+c 110 108
+
+Z
+
+L 532 1
+s 528 529
+
+L 117 1
+s 113 114
+
+L 118 1
+s 114 115
+
+L 119 1
+s 115 112
+
+L 204 1
+s 200 201
+
+L 205 1
+s 201 202
+
+L 206 1
+s 202 199
+
+L 203 1
+s 199 200
+
+L 116 1
+s 112 113
+
+Z
+
+C 524 3
+s 528 529
+
+C 110 2
+s 113 114
+
+C 109 3
+s 114 115
+
+C 111 2
+s 115 112
+
+C 197 2
+s 200 201
+
+C 196 3
+s 201 202
+
+C 198 2
+s 202 199
+
+C 195 3
+s 199 200
+
+C 108 3
+s 112 113
+
+Z
+
+ActiveTime:00:25:09
+DarkTime:00:03:16
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/2.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/2.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/2.exp	(revision 1510)
@@ -0,0 +1,313 @@
+V 14
+U authadmin
+D 07Feb2020[14:16]
+M authadmin
+d 10Feb2020[14:11]
+B 100 100 39 100
+E 300
+e 300
+Z
+
+S T 13
+s 07Feb2020[14:17.25]
+d 50 50 50 100
+P 1525 30
+T @ao: 1
+F 1
+o authadmin
+v S
+f tr18
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 21
+s 07Feb2020[14:19.45]
+d 0 0 0 100
+P 105 65
+T Secure Expeditee:
+o authadmin
+v S
+f Metamorphous_r36
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 56
+s 07Feb2020[14:39.55]
+d 0 0 0 100
+P 1499 68
+T @ItemTemplate
+o authadmin
+v S
+f Amaranth_r24
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 20
+s 07Feb2020[14:19.28]
+d 0 0 0 100
+P 20 104
+T 🔒
+o authadmin
+v S
+f tr74
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 22
+s 07Feb2020[14:19.51]
+d 0 0 0 100
+P 105 115
+T Sleek like Aphroditē–Wise like Athēnâ.
+o authadmin
+v S
+f Metamorphous_r36
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 38
+s 07Feb2020[14:25.07]
+d 0 0 0 100
+P 105 165
+T Encryption Cockpit
+o authadmin
+v S
+f Metamorphous_r36
+t -1.0
+b 0.0
+m 0.0
+h -1.0
+_sl F
+
+S T 59
+s 10Feb2020[14:01.44]
+d 0 0 0 100
+P 36 220
+T Welcome to the Expeditee Encryption Cockpit.  This collection of frames is designed let you play with encryption and surrogates before using this functionality in a more serious situation.  It can also be used to take a copy of the active overlay supplying related actions.  
+o authadmin
+v S
+f Amaranth_r24
+t -1.0
+b 0.0
+m 0.0
+w 950
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:03:45
+DarkTime:00:10:34
+11:35:258 1529 15 Md
+11:35:424 1529 15 Mu
+11:46:044 1500 129 Md
+11:46:145 1500 129 Mu
+11:49:268 1621 55 Md
+11:49:472 1621 55 Mu
+11:51:369 202 351 Md
+11:51:466 202 351 Rd
+11:51:673 202 351 Ru
+11:51:705 202 351 Mu
+12:13:419 394 249 kB
+12:13:603 407 249 kE
+12:13:875 418 249 kF
+12:14:100 427 249 kO
+12:14:209 439 249 kR
+12:14:273 448 249 kE
+12:15:491 465 249 kY
+12:15:586 478 249 kO
+12:15:692 491 249 kU
+13:33:916 509 249 kLEFT_ARROW
+13:34:421 503 249 kLEFT_ARROW
+13:34:446 490 249 kLEFT_ARROW
+13:34:479 478 249 kLEFT_ARROW
+13:34:515 465 249 kLEFT_ARROW
+13:34:546 458 249 kLEFT_ARROW
+13:34:578 447 249 kLEFT_ARROW
+13:34:623 438 249 kLEFT_ARROW
+13:34:850 426 249 kLEFT_ARROW
+13:35:020 418 249 kLEFT_ARROW
+13:35:172 406 249 kLEFT_ARROW
+13:35:283 394 249 kLEFT_ARROW
+13:35:404 387 249 kLEFT_ARROW
+13:35:738 378 249 kLEFT_ARROW
+13:35:887 366 249 kA
+13:36:204 380 249 kT
+13:37:626 388 249 kRIGHT_ARROW
+13:37:844 399 249 kRIGHT_ARROW
+13:38:012 409 249 kRIGHT_ARROW
+13:38:172 415 249 kRIGHT_ARROW
+13:38:356 428 249 kRIGHT_ARROW
+13:38:529 439 249 kRIGHT_ARROW
+13:38:700 448 249 kRIGHT_ARROW
+13:38:841 460 249 kRIGHT_ARROW
+13:38:988 469 249 kRIGHT_ARROW
+13:39:130 480 249 kRIGHT_ARROW
+13:39:276 486 249 kRIGHT_ARROW
+13:39:409 499 249 kRIGHT_ARROW
+13:39:553 512 249 kRIGHT_ARROW
+14:20:612 526 247 kBACKSPACE
+14:20:836 512 249 kBACKSPACE
+14:20:980 500 249 kBACKSPACE
+14:21:107 487 249 kBACKSPACE
+14:21:948 487 249 kU
+14:22:100 500 249 kS
+14:22:187 509 249 kI
+14:22:242 516 249 kN
+14:22:356 529 249 kG
+14:22:701 548 249 kT
+14:22:770 557 249 kH
+14:22:818 570 249 kE
+14:26:490 587 249 kBACKSPACE
+14:26:644 581 249 kBACKSPACE
+14:26:772 570 249 kBACKSPACE
+14:26:890 557 249 kBACKSPACE
+14:27:228 548 249 kT
+14:27:275 557 249 kH
+14:27:330 570 249 kI
+14:27:410 576 249 kS
+14:27:612 592 249 kF
+14:27:657 600 249 kU
+14:27:836 613 249 kN
+14:27:954 627 249 kC
+14:28:162 636 249 kT
+14:28:234 645 249 kI
+14:28:282 651 249 kO
+14:28:338 664 249 kN
+14:28:627 677 249 kA
+14:28:730 690 249 kL
+14:28:893 697 249 kI
+14:28:954 703 249 kT
+14:29:124 711 249 kY
+14:29:820 730 249 kI
+14:29:898 737 249 kN
+14:30:668 756 249 kA
+14:30:916 775 249 kM
+14:30:986 794 249 kO
+14:31:106 807 249 kR
+14:31:178 815 249 kE
+14:33:332 833 249 kS
+14:33:492 843 249 kE
+14:33:546 854 249 kR
+14:34:068 862 249 kI
+14:34:256 869 249 kO
+14:34:386 882 249 kU
+14:34:539 895 249 kS
+14:34:893 910 249 kS
+14:34:979 921 249 kI
+14:35:253 927 249 kU
+14:35:556 940 249 kBACKSPACE
+14:35:658 927 249 kT
+14:36:005 935 249 kU
+14:36:220 949 249 kA
+14:36:660 961 249 kT
+14:36:916 969 249 kI
+14:36:955 976 249 kO
+14:37:010 113 278 kN
+14:58:173 146 278 kSHIFT
+14:58:300 146 278 kI
+14:58:588 152 278 kT
+15:02:197 167 278 kC
+15:02:282 177 278 kA
+15:02:493 189 278 kN
+15:02:925 209 278 kA
+15:03:003 222 278 kL
+15:03:892 228 278 kS
+15:03:929 238 278 kO
+15:04:397 257 278 kB
+15:04:613 270 278 kE
+15:04:837 287 278 kS
+15:04:843 297 278 kU
+15:04:898 310 278 kE
+15:05:076 322 278 kD
+15:05:629 341 278 kBACKSPACE
+15:06:029 334 278 kBACKSPACE
+15:06:147 322 278 kBACKSPACE
+15:06:266 310 278 kBACKSPACE
+15:06:492 297 278 kBACKSPACE
+15:06:764 287 278 kU
+15:06:851 300 278 kS
+15:06:922 310 278 kE
+15:07:133 322 278 kD
+15:07:372 341 278 kT
+15:07:442 349 278 kO
+15:16:852 368 278 kT
+15:16:922 376 278 kA
+15:17:173 389 278 kK
+15:17:274 402 278 kE
+15:17:427 419 278 kA
+15:17:725 438 278 kC
+15:17:778 448 278 kO
+15:17:948 460 278 kP
+15:18:125 473 278 kY
+15:18:325 492 278 kO
+15:18:765 505 278 kF
+15:20:453 519 278 kT
+15:20:580 528 278 kH
+15:20:642 541 278 kE
+15:21:205 558 278 kA
+15:21:460 571 278 kC
+15:21:749 581 278 kT
+15:21:834 590 278 kI
+15:21:972 596 278 kV
+15:22:092 608 278 kE
+15:22:685 626 278 kO
+15:22:821 638 278 kV
+15:23:013 651 278 kE
+15:23:082 662 278 kR
+15:23:338 671 278 kL
+15:23:554 678 278 kO
+15:23:741 691 278 kA
+15:24:037 703 278 kBACKSPACE
+15:24:163 691 278 kBACKSPACE
+15:24:276 678 278 kA
+15:24:476 691 278 kY
+15:28:843 710 278 kS
+15:28:923 720 278 kU
+15:29:116 733 278 kP
+15:29:259 746 278 kP
+15:29:493 759 278 kL
+15:31:604 766 278 kY
+15:31:765 779 278 kI
+15:31:835 785 278 kN
+15:31:899 798 278 kG
+15:41:901 817 278 kR
+15:41:946 826 278 kE
+15:42:068 837 278 kL
+15:42:146 844 278 kA
+15:42:226 856 278 kT
+15:42:331 865 278 kE
+15:42:573 877 278 kD
+15:43:388 896 278 kA
+15:43:533 908 278 kC
+15:43:757 919 278 kT
+15:43:860 927 278 kI
+15:43:898 934 278 kO
+15:43:954 946 278 kN
+15:44:059 959 278 kS
+16:02:781 1160 153 kCTRL
+16:03:285 1160 153 kCTRL
+16:03:313 1160 153 kCTRL
+16:03:344 1160 153 kCTRL
+16:03:377 1160 153 kCTRL
+16:03:424 1160 153 kCTRL
+16:03:444 1160 153 kCTRL
+16:03:466 1160 153 kS
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/frame.inf
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/frame.inf	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/encryption/frame.inf	(revision 1510)
@@ -0,0 +1,1 @@
+encryption2
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/multiuser/1.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/multiuser/1.exp	(revision 1509)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/multiuser/1.exp	(revision 1510)
@@ -1,8 +1,10 @@
-V 192
+V 202
 U authadmin
 D 04Jan2019[10:48]
 M bryce
-d 27May2019[16:05]
+d 10Feb2020[16:40]
 B 100 100 39 100
+E 300
+e 300
 Z
 
@@ -18,5 +20,5 @@
 m 0.0
 h 0.0
-p 40
+p 400
 _sl F
 
@@ -33,5 +35,5 @@
 m 0.0
 h -1.0
-p 40
+p 400
 _sl F
 
@@ -48,5 +50,5 @@
 w 300
 h -1.0
-p 40
+p 400
 _sl F
 
@@ -63,5 +65,5 @@
 w 300
 h -1.0
-p 40
+p 400
 _sl F
 
@@ -77,5 +79,5 @@
 m 0.0
 h -1.0
-p 40
+p 400
 _sl F
 
@@ -95,5 +97,5 @@
 M 435
 h 1.0
-p 40
+p 400
 _sl F
 
@@ -113,5 +115,5 @@
 M 435
 h 1.0
-p 40
+p 400
 _sl F
 
@@ -127,5 +129,5 @@
 m 0.0
 h 0.0
-p 40
+p 400
 _sl F
 
@@ -148,5 +150,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -169,5 +171,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -189,5 +191,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -210,5 +212,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -233,5 +235,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -253,5 +255,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -276,5 +278,5 @@
 M 200
 h 1.0
-p 41
+p 411
 _sl F
 
@@ -306,50 +308,6 @@
 Z
 
-ActiveTime:01:54:22
+ActiveTime:01:54:32
 DarkTime:02:59:19
-05:47:304 741 351 kCTRL
-05:47:465 741 351 kV
-05:47:863 749 347 Md
-05:47:950 749 347 Mu
-05:48:720 753 342 kSHIFT
-05:48:878 753 342 kA
-05:49:118 762 347 kC
-05:49:454 770 347 kT
-05:49:622 775 347 kI
-05:49:662 780 347 kO
-05:49:718 789 347 kN
-05:49:910 798 347 kSHIFT
-05:51:367 806 347 Md
-05:51:510 806 347 Mu
-05:52:330 385 511 Md
-05:52:446 385 511 Mu
-05:53:386 306 529 Ld
-05:53:513 306 529 Rd
-05:53:662 306 529 Lu
-05:53:687 306 529 Ru
-05:57:713 717 269 Md
-05:57:880 717 269 Rd
-05:58:758 717 269 Ru
-05:58:791 717 269 Mu
-05:59:769 306 523 Ld
-05:59:830 306 523 Lu
-06:04:976 758 396 kSHIFT
-06:05:095 758 396 kD
-06:05:304 771 396 kA
-06:05:410 779 396 kV
-06:05:449 788 396 kI
-06:05:575 793 396 kD
-06:07:207 786 398 Md
-06:07:302 786 398 Mu
-06:08:038 316 529 Ld
-06:08:174 316 529 Lu
-06:11:175 787 387 Md
-06:11:303 787 387 Mu
-06:17:623 834 392 Md
-06:17:742 834 392 Mu
-06:18:472 466 644 Md
-06:18:585 464 644 Mu
-06:22:650 443 647 Md
-06:22:807 443 647 Rd
-06:23:030 443 647 Ru
-06:23:086 443 647 Mu
+40:38:436 868 485 Ld
+40:38:547 868 485 Lu
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/test/0.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/test/0.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/test/0.exp	(revision 1510)
@@ -0,0 +1,31 @@
+V 0
+U authadmin
+D 05Feb2020[15:33]
+d 05Feb2020[15:33]
+E 300
+e 300
+Z
+
+S T 3
+s 05Feb2020[15:33.04]
+d 0 0 100 100
+P 15 58
+T Test0
+o authadmin
+v S
+f sb30
+t -1.0
+b 0.0
+m 0.0
+w 1586
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:00
+DarkTime:00:00:00
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/test/1.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/test/1.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/test/1.exp	(revision 1510)
@@ -0,0 +1,32 @@
+V 0
+U authadmin
+D 05Feb2020[15:33]
+M authadmin
+d 05Feb2020[15:33]
+E 300
+e 300
+Z
+
+S T 3
+s 05Feb2020[15:33]
+d 0 0 100 100
+P 15 58
+T Test
+o authadmin
+v S
+f sb30
+t -1.0
+b 0.0
+m 0.0
+w 1586
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:00
+DarkTime:00:00:00
Index: /trunk/src/org/expeditee/assets/resources-public/framesets/test/frame.inf
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/framesets/test/frame.inf	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/framesets/test/frame.inf	(revision 1510)
@@ -0,0 +1,1 @@
+Test1
Index: /trunk/src/org/expeditee/assets/resources-public/messages/messages/0.exp
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/messages/messages/0.exp	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/messages/messages/0.exp	(revision 1510)
@@ -0,0 +1,31 @@
+V 0
+U authadmin
+D 10Feb2020[16:43]
+d 10Feb2020[16:43]
+E 300
+e 300
+Z
+
+S T 3
+s 10Feb2020[16:43.05]
+d 0 0 100 100
+P 15 58
+T Messages0
+o authadmin
+v S
+f sb30
+t -1.0
+b 0.0
+m 0.0
+w 875
+h -1.0
+_sl F
+
+Z
+
+Z
+
+Z
+
+ActiveTime:00:00:00
+DarkTime:00:00:00
Index: /trunk/src/org/expeditee/assets/resources-public/messages/messages/frame.inf
===================================================================
--- /trunk/src/org/expeditee/assets/resources-public/messages/messages/frame.inf	(revision 1510)
+++ /trunk/src/org/expeditee/assets/resources-public/messages/messages/frame.inf	(revision 1510)
@@ -0,0 +1,1 @@
+Messages1
Index: /trunk/src/org/expeditee/gui/MessageBay.java
===================================================================
--- /trunk/src/org/expeditee/gui/MessageBay.java	(revision 1509)
+++ /trunk/src/org/expeditee/gui/MessageBay.java	(revision 1510)
@@ -81,5 +81,6 @@
 
 	/** Font used for the messages. */
-	private static Font _messageFont = new Font("Serif-Plain-16");
+//	private static Font _messageFont = new Font("Sans-Serif-Plain-16");
+	private static Font _messageFont = new Font("sansserif");
 
 	/** The number of messages currently shown (used for scrolling up). */
@@ -148,4 +149,5 @@
 					MESSAGE_LINK_X);
 			_messageLink.setOffset(0, -DisplayController.getMessageBayPaintArea().getMinY());
+			((Text) _messageLink).setFamily("sansserif");
 			isLinkInitialized = true;
 		} else {
